1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 15:13:22 +08:00
Commit Graph

679 Commits

Author SHA1 Message Date
smoogipoo
5a3d6a0258 Fix post-merge errors 2019-04-17 16:11:59 +09:00
Dean Herbert
bb539af1a0
Merge branch 'master' into player-mod-reinstantiation 2019-04-16 22:35:21 +08:00
Lucas A
5887008fb3
Merge branch 'master' into user-status-wiring 2019-04-15 11:43:53 +02:00
DrabWeb
c766631ad6 Check for breaks using GameplayClock time. 2019-04-13 11:39:22 -03:00
Lucas A
361c0ec9f2 Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in 2019-04-13 13:18:44 +02:00
Lucas A
da5d6cb1d4 Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap 2019-04-12 22:54:35 +02:00
smoogipoo
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
smoogipoo
4c571acd67 Reinstantiate mods for every player 2019-04-09 13:33:16 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
DrabWeb
e76897d6a7 Fix ResumeContainers appearing when resuming during breaks. 2019-04-07 16:32:55 -03:00
Dean Herbert
6949c233bf Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 15:02:12 +09:00
Dean Herbert
a88f23e555 Convert remaining two flags to ctor parameters 2019-03-26 16:53:44 +09:00
Dean Herbert
83863d35c3 Remove AllowLeadIn flag 2019-03-26 16:35:00 +09:00
Dean Herbert
256a579de0 Allow player to not pause on focus loss 2019-03-26 13:17:00 +09:00
Dean Herbert
9e6cdd7bd5 Combine conditionals and clarify comment 2019-03-22 14:42:51 +09:00
Dean Herbert
5b8fd6822e Move storyboard logic region down 2019-03-22 14:39:20 +09:00
Dean Herbert
15f9a6b9df Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-21 16:04:18 +09:00
Dean Herbert
67a65b80fc
Merge branch 'master' into visual-settings-container 2019-03-20 20:48:30 +09:00
Dean Herbert
01f795b046 Make restart public rather than reimplementing 2019-03-20 19:45:04 +09:00
Dean Herbert
f43e7a880c Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-20 15:27:06 +09:00
David Zhao
15637f9c4a Rework instant blur logic such that updateVisuals doesn't need to be public 2019-03-20 14:17:35 +09:00
Dean Herbert
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
David Zhao
a8e2072286 Make blurtarget private, improve documentation 2019-03-19 20:15:28 +09:00
David Zhao
df37973e84 Move showstoryboard into player 2019-03-19 13:13:19 +09:00
David Zhao
27a92e017c rename back to UserDimContainer 2019-03-19 13:06:14 +09:00
David Zhao
f1b2073bf6 Merge remote-tracking branch 'upstream/master' into visual-settings-container 2019-03-19 13:01:05 +09:00
Dean Herbert
4f075f4740 Add more comprehensive testing 2019-03-18 20:33:43 +09:00
Dean Herbert
9433a97747 Add resume requesting support and fix exit scenarios 2019-03-18 20:33:43 +09:00
Dean Herbert
536b5e0dab Remove PausableGameplayContainer 2019-03-18 20:33:43 +09:00
Dean Herbert
f13003c53b Simplify and localise storyboard logic in Player.cs 2019-03-18 20:33:43 +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
David Zhao
de6d8fc637 Move user blurring into VIsualSettingsContainer 2019-03-13 18:25:22 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
smoogipoo
d055b248ac Remove blank line 2019-03-08 15:56:36 +09:00
smoogipoo
7c5ca67691 Merge remote-tracking branch 'origin/master' into gameplay-clock-container
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
2019-03-08 15:54:15 +09:00
Dean Herbert
ed8c9bc88a Merge remote-tracking branch 'upstream/master' into gameplay-clock-container 2019-03-08 15:07:55 +09:00
Dean Herbert
64b6eaa844 Simplify inward bindings 2019-03-07 16:04:11 +09:00
Dean Herbert
58ef397f4f Move all clock related gameplay logic inside GameplayClockContainer 2019-03-07 16:02:24 +09:00
Dean Herbert
ffe53411f6 Add back cursor proxying 2019-03-06 17:44:58 +09:00
Dean Herbert
acf518c208 Move cursor inside playfield 2019-03-06 17:41:54 +09:00
Dean Herbert
5411c63093 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-06 17:14:08 +09:00
Dean Herbert
6b042eae94
Merge branch 'master' into fix-cursor-in-scale-container 2019-03-05 22:22:56 +09:00
Dean Herbert
8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock 2019-03-05 20:22:46 +09:00
Dean Herbert
76ce3954a0 Rename PauseContainer 2019-03-05 19:30:55 +09:00
Dean Herbert
fc0b297232 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-05 18:06:24 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
Dean Herbert
c5cd9972c4 Make restart private 2019-03-05 13:37:51 +09:00
Dean Herbert
01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +09:00
Dean Herbert
30e820d107 Fix storyboard potentially being loaded many times 2019-02-28 20:36:00 +09:00
Dean Herbert
53eb0e7e4e More formatting fixes 2019-02-28 20:30:23 +09:00
Dean Herbert
6861163226 Remove pointless method 2019-02-28 20:21:27 +09:00
David Zhao
e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00
Dan Balasescu
99812bd448
Apply suggestions from code review
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-28 18:25:58 +09:00
Dean Herbert
b2872b47d0
Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
David Zhao
882fff1631 Assert storyboard visibilty at both steps of toggle 2019-02-27 17:56:44 +09:00
David Zhao
14ffd9efe8 Add fake storyboard to visually assess storyboard dim 2019-02-27 17:02:04 +09:00
David Zhao
d750023c52 Fix TestCasePlayerLoader not having a background stack 2019-02-25 22:05:49 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
David Zhao
16fa30f71e Fix bindable 2019-02-25 13:27:44 +09:00
David Zhao
ccc86b66fa Use local private bindable in Player.cs 2019-02-25 13:15:37 +09:00
David Zhao
af4606f3d2 Create new test for StoryboardReplacesBackground 2019-02-25 12:35:01 +09:00
David Zhao
24f5bc7a75 Add documentation and move storyboard init logic 2019-02-24 20:03:24 +09:00
David Zhao
f4acd6e48f Move PlayerLoader tests out of constructor, Improve Documentation 2019-02-24 18:10:59 +09:00
David Zhao
ab3fa91a2f
Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
David Zhao
263972a048 Remove DimLevel bindable from ScreenWithBeatmapBackground 2019-02-22 17:00:00 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
David Zhao
97db8abd59 Remove unused includes 2019-02-21 18:34:11 +09:00
David Zhao
0677194f46 Move all storyboard show logic into UserDimContainer 2019-02-21 18:14:58 +09:00
David Zhao
ad5e81f0cd Add test case for background preview, fix unit tests 2019-02-21 15:24:26 +09:00
David Zhao
1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +09:00
David Zhao
af049004dd Add test cases for transitioning into pause overlay and into results 2019-02-18 19:53:55 +09:00
David Zhao
80800f2931 Match up fade behavior with current master 2019-02-18 16:34:11 +09:00
David Zhao
9be25c3758 Fix unit tests 2019-02-18 16:00:59 +09:00
David Zhao
f241d67e5f Use conditional operator isntead of if 2019-02-18 15:23:03 +09:00
David Zhao
df148f8787 Fix background dim not being disabled on playerloader exit 2019-02-18 12:55:42 +09:00
David Zhao
8693d6a76b
Merge branch 'master' into UserDimLogic 2019-02-15 17:11:21 +09:00
David Zhao
6da9f94ae3 Fix regression with background dim 2019-02-15 16:17:01 +09:00
David Zhao
3a74ad678a clean up unused includes 2019-02-14 18:41:10 +09:00
David Zhao
e2a312a663 Move user dimming logic into its own container 2019-02-14 17:47:53 +09:00
Dean Herbert
166cdab2e8 Remove unnecessary null check 2019-02-13 14:14:57 +09:00
Dean Herbert
2ea839c475 Fix crashes on beatmap not being set correctly in player 2019-02-12 19:18:22 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728 Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
1730ad143f
Merge branch 'master' into fix-key-counter 2019-01-23 18:22:08 +09:00
chrisny286
bb56c4a1a7 use Color4.Black and White + using osuTK.Graphics 2019-01-23 09:08:34 +01:00
chrisny286
f4ebab2d3a Fix backgrounds being transparent in some scaling modes
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
2019-01-23 08:52:25 +01:00
Dean Herbert
f107a922b4 Add tests for key counter inside player heirarchy 2019-01-23 14:51:25 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
7d1163a7d2 Remove unnecessary null check 2019-01-04 15:49:23 +09:00
Dean Herbert
c528a3896d Formatting and naming 2019-01-04 15:34:32 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00
smoogipoo
a62405d82d Fix plays with mods not submitting 2018-12-27 22:17:03 +09:00
smoogipoo
bb08bf10a0 Fix post-merge issues 2018-12-22 16:26:27 +09:00
smoogipoo
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
Dean Herbert
71e5ce59da Fix crash on exiting player during results transition 2018-12-13 16:23:51 +09:00
Roman Kapustin
c6c255718b Handle ModAutoplay during score construction in the Player 2018-12-03 22:37:26 +03:00
smoogipoo
795933d1a1 CreateScoreInfo -> CreateScore 2018-11-30 18:32:08 +09:00
smoogipoo
a6b0e35b2d Fix post-rebase issues 2018-11-30 18:31:54 +09:00
smoogipoo
a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
smoogipoo
4c1abdcd8c Save score upon map completion 2018-11-30 18:25:14 +09:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
ed02847752 Beatmap -> BeatmapInfo + add foreign key 2018-11-28 17:26:39 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
Dean Herbert
7f73fc2d39 Require holding back button to quit gameplay
Avoids accidental presses and streamlines logic with on-screen element.
2018-11-07 01:49:21 +09:00
Paul Teng
d8f97a32c7 Make sure restart on fail actually fails 2018-10-31 07:03:37 -04:00
Paul Teng
007dfedbb7 Combine RestartOnFail into FailOverride 2018-10-30 07:12:06 -04:00
Paul Teng
fd774c6a09 Allow restarts in ModPerfect 2018-10-14 11:18:52 -04:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +09:00
smoogipoo
2fb62827e2 Soft-handle errors when beatmap contains no objects 2018-08-22 16:01:58 +09:00
Dean Herbert
7097ecb740 Fix discrepancies in how elements of play mode fade when restarting/exiting 2018-08-02 19:08:23 +09:00
Dean Herbert
8c3583ac54 Remove newline 2018-07-30 14:55:03 +09:00
phosphene47
d32a3ff052 Esc at the end of play should push to result screen
Closes #3060
2018-07-28 08:34:51 +10:00
Dean Herbert
44a2ae5f9a Fix incorrect variable usage 2018-07-23 08:33:47 +02:00
Dean Herbert
3c59ccadd0 Fix gameplay always skipping to first hitobject time
Regresssed with previous build
2018-07-22 22:19:58 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
241437c819 Remove unnecessary counting change logic 2018-07-20 17:08:25 +09:00
Dean Herbert
82ddbb3f5d Delay key count stop 2018-07-19 01:18:07 +09:00
Dean Herbert
8414fe9d05 Add key counter exceptions for paused state 2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833 Set restart count 2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986 Better pause logic 2018-07-18 19:59:04 +09:00
Dean Herbert
b967fe714b Fix lead-in time now being long enough in many cases 2018-07-17 14:29:22 +09:00
Dean Herbert
da300baff1 Update hide logic 2018-07-17 00:06:51 +09:00
Dean Herbert
ca7b61367f
Merge branch 'master' into correctQuickFade 2018-07-17 00:02:15 +09:00
HoutarouOreki
453d58bcbd Hide Content instead of particular overlays 2018-07-15 01:10:05 +02:00
Berkan Diler
c8697e1743
Fix KeyCounter counting clicks when game is paused 2018-07-14 03:08:28 +02:00
HoutarouOreki
1e48582dc2 Instantly hide pause menu for quick retry 2018-07-11 13:49:37 +02: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
750f5a86c3 Fix catch test failing due to disabled bindable 2018-06-29 16:49:11 +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
d9e7a324c0 Revert HudOverlay to private field 2018-06-13 11:30:22 +09:00
smoogipoo
67aa52fb1d Use bindable binding 2018-06-12 19:34:49 +09:00
smoogipoo
c70c7a476b Always display the key counter during replay/autoplay 2018-06-12 17:59:59 +09:00
smoogipoo
b9391b3c6b Fix bindable not working under non-debug due to weak references 2018-06-11 18:18:24 +09:00
Aergwyn
792d3b8215 allow "go back" keybind in play 2018-06-09 09:14:58 +02:00
Dean Herbert
0b4f5af52e Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Dean Herbert
f3c9049660
Merge branch 'master' into disallow-beatmap-change 2018-06-07 15:34:19 +09:00
smoogipoo
d516a0a05c Store platform offset clock in variable for visibility 2018-06-07 13:42:31 +09:00
smoogipoo
3745f9000b Merge remote-tracking branch 'origin/master' into remove-decoder-offset 2018-06-07 13:37:19 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
55921efffb Rewrite much state logic 2018-06-06 16:17:51 +09:00
Dean Herbert
86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
Dean Herbert
64eda27547 Update framework 2018-06-03 03:05:53 +09:00
smoogipoo
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
smoogipoo
8ae2a3696f Apply platform universal offset at player level 2018-05-28 03:31:46 +09:00
Dean Herbert
975ce82177 Ensure autoplay tests actually increase score above zero 2018-05-26 14:46:05 +09:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
Dean Herbert
156d7fb25a Change depth of HUD
Yes, this is intentional.
2018-05-22 02:08:21 +09:00
Dean Herbert
ebda287e81 Share code with HoldToConfirm implementations elsewhere 2018-05-22 01:44:06 +09:00
Dean Herbert
841336a181
Merge branch 'master' into exit_replay_button 2018-05-21 23:45:06 +09:00
Aergwyn
b7e3ea348b expose two Bindables with split logic instead of one with mixed logic 2018-05-21 15:53:55 +02:00
Aergwyn
1482bca147 Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
Dean Herbert
e2389ad7a4 Allow using back button on PlayerLoader and Replay 2018-05-18 13:32:05 +09:00
Dean Herbert
0234bbc37f Move definition inline 2018-05-14 19:14:17 +09:00
smoogipoo
115c2dc239 Move hud below the skip button 2018-05-14 18:02:18 +09:00
smoogipoo
64fba5f6d1 Proxy the ruleset cursor above the break overlay 2018-05-14 15:36:56 +09:00
smoogipoo
43409127b7 Place break overlay underneath the hud 2018-05-14 15:36:42 +09:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
Roman Kapustin
f8630115d6 Do not expose HoldToQuit.HoldToQuitButton 2018-05-03 23:29:58 +03:00
UselessToucan
d18a8ec9f5
Merge branch 'master' into exit_replay_button 2018-04-28 20:48:16 +03:00
TocoToucan
e6d7136a92 Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction 2018-04-21 20:21:09 +03:00
TocoToucan
21454d1f10 Revert "Add 'End replay' button"
This reverts commit c34ef42f00.
2018-04-21 19:27:17 +03:00
TocoToucan
c34ef42f00 Add 'End replay' button 2018-04-20 12:50:19 +03:00
Dean Herbert
8bf25542cb Add PlayerLoader TestCase and fix dummy beatmap load procedure 2018-04-20 17:30:27 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
FreezyLemon
46d859a660 exit player earlier if a dummy map is loaded 2018-03-25 13:25:48 +02:00
FreezyLemon
a3d8048aca abort loading and exit player for dummy maps 2018-03-22 21:46:35 +01:00
Dean Herbert
9ad4e9284a Add skin source fallback chain 2018-03-20 16:40:11 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
smoogipoo
33c721bcbb Fix post-merge errors 2018-03-12 09:51:32 +09:00
smoogipoo
6e51b74890 Merge remote-tracking branch 'origin/master' into rewrite-break-overlay 2018-03-12 09:47:05 +09:00
Dean Herbert
487a03d0d7
Merge branch 'master' into cursor-trail 2018-03-11 02:07:05 +09:00
Dean Herbert
6d91889ca6 Move player-specific configuration bindables back to player 2018-03-08 22:16:47 +09:00
TocoToucan
2cb197d0c4 Replace ConfigureBackgroundUpdate with OnEntering 2018-03-08 11:35:00 +03:00
Dean Herbert
6a768e378a
Merge branch 'master' into rewrite-break-overlay 2018-03-07 17:00:34 +09:00
TocoToucan
697ad63d72 Resolve merge conflicts 2018-03-05 22:24:25 +03:00
Dean Herbert
792a3ac469 SkipButton -> SkipOverlay 2018-03-06 00:10:53 +09:00
Dean Herbert
c6c55c40ed Rewrite BreakOverlay
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
2018-03-04 00:51:24 +09:00
Dean Herbert
bd510e5356 Merge remote-tracking branch 'upstream/master' into clock-fixes 2018-03-02 21:01:53 +09:00
Dean Herbert
bda673e6fe
Merge branch 'master' into player-reduced-parallax 2018-02-28 23:15:25 +09:00
Dean Herbert
f9faf8e3d8 Localise offset clock usage out of Player as much as possible 2018-02-28 22:01:52 +09:00
Dean Herbert
01fcf9c813 Update in line with framework changes 2018-02-28 22:01:48 +09:00
Dean Herbert
dd6cf1379e Reduce parallax effect during gameplay
This also cleans up some shared code in OsuScreen.
2018-02-28 11:42:47 +09:00
Dean Herbert
f64afc738d Fix incorrect exit block conditional
Resolves #2130.
2018-02-27 23:59:34 +09:00