Dean Herbert
e223074876
Fix import failures if single set has multiple conflicting OnlineBeatmapIDs
...
Resolves #2970 .
2018-07-09 00:24:55 +09:00
Dean Herbert
91777b04d8
Merge branch 'master' into download-button-state
2018-07-08 14:15:47 +09:00
Dean Herbert
ad51d95c1a
Merge branch 'master' into more-mania-conversion-fixes
2018-07-08 01:44:06 +09:00
Dean Herbert
f872c56deb
Merge branch 'master' into improve-button-system
2018-07-06 18:25:34 +09:00
Dean Herbert
0b30e6eb6a
Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system
2018-07-06 17:55:02 +09:00
Dean Herbert
c025158735
Give VisibleState a default rather than nullable
2018-07-06 17:53:06 +09:00
Dean Herbert
c4952569cc
Merge branch 'master' into fix-menu-cursor-animation
2018-07-06 17:46:29 +09:00
Dean Herbert
54db287791
Remove casting
2018-07-06 17:45:39 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward
2018-07-06 14:29:26 +09:00
Dan Balasescu
290812cf65
Merge branch 'master' into more-mania-conversion-fixes
2018-07-06 13:29:16 +09:00
Dean Herbert
dffe6af5d9
Merge branch 'master' into fix-menu-cursor-animation
2018-07-06 11:29:53 +09:00
Dean Herbert
7e28a993f7
Update framework
2018-07-05 21:08:53 +09:00
Dean Herbert
e5001b84bd
Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter
2018-07-05 21:04:19 +09:00
Dean Herbert
5f5790f566
Merge branch 'master' into fix-menu-cursor-animation
2018-07-05 21:04:06 +09:00
Dean Herbert
625b9ead4c
Fix links from profile top scores to beatmaps not working correctly
2018-07-05 21:00:23 +09:00
Dean Herbert
8f04acc506
Add missing xmldoc
2018-07-05 20:16:55 +09:00
Dean Herbert
4f894969df
Merge branch 'master' into hitobject-samples
2018-07-05 19:43:19 +09:00
ekrctb
bbceac6cda
Apply renaming of wheel -> scroll
2018-07-05 16:50:04 +09:00
Dean Herbert
44aecdc3a0
Rename method to EquivalentTo
2018-07-05 15:00:02 +09:00
Dean Herbert
d11ba2df0e
Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
2018-07-05 14:53:31 +09:00
Dean Herbert
aea1299762
Merge branch 'master' into fix-footer-clicking-area
2018-07-05 13:39:53 +09:00
Dean Herbert
e28a610757
Fix mods not correctly resetting when changing ruleset at song select
2018-07-05 13:22:52 +09:00
Dan Balasescu
7a4d3f9ffa
Merge branch 'master' into fix-popup-dialog-regression
2018-07-04 11:15:18 +09:00
naoey
6ea6a10def
Reduce size of download button in list view to fit hover effect
2018-07-03 20:26:49 +05:30
naoey
2a0b1f3615
Update direct panel download button for new design
...
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
2018-07-03 20:18:09 +05:30
ekrctb
d71b61c122
Rewrite disable mouse buttons logic
2018-07-03 20:04:15 +09:00
Dean Herbert
1e1ff8339e
Merge branch 'master' into non-null-nestedobjects
2018-07-03 19:43:46 +09:00
Dean Herbert
5fc17bacf3
Add "Select" action
...
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Dean Herbert
b33206c212
Fix selecting a button on a dialog causing both that button and exit to animate
2018-07-03 18:35:09 +09:00
Dean Herbert
2aae528e1c
Improve code quality of main menu button system
2018-07-03 18:23:41 +09:00
smoogipoo
73851fb194
Fix beatmap details not working for unranked beatmaps
2018-07-03 15:57:05 +09:00
ekrctb
f9f192ce34
Modify MenuCursor hightlight animation
2018-07-03 15:15:03 +09:00
Joehu
d476842c44
Fix FooterButton clicking area
2018-07-02 22:03:17 -07:00
Dean Herbert
627a5deff9
Merge branch 'master' into fix-menu-cursor-crash
2018-07-02 18:09:11 +09:00
Dean Herbert
6c848f135c
Add comment about last button invocation
2018-07-02 17:48:16 +09:00
Dan Balasescu
e99c05c85e
Merge branch 'master' into fix-dialog-popups
2018-07-02 17:41:16 +09:00
Dan Balasescu
6abb3fa62c
Merge branch 'master' into add-scroll-speed-keybinds
2018-07-02 17:26:05 +09:00
smoogipoo
f0ec117bcb
Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
...
# Conflicts:
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-07-02 17:21:18 +09:00
Dan Balasescu
118366303c
Merge branch 'master' into fix-leaderboard-placeholder
2018-07-02 17:17:40 +09:00
smoogipoo
9f405b0894
Don't hard-bail if config skin doesn't exist anymore
2018-07-02 16:49:07 +09:00
ekrctb
ae6fdd8e29
whitespace
2018-07-02 16:20:44 +09:00
smoogipoo
45a4187923
Tidy up lookups to NestedHitObjects
2018-07-02 16:10:56 +09:00
ekrctb
63746876c2
typo
2018-07-02 16:09:33 +09:00
ekrctb
341ffa4667
Fix MenuCursor crash
2018-07-02 16:07:52 +09:00
Dan Balasescu
e5947cc969
Merge branch 'master' into non-null-ruleset
2018-07-02 15:32:55 +09:00
smoogipoo
b61fe10f62
Adapt to IBindables
2018-07-02 15:07:18 +09:00
smoogipoo
4070c1a888
Merge remote-tracking branch 'origin/master' into non-null-ruleset
...
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dan Balasescu
2c19790a97
Merge branch 'master' into fix-background-screen-crash
2018-07-02 15:01:59 +09:00
Dan Balasescu
50f561fbc2
Merge branch 'master' into allow-back-in-player
2018-07-02 14:44:58 +09:00
smoogipoo
189194ee8d
Don't include empty namespace in sample lookup
2018-07-02 14:35:03 +09:00
smoogipoo
7f832e34c0
Reorder sample bank property setters
2018-07-02 14:29:18 +09:00
Dean Herbert
596787c941
Standardise input handling of popup dialogs
2018-07-02 14:25:12 +09:00
smoogipoo
73fac2115a
Implement hitobject sample files
2018-07-02 14:20:35 +09:00
smoogipoo
310c4a7d6c
Make SampleInfo choose its own lookup name
2018-07-02 14:18:41 +09:00
smoogipoo
8b0c6a4c85
Make SampleControlPoint clone the existing SampleInfo
2018-07-02 14:17:19 +09:00
Dan Balasescu
37495c34fa
Fix possible nullreference
2018-07-02 13:51:47 +09:00
smoogipoo
b664d3ef81
Fix time being a part of controlpoint change comparisons
2018-07-02 13:34:25 +09:00
smoogipoo
aea50e770b
Use .Equals everywhere
2018-07-02 13:34:14 +09:00
Dean Herbert
812929fa05
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
2018-07-02 13:10:42 +09:00
Dean Herbert
b7893bc994
Remove unnecessary comments
2018-07-02 13:07:44 +09:00
smoogipoo
9f85c55915
Merge remote-tracking branch 'origin/master' into legacy-custom-banks
2018-07-02 12:34:51 +09:00
Dean Herbert
6a459efd8f
Don't allow Key.Escape
2018-07-02 11:04:40 +09:00
Dean Herbert
2c597874bf
Fix leaderboard showing placeholder briefly when entering song select
2018-07-01 18:17:02 +09:00
Dean Herbert
98fb2e03c0
Fix rulesets not loading in debug builds after running a release build
2018-07-01 18:03:15 +09:00
Dean Herbert
b1403d837e
Add back support for closing focused overlays using back key
2018-07-01 15:52:47 +09:00
Dean Herbert
7028767e50
Fix regression in HoldFocus behaviour
2018-07-01 14:08:34 +09:00
Dean Herbert
00fd5c8dbc
Fix regression causing binding settings to fail
2018-06-30 23:51:27 +09:00
Dean Herbert
754e072e01
Don't handle all actions
2018-06-29 23:35:14 +09:00
Dean Herbert
fb90a4924b
Only clear text in FocusedTextBox
2018-06-29 23:28:15 +09:00
Dean Herbert
7c0547b4ee
Replace todo
2018-06-29 23:16:05 +09:00
Dean Herbert
b9b1e77172
Merge branch 'master' into allow-back-in-player
2018-06-29 21:54:18 +09:00
Dean Herbert
ad28f88498
Fix protection change
2018-06-29 21:25:51 +09:00
Dean Herbert
cd47bd2cf8
Update framework
2018-06-29 21:06:43 +09:00
Dean Herbert
6a80a21078
Tidy up escape handling
2018-06-29 21:06:38 +09:00
smoogipoo
6d6436c8d3
Fix ruleset not getting updated if changed
2018-06-29 20:50:39 +09:00
smoogipoo
9187eb8626
SongSelect needs to recache as IBindable
2018-06-29 20:50:30 +09:00
Dean Herbert
8cf1553fd5
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-29 20:30:42 +09:00
Dean Herbert
06bd3d4815
Use IBindable where possible
2018-06-29 20:28:28 +09:00
Dean Herbert
0e649b8866
Change logic
2018-06-29 20:16:24 +09:00
Dean Herbert
34fef3caba
Update exception type
2018-06-29 20:13:29 +09:00
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset
2018-06-29 19:33:12 +09:00
Dean Herbert
1c32951d4b
Ensure toolbar triggers updates to SongSelect's ruleset
2018-06-29 19:32:42 +09:00
Dean Herbert
182ac80881
Cache also as IBindable
2018-06-29 19:25:28 +09:00
Dean Herbert
6d6fcc953b
Trim lines
2018-06-29 19:25:20 +09:00
Dan Balasescu
513129d4a8
Merge branch 'master' into fix-dialog-overlay-sounds
2018-06-29 18:45:37 +09:00
smoogipoo
1e696d247e
Re-privatise
2018-06-29 18:33:28 +09:00
Dan Balasescu
8abcf68188
Merge branch 'master' into fix-negative-online-set-id
2018-06-29 18:29:36 +09:00
Dean Herbert
4212a9d0d7
Fix incorrect migration conditional
2018-06-29 18:23:53 +09:00
Dan Balasescu
f149289c83
Merge branch 'master' into fix-delta-patching
2018-06-29 18:01:56 +09:00
Dean Herbert
23aa2a2361
Merge branch 'master' into catch-scoring
2018-06-29 17:29:15 +09:00
Dean Herbert
e12ce3c2a8
Adjust xmldoc
2018-06-29 17:21:55 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring
2018-06-29 17:16:14 +09:00
Dan Balasescu
845d1400dc
Merge branch 'master' into beatmap-defaults
2018-06-29 17:14:40 +09:00
Dean Herbert
c0b65a6a73
Change default IsBonus definition and remove unnecessary overrides
2018-06-29 17:07:08 +09:00
Dean Herbert
750f5a86c3
Fix catch test failing due to disabled bindable
2018-06-29 16:49:11 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring
2018-06-29 14:59:15 +09:00
smoogipoo
99068debc4
Split out into separate interface + add xmldocs
2018-06-29 13:24:33 +09:00
smoogipoo
756cabd5d0
Add a preprocess method to BeatmapProcessor
2018-06-29 12:45:48 +09:00
Dean Herbert
70a119dde7
Remove unused/duplicate interface
2018-06-29 12:20:53 +09:00
Dean Herbert
8742f41b7d
Revert SharpCompress library to fix delta patching regression
2018-06-29 11:34:52 +09:00
tgi74000
b0739023ce
Add BeatmapInfo's stable defaults to fix compatibility with old maps
2018-06-28 19:02:38 +02:00
Dean Herbert
8ba2ac922f
Move to local components namespace
2018-06-28 19:23:56 +09:00
Dean Herbert
0ef5b8f464
Tidy up code, remove unnecessary string.Formats
2018-06-28 19:19:00 +09:00
Dean Herbert
98fec94693
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates
2018-06-28 19:14:47 +09:00
smoogipoo
94f1b2eeb8
Only custom sample banks > 1 modify the filename
2018-06-28 18:29:17 +09:00
smoogipoo
3a9a82c80c
Add back legacy custom sample banks
2018-06-28 18:29:12 +09:00
smoogipoo
781095b96b
Encapsulate the method to apply SampleControlPoints to SampleInfos
2018-06-28 18:29:07 +09:00
smoogipoo
2882981f9c
Implement and use equality comparers for ControlPoint
2018-06-28 18:28:59 +09:00
Dean Herbert
be2d3d6ad4
Merge branch 'master' into fix-supporter-naming
2018-06-28 17:34:21 +09:00
Dean Herbert
a377e87bf6
Add missing licence headers
2018-06-28 17:34:04 +09:00
Dean Herbert
b1a3f01212
Fix mania maps not being treated as mania maps in release builds
2018-06-28 17:10:30 +09:00
Dean Herbert
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +09:00
smoogipoo
d879b96d9f
Implement storyboard samples
2018-06-28 13:43:56 +09:00
Dean Herbert
c44a81bdf5
Add word wrap support
2018-06-28 13:04:39 +09:00
smoogipoo
01b90aaffe
Fix CI not passing
2018-06-28 11:58:06 +09:00
smoogipoo
2f2bd59844
Remove editor functionality from VirtualBeatmapTrack
...
/shrug
2018-06-28 11:47:41 +09:00
smoogipoo
87e8074cd2
Use a const for excess length
2018-06-28 11:46:56 +09:00
smoogipoo
c0c94e24b9
Use VirtualBeatmapTrack in testcases
2018-06-28 11:45:48 +09:00
Dean Herbert
ac7ee59d50
Add migration for previous incorrectly imported beatmaps
2018-06-28 10:48:01 +09:00
Dean Herbert
5ad122bfec
Fix beatmaps importing with -1 as online set ID
2018-06-28 10:28:35 +09:00
Joehu
8518fce4a9
Fix osu!supporter naming
2018-06-27 17:57:55 -07:00
ekrctb
1ed6a672f2
Update volme control
...
Use IMouseWheelBindingHandler for volume VolumeControlReceptor.
VolumeMeter is no longer an IKeyBindingHandler because it is unused.
2018-06-27 18:43:29 +09:00
smoogipoo
5640385f48
Update the length once during construction
2018-06-27 16:12:49 +09:00
smoogipoo
b4b28f8ae8
Make GetWaveform() not hard bail if errors occur
2018-06-27 16:07:18 +09:00
smoogipoo
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
Dean Herbert
527d7c29f2
Merge branch 'master' into fix-background-screen-crash
2018-06-27 16:00:59 +09:00
smoogipoo
f8acd9e451
Cleanup
2018-06-27 12:59:19 +09:00
Dean Herbert
0866dd11bd
DefaultBackAction -> BackAction, defaults to last button
...
The last button is more commonly the escape condition.
2018-06-27 12:57:26 +09:00
smoogipoo
ede59f63f6
Merge remote-tracking branch 'origin/master' into make-loading-more-visible
2018-06-27 12:52:06 +09:00
Dean Herbert
d7ce4ab6fd
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-27 12:36:10 +09:00
Dean Herbert
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds
2018-06-27 12:21:29 +09:00
smoogipoo
80501de4b9
Add legacy slider offsets
2018-06-27 12:09:21 +09:00
Dean Herbert
ac1bf3b092
Merge branch 'master' into editor-seek-snapping-fix
2018-06-27 11:08:19 +09:00
Dean Herbert
1b050ca68e
Merge branch 'master' into fix-unauthorized-request
2018-06-26 22:25:19 +09:00
Dan Balasescu
830ce0da4c
Merge branch 'master' into update-framework
2018-06-26 20:41:08 +09:00
smoogipoo
8a81fba1ea
Other input states need to be considered for wheel bindings
2018-06-26 20:34:22 +09:00
smoogipoo
f1dfe04bd9
Fix broken conditional
2018-06-26 20:13:44 +09:00
smoogipoo
02b733a42e
Merge remote-tracking branch 'origin/master' into fix-unauthorized-request
2018-06-26 19:58:51 +09:00
Dean Herbert
f7f17bab78
Merge branch 'master' into catch-droplet-fix
2018-06-26 19:29:15 +09:00
Dean Herbert
018dcc98b4
Fix failing tests
2018-06-26 19:17:34 +09:00
Dean Herbert
4bcc05a7fc
Remove null checks on ruleset
...
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad
Fix review issues
2018-06-26 17:01:40 +09:00
Dean Herbert
13480feb4f
Remove error logging
...
Already logged to network.log with ample detail.
2018-06-26 16:38:19 +09:00
Dean Herbert
388ca5d572
Move leaderboard update scheduling to a more central method
2018-06-26 16:33:22 +09:00
Dean Herbert
b0a1b25983
Privatise game ruleset and access via DI
...
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
Dean Herbert
563cb46b4a
Update framework and other nuget dependencies
2018-06-26 12:10:56 +09:00
smoogipoo
cd74ec705e
Fix possible mis-ordering of scroll position updates
...
1. Checking whether the scroll position has changed must be done _after_ Current is updated in base.UpdateAfterChildren. This was causing the timeline to sometimes not provide smooth scrolling while the track is not running.
2. We can't just move all code to UpdateAfterChildren to fulfill (1) - we need the code to follow the track time to still run prior to base.UpdateAfterChildren, so that it modifies Current prior to base.UpdateAfterChildren changing to position.
2018-06-25 20:31:06 +09:00
Dean Herbert
594cc0d21d
Merge branch 'master' into mania-playfield-inversions
2018-06-25 18:36:23 +09:00
Dean Herbert
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
smoogipoo
97057ced85
Merge remote-tracking branch 'origin/master' into full-mania-fix
2018-06-25 12:43:49 +09:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
Dean Herbert
78ccbcabf3
Fix API getting stuck in an endless loop under a certain unauthorized scenario
2018-06-22 17:34:29 +09:00
Dean Herbert
51600dd0ae
Improve PlayButton's loading
2018-06-22 14:27:36 +09:00
Dean Herbert
3824354cb8
Lengthen PopIn transition slightly
2018-06-22 14:26:24 +09:00
Dean Herbert
fccd4f965c
Merge remote-tracking branch 'upstream/master' into make-loading-more-visible
2018-06-22 14:21:01 +09:00
Dean Herbert
99cc406b97
Merge branch 'master' into improve-volume-controls
2018-06-22 13:39:48 +09:00
smoogipoo
8d3c2d54f3
Merge remote-tracking branch 'origin/master' into improve-volume-controls
2018-06-22 13:33:07 +09:00
smoogipoo
67a067ffa5
Fix overlay not disappearing when losing hover from the last pixel
...
OnMouseMove isn't invoked when hover is lost.
2018-06-22 13:32:32 +09:00
smoogipoo
72aee8344e
Always call schedulePopOut
2018-06-22 13:32:00 +09:00
smoogipoo
206f913a4c
Make mute button not handle hover
2018-06-22 13:31:32 +09:00
Dean Herbert
5d3b51b8d4
Merge branch 'master' into api-offline-early-return
2018-06-22 13:16:30 +09:00
Dean Herbert
eb6d6dc2de
Improve the visibility of the global loading animation
...
Updates design to match new `osu-web` design.
Adds TestCase for visual testing.
2018-06-22 13:14:43 +09:00
Dean Herbert
73e13e2d63
Rename Stop to StopAnyPlaying for clarity
2018-06-22 12:35:43 +09:00
Dean Herbert
4b2b1f51f9
Apply some code review
2018-06-22 12:33:30 +09:00
Dean Herbert
de10480e95
Merge branch 'master' into multiple_previews_different_overlays
2018-06-22 10:44:36 +09:00
Dan Balasescu
465342c636
Merge branch 'master' into notification-usability
2018-06-21 19:48:16 +09:00
smoogipoo
1932399521
Add testcases
2018-06-21 19:31:07 +09:00
smoogipoo
63a6fc2596
XMLDoc all the things
2018-06-21 18:54:50 +09:00
smoogipoo
40ed3fdd05
Fix possible incorrect order of events due to threaded load
2018-06-21 18:45:32 +09:00
smoogipoo
b2066c5d73
Rework preview tracks to reduce usage complexities
2018-06-21 18:40:27 +09:00
Dean Herbert
5c63b3ddac
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
...
Always perform non-seeked scroll in the editor while audio is playing
2018-06-21 17:24:15 +09:00
Dean Herbert
a2fa55c426
Fix dialog overlay playing double samples on show/hide
2018-06-21 16:47:05 +09:00
Dean Herbert
6ec0aaee91
Split out logic for subsequent log message and apply action to only itself
2018-06-21 14:50:42 +09:00
Dean Herbert
87d94591e4
Start displaying notifications earlier
...
Also show important notifications and more in total.
2018-06-21 14:43:38 +09:00
Dean Herbert
ed17a241f5
Decrease notification font size
2018-06-21 14:43:02 +09:00
Dean Herbert
6aa0ca5cc9
Add (one-way) migration for existing users
2018-06-21 14:22:25 +09:00
smoogipoo
ab2889da1f
Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays
2018-06-21 13:24:02 +09:00
Dean Herbert
74f732038f
Add documentation for negative values of ParallaxAmount
2018-06-21 12:49:07 +09:00
Dean Herbert
5f2d1d4a1e
Dim TestCase background a bit
2018-06-21 12:48:44 +09:00
Dean Herbert
733b7d1177
Merge branch 'master' into ParallaxContainerImprovement
2018-06-21 12:10:10 +09:00
Dean Herbert
65487d1610
Merge branch 'master' into improve-volume-controls
2018-06-21 11:56:56 +09:00
Dean Herbert
2a42418dbf
Tidy up ReadyButton
2018-06-21 10:21:54 +09:00
Dean Herbert
4c068097c8
Change required child to use same structure as other use cases
2018-06-21 10:12:12 +09:00
Dean Herbert
96100a2200
Remove schedule logic (seems unnecessary)
2018-06-20 17:41:48 +09:00
Dean Herbert
39649747aa
Simplify and synchronise multiplayer screen transitions
2018-06-20 17:25:22 +09:00
Dean Herbert
f0c72438a3
Group ValueChanged attachment with bindings
2018-06-20 17:06:02 +09:00
Dean Herbert
3f020a2802
Merge branch 'master' into multiplayer-match
2018-06-20 14:49:32 +09:00
Dean Herbert
b95042e370
Fix background screens not supporting early-exit condition
...
Closes #2681 .
2018-06-20 12:43:48 +09:00
Dean Herbert
3eb0a17978
Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding
2018-06-20 10:45:43 +09:00
Dean Herbert
d7f65d62e0
Use vertical/horizontal pair instead
2018-06-20 10:45:35 +09:00
Dan Balasescu
77e03a59a9
Merge branch 'master' into ruleset-container
2018-06-19 21:47:10 +09:00
Tom Arrow
ad883e087a
RulesetContainer<TObject> cannot be derived
2018-06-19 14:31:24 +02:00
Dean Herbert
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
Dean Herbert
b8f9caf418
Merge branch 'master' into multiplayer-match
2018-06-19 17:18:33 +09:00
Michael Manis
a0f1143287
Add padding to 'show more' button
2018-06-18 19:14:44 -04:00
smoogipoo
8c671f93fc
Always perform non-seeked scroll in the editor while audio is playing
2018-06-18 19:32:04 +09:00
smoogipoo
54e60d8bc2
Fix test appveyor tests failing due to lack of audio manager
2018-06-18 19:27:22 +09:00
smoogipoo
6d318d35ee
Fix not being able to seek by other means during flick-scroll
2018-06-18 18:56:54 +09:00
smoogipoo
dbc50e35d5
Fix the timeline and editor fighting over track seeking
2018-06-18 18:02:26 +09:00
Dean Herbert
c74c059044
Merge branch 'master' into multiple_previews_different_overlays
2018-06-18 05:05:27 +09:00
