1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 04:42:57 +08:00
Commit Graph

64 Commits

Author SHA1 Message Date
smoogipoo
85d3ff4846 Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods
# Conflicts:
#	osu.Game/Screens/Play/GameplayClockContainer.cs
2019-04-10 12:06:51 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
Dean Herbert
efd7bea771 Add further xmldoc 2019-04-03 17:01:11 +09:00
Dean Herbert
50f8ab3dfb Fix gameplay offset handling on seeks 2019-04-03 16:58:20 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags 2019-03-29 13:45:45 +09:00
Dean Herbert
83863d35c3 Remove AllowLeadIn flag 2019-03-26 16:35:00 +09:00
Dean Herbert
b4d785c76c Don't update gameplay loop while paused 2019-03-26 13:36:17 +09:00
Dean Herbert
bcaff9f7b4 Add basic pause tests 2019-03-18 20:33:43 +09:00
Dean Herbert
465c95e952 Refactor pause logic so GameplayClockContainer is in control 2019-03-18 20:33:43 +09:00
Dean Herbert
c1a356161f Allow use rate adjust to fallback to clock rate adjust 2019-03-12 18:14:01 +09:00
Dean Herbert
cdeaa80fea Call ResetSpeedAdjustments before adjusting clock 2019-03-12 11:35:25 +09:00
Dean Herbert
13b3036ec6 Fix "wind" mods adjusting rate twice
This is a hotfix for incorrect framework behaviour.

Closes #4442
2019-03-12 02:45:45 +09:00
Dean Herbert
42efea1e06 Apply review 2019-03-08 15:05:45 +09:00
Dean Herbert
58ef397f4f Move all clock related gameplay logic inside GameplayClockContainer 2019-03-07 16:02:24 +09:00