Commit Graph

320 Commits

Author SHA1 Message Date
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
bda673e6fe Merge branch 'master' into player-reduced-parallax 2018-02-28 23:15:25 +09:00
dd6cf1379e Reduce parallax effect during gameplay
This also cleans up some shared code in OsuScreen.
2018-02-28 11:42:47 +09:00
f64afc738d Fix incorrect exit block conditional
Resolves #2130.
2018-02-27 23:59:34 +09:00
e0faf14a3e Actually consume ReplacesBackground 2018-02-19 12:33:07 +09:00
86f200e257 Fix possible nullref 2018-02-09 22:04:39 +03:00
a86a4f49cf Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay 2018-02-09 21:20:49 +03:00
df65443f07 Merge branch 'master'
Conflicts:
	osu-framework
	osu.Game/Screens/Play/Player.cs
2018-01-30 18:31:03 +09:00
8d11596b2f Minor cleanups 2018-01-24 17:48:42 +09:00
794ae5380a Intverted conditionals. 2018-01-22 01:06:27 -05:00
530e0afa2c Use IsCurrentScreen instead of a bool for both checks now. 2018-01-21 22:27:15 -05:00
964c6da9a4 Use IsCurrentScreen instead of a bool 2018-01-21 22:00:18 -05:00
806da21760 Removed rreduntant initialization. 2018-01-21 20:24:19 -05:00
ad2df8d8df Fixed tilde-key crash at end of beatmap. 2018-01-21 20:09:44 -05:00
4875443e12 Resolve merge conflicts 2018-01-21 18:11:43 +03:00
2ebb3d6e0e Fix ReplayLoader not being treated as having a replay loaded
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
2018-01-17 17:37:14 +09:00
0796d33e66 Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
7c41925144 ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc 2018-01-15 14:07:09 +09:00
0c4fcdf6d8 Remove not used breakOverlay field 2018-01-12 23:59:36 +03:00
3795411fd1 Do not assign hudOverlay's and breakOverlay's members in Player class 2018-01-12 23:33:24 +03:00
d0b177e233 Proxying isn't needed anymore 2018-01-12 19:50:09 +09:00
16d739580b IProvideLocalCursor -> IProvideCursor 2018-01-12 19:37:03 +09:00
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
2e235660ad Fix skip button appearing below osu!mania's stage 2018-01-12 13:25:49 +09:00
1985e5bdb2 fix background dim 2018-01-12 12:21:37 +08:00
9ec8f130a6 Ensure changes are only applied when we are the current screen 2018-01-10 13:24:26 +09:00
fcb197f7b6 Simplify logic 2018-01-09 22:21:15 +09:00
2518d16a77 Denote unused variable 2018-01-09 21:34:31 +09:00
c2fadcfc1f Merge branch 'master' into background-blur 2018-01-09 21:20:05 +09:00
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
d9a80dae5d Male NoFail use an applicable interface 2017-12-31 04:10:29 +09:00
df62ca14b7 Don't unbind when not necessary 2017-12-29 23:41:36 -06:00
3845c7ac7d Remove bluring of storyboard 2017-12-28 14:31:34 -06:00
3bfa6bd9fd Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
324a7d6377 Merge remote-tracking branch 'upstream/master' into better-testcase-player 2017-12-27 20:26:38 +09:00
9fb958eadc Make TestCasePlayer more usable
No results screen crash, no unnecessary leadin time.
2017-12-26 14:23:14 +09:00
044e4d0acd Add blur to background in Player 2017-12-25 19:11:49 -06:00
71a94d6b44 Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
6f5f4f76e5 Use Logger.Error when exceptions are involved 2017-12-25 18:21:15 +09:00
13fee5402a Remove unnecessary using
visual studio doesn't save
2017-12-21 23:20:11 +09:00
87e790080b Remove manual audio thread synchronisation logic
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
6fbd06f967 Fix Not update retry counter on PauseOverlay
I've find "You've retried xx time(s)" message that something weird.
That is not displayed pause overlay and only see count on FailOverlay
I change code that PauseContainer.Retries property can be set call-back function.

Signed-off-by: Seokho Song <0xdevssh@gmail.com>
2017-12-21 20:40:31 +09:00
016057ab01 readd storyboard to beatmap + minor cleanup 2017-11-30 16:49:53 +01:00
a574b092f6 Merge branch 'master' into change-transition-blur-rate 2017-11-27 10:42:32 +09:00
69e388dd52 Adjust background blur rate 2017-11-26 17:08:14 +09:00
7be55df790 fix being stuck in gameplay if exit is pressed too fast
The reliance on `pauseOverlay.Alpha == 1` created a race condition that, when you pressed Exit while the pauseoverlay is still fading in, could get you stuck in gameplay.
The game wants to show the pause overlay but also thinks it's already paused and returns early.
2017-11-25 19:09:05 +01:00
9565a9c352 Fix TestCasePlayer not working as expected 2017-11-23 20:42:07 +09:00
18b0b77f0a Added requested changes. Mainly changing lambdas to direct function references. 2017-11-22 21:41:50 +01:00
a033eb46d3 Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance. 2017-11-21 16:12:23 +01:00
c30d31e037 Remove extra alternateFailConditions function in Player 2017-11-21 17:30:19 +09:00