aef0eb49a1
Add loading screen.
2017-02-22 21:53:59 +09:00
2d2660c1c5
Improve transition when retrying a beatmap.
2017-02-22 14:14:37 +09:00
32ce8cf723
Audio class renames in line with framework changes.
2017-02-18 17:35:04 +09:00
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
d570a6d308
Handle cases where HitObjects were not parsed.
2017-02-15 12:38:10 +09:00
343e48c195
Merge branch 'master' into followpoints
2017-02-13 22:23:57 +09:00
2d155f6a5c
Bring back the delay to what it was before.
2017-02-10 10:48:25 +01:00
6f37c02868
Fix followpoints needing a DelayReset.
2017-02-10 10:07:52 +01:00
a504c73f33
Load beatmap data from an optional osb file.
2017-02-09 15:19:09 +01:00
38b25a7df3
Add hit object stacking.
2017-02-09 07:28:40 +01:00
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
4f89cc0784
Merge pull request #298 from peppy/skip-button
...
Make skip button work.
2017-02-03 12:47:53 +09:00
52fb345e79
Merge branch 'master' into song-select-filtering
2017-02-02 09:25:27 -08:00
c88a2fbf8a
Replace incorrectly removed background logic
...
I had earlier thought that removing this would solve the weirdness with
starting the beatmap on any but the first difficulty, and forgot to
replace it when I found the actual cause.
2017-02-01 19:32:30 -05:00
7ce5fc08ee
Merge branch 'master' into skip-button
...
# Conflicts:
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
0d53d3c4ff
Fixed quitting not working
2017-01-31 22:33:28 -04:00
046732b7e3
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-02-01 10:09:14 +09:00
c92418e000
Made Player.canPause one line
2017-01-31 21:02:58 -04:00
13da75f149
Fixed a bug where the user can double press escape to exit the song
2017-01-31 20:44:59 -04:00
bcd41a2c8f
Moved pause overlay action setting to the initialiser in Player, moved pause overlay displaying be handled in OnExiting instead of OnKeyDown, removed clockWasStarted and used sourceClock.IsRunning instead
2017-01-31 20:28:50 -04:00
624d51204f
Fix issue with background on player
...
Not sure why this only happens on my branch, I didn't touch this code.
2017-01-31 19:14:54 -05:00
91a5d0b3cf
Made requested changes
2017-01-31 09:17:47 -04:00
740f6e5595
Moved delaying resuming to Player
2017-01-30 09:06:26 -04:00
ad33ae9431
Removed unnecessary change
2017-01-30 06:24:44 -04:00
015832f242
Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause
2017-01-30 06:14:28 -04:00
d70cbd37dd
Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player
2017-01-30 04:08:14 -04:00
28967cf77a
Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups
2017-01-29 05:04:48 -04:00
582599a8de
Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar
2017-01-28 16:55:42 -04:00
feba3f35ba
Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place
2017-01-27 15:28:39 -04:00
601a5ed39c
Reverted Player to upstream
2017-01-27 14:29:51 -04:00
3e7503e860
Make skip button work.
2017-01-27 21:57:22 +09:00
420e61fa97
TwoLayerButton
2017-01-27 21:08:36 +09:00
3ed88ea043
Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed
2017-01-27 07:11:22 -04:00
81de5a2097
Made the pause overlay be at -1 depth so it renders on top of everything(used to allow circles to draw on top)
2017-01-27 06:36:43 -04:00
f35974021a
Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing
2017-01-27 06:19:52 -04:00
5787b43586
wip
2017-01-27 19:14:44 +09:00
fe265c01cb
Added current work on pause overlay
2017-01-27 05:24:49 -04:00
139cac5e57
Add fail dialog and flow.
2017-01-27 00:41:34 +09:00
8c7bb4990c
Add support for failing.
2017-01-27 00:38:21 +09:00
70271fee35
Move PlayerInputManager to own file.
2017-01-27 00:38:21 +09:00
1853bbdda8
Move window/volume configuration to framework level.
2017-01-25 18:44:51 +09:00
259c0964fd
Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations
2017-01-16 23:14:35 +03:00
e81073695f
Implement disable mouse buttons
2017-01-13 17:17:04 -05:00
aebe87fefc
better implementation
2016-12-19 16:09:29 +01:00
09f9f86b06
check if dimLevel is null on exit
2016-12-19 14:03:10 +01:00
df305989d0
use config bindable directly
2016-12-18 10:48:59 +01:00
0fbd2d8bc8
removed random enter
2016-12-17 21:03:14 +01:00
224e6a877a
responsive to dim changes
2016-12-17 20:59:41 +01:00
36049cc493
smoother transition
2016-12-17 20:29:20 +01:00
c73fbe6e42
Remove unnecessary casts
2016-12-17 15:06:56 +01:00
