c8697e1743
Fix KeyCounter counting clicks when game is paused
2018-07-14 03:08:28 +02:00
e20cdccf05
Merge branch 'master' into update-disclaimer
2018-07-12 23:41:55 +09:00
5df2df9b3a
Fix osu! logo handling non-left mouse buttons
2018-07-12 12:36:58 +09:00
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
8bc7c4c9a2
Add TestCase and update disclaimer screen
2018-07-11 16:30:51 +09:00
40ec486152
Merge branch 'master' into improve-button-system
2018-07-10 16:44:55 +09:00
9e59b4a8e2
Fix SongSelect binding to ruleset too early
...
Causes music to stop playing while at main menu.
2018-07-10 01:29:24 +09:00
ee4607c86e
Merge branch 'master' into fix-exit-race-condition
2018-07-09 19:02:37 +09:00
49e94850b6
Fix being able to trigger player before carousel is ready
...
Causes an eventual crash.
2018-07-09 18:43:20 +09:00
09b3375a9d
Fix pressing escape too fast causing multiple exit attempts at song select
2018-07-09 18:12:23 +09:00
0a67e5a274
Fix some possible null reference exceptions
2018-07-09 17:09:17 +09:00
0b30e6eb6a
Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system
2018-07-06 17:55:02 +09:00
c025158735
Give VisibleState a default rather than nullable
2018-07-06 17:53:06 +09:00
8f3f872182
Merge branch 'master' into go-forward
2018-07-06 14:29:26 +09:00
5fc17bacf3
Add "Select" action
...
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
2aae528e1c
Improve code quality of main menu button system
2018-07-03 18:23:41 +09:00
d476842c44
Fix FooterButton clicking area
2018-07-02 22:03:17 -07:00
118366303c
Merge branch 'master' into fix-leaderboard-placeholder
2018-07-02 17:17:40 +09:00
e5947cc969
Merge branch 'master' into non-null-ruleset
2018-07-02 15:32:55 +09:00
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
2c19790a97
Merge branch 'master' into fix-background-screen-crash
2018-07-02 15:01:59 +09:00
2c597874bf
Fix leaderboard showing placeholder briefly when entering song select
2018-07-01 18:17:02 +09:00
b9b1e77172
Merge branch 'master' into allow-back-in-player
2018-06-29 21:54:18 +09:00
6a80a21078
Tidy up escape handling
2018-06-29 21:06:38 +09:00
6d6436c8d3
Fix ruleset not getting updated if changed
2018-06-29 20:50:39 +09:00
9187eb8626
SongSelect needs to recache as IBindable
2018-06-29 20:50:30 +09:00
8cf1553fd5
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-29 20:30:42 +09:00
06bd3d4815
Use IBindable where possible
2018-06-29 20:28:28 +09:00
0e649b8866
Change logic
2018-06-29 20:16:24 +09:00
34fef3caba
Update exception type
2018-06-29 20:13:29 +09:00
9fce4eaccf
Merge branch 'master' into di-backed-ruleset
2018-06-29 19:33:12 +09:00
1c32951d4b
Ensure toolbar triggers updates to SongSelect's ruleset
2018-06-29 19:32:42 +09:00
6d6fcc953b
Trim lines
2018-06-29 19:25:20 +09:00
750f5a86c3
Fix catch test failing due to disabled bindable
2018-06-29 16:49:11 +09:00
be2d3d6ad4
Merge branch 'master' into fix-supporter-naming
2018-06-28 17:34:21 +09:00
a377e87bf6
Add missing licence headers
2018-06-28 17:34:04 +09:00
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +09:00
c44a81bdf5
Add word wrap support
2018-06-28 13:04:39 +09:00
01b90aaffe
Fix CI not passing
2018-06-28 11:58:06 +09:00
8518fce4a9
Fix osu!supporter naming
2018-06-27 17:57:55 -07:00
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
527d7c29f2
Merge branch 'master' into fix-background-screen-crash
2018-06-27 16:00:59 +09:00
0866dd11bd
DefaultBackAction -> BackAction, defaults to last button
...
The last button is more commonly the escape condition.
2018-06-27 12:57:26 +09:00
d7ce4ab6fd
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-27 12:36:10 +09:00
4bcc05a7fc
Remove null checks on ruleset
...
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
4dd12cedad
Fix review issues
2018-06-26 17:01:40 +09:00
13480feb4f
Remove error logging
...
Already logged to network.log with ample detail.
2018-06-26 16:38:19 +09:00
388ca5d572
Move leaderboard update scheduling to a more central method
2018-06-26 16:33:22 +09:00
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
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
