Dan Balasescu
2c19790a97
Merge branch 'master' into fix-background-screen-crash
2018-07-02 15:01:59 +09:00
Dean Herbert
b9b1e77172
Merge branch 'master' into allow-back-in-player
2018-06-29 21:54:18 +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
6d6fcc953b
Trim lines
2018-06-29 19:25:20 +09:00
Dean Herbert
750f5a86c3
Fix catch test failing due to disabled bindable
2018-06-29 16:49:11 +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
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +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
Joehu
8518fce4a9
Fix osu!supporter naming
2018-06-27 17:57:55 -07: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
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
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
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
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
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10: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
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
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
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
b1d059a67d
Add some colours to the compose-mode timeline
2018-06-18 04:31:47 +09:00
Dean Herbert
bec6e3083e
Remove scrollbar depth change as scrollbar is hidden now
2018-06-18 03:19:21 +09:00
Dean Herbert
d58ef96a23
Merge branch 'master' into timeline-markers
2018-06-18 03:14:04 +09:00
Dean Herbert
31f9d0161d
Add a comment about precision scroll behaviour
2018-06-18 03:03:09 +09:00
Dean Herbert
ae160baa6e
Merge branch 'master' into timeline-input-adjustment
2018-06-18 02:54:25 +09:00
Dean Herbert
48613ea1f6
Merge branch 'master' into timeline-markers
2018-06-18 02:09:20 +09:00
