Dean Herbert
|
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 |
|
DrabWeb
|
0d53d3c4ff
|
Fixed quitting not working
|
2017-01-31 22:33:28 -04:00 |
|
Dean Herbert
|
046732b7e3
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-02-01 10:09:14 +09:00 |
|
DrabWeb
|
c92418e000
|
Made Player.canPause one line
|
2017-01-31 21:02:58 -04:00 |
|
DrabWeb
|
13da75f149
|
Fixed a bug where the user can double press escape to exit the song
|
2017-01-31 20:44:59 -04:00 |
|
DrabWeb
|
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 |
|
Drew DeVault
|
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 |
|
DrabWeb
|
91a5d0b3cf
|
Made requested changes
|
2017-01-31 09:17:47 -04:00 |
|
Dean Herbert
|
6b66ecc131
|
Global shadows and more sane font size setting.
|
2017-01-31 18:53:52 +09:00 |
|
DrabWeb
|
740f6e5595
|
Moved delaying resuming to Player
|
2017-01-30 09:06:26 -04:00 |
|
DrabWeb
|
ad33ae9431
|
Removed unnecessary change
|
2017-01-30 06:24:44 -04:00 |
|
DrabWeb
|
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 |
|
DrabWeb
|
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 |
|
DrabWeb
|
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 |
|
DrabWeb
|
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 |
|
DrabWeb
|
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 |
|
DrabWeb
|
601a5ed39c
|
Reverted Player to upstream
|
2017-01-27 14:29:51 -04:00 |
|
Dean Herbert
|
3e7503e860
|
Make skip button work.
|
2017-01-27 21:57:22 +09:00 |
|
Dean Herbert
|
420e61fa97
|
TwoLayerButton
|
2017-01-27 21:08:36 +09:00 |
|
DrabWeb
|
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 |
|
DrabWeb
|
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 |
|
DrabWeb
|
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 |
|
Dean Herbert
|
5787b43586
|
wip
|
2017-01-27 19:14:44 +09:00 |
|
DrabWeb
|
fe265c01cb
|
Added current work on pause overlay
|
2017-01-27 05:24:49 -04:00 |
|
Dean Herbert
|
139cac5e57
|
Add fail dialog and flow.
|
2017-01-27 00:41:34 +09:00 |
|
Dean Herbert
|
8c7bb4990c
|
Add support for failing.
|
2017-01-27 00:38:21 +09:00 |
|
Dean Herbert
|
70271fee35
|
Move PlayerInputManager to own file.
|
2017-01-27 00:38:21 +09:00 |
|
Dean Herbert
|
1853bbdda8
|
Move window/volume configuration to framework level.
|
2017-01-25 18:44:51 +09:00 |
|
TocoToucan
|
259c0964fd
|
Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations
|
2017-01-16 23:14:35 +03:00 |
|
Drew DeVault
|
e81073695f
|
Implement disable mouse buttons
|
2017-01-13 17:17:04 -05:00 |
|
n4b3l
|
aebe87fefc
|
better implementation
|
2016-12-19 16:09:29 +01:00 |
|
n4b3l
|
09f9f86b06
|
check if dimLevel is null on exit
|
2016-12-19 14:03:10 +01:00 |
|
n4b3l
|
df305989d0
|
use config bindable directly
|
2016-12-18 10:48:59 +01:00 |
|
n4b3l
|
0fbd2d8bc8
|
removed random enter
|
2016-12-17 21:03:14 +01:00 |
|
n4b3l
|
224e6a877a
|
responsive to dim changes
|
2016-12-17 20:59:41 +01:00 |
|
n4b3l
|
36049cc493
|
smoother transition
|
2016-12-17 20:29:20 +01:00 |
|
n4b3l
|
c73fbe6e42
|
Remove unnecessary casts
|
2016-12-17 15:06:56 +01:00 |
|
n4b3l
|
ba81222af6
|
basic background dim
|
2016-12-16 17:13:24 +01:00 |
|
Dean Herbert
|
6cfb174f02
|
Fix exiting results screen returning to player.
|
2016-12-08 20:03:18 +09:00 |
|
Dean Herbert
|
bbc11c77ca
|
Add (temporary) transitions to songselect and player.
|
2016-12-07 20:47:28 +09:00 |
|
Dean Herbert
|
74e3a87f78
|
Add *very* basic ranking screen.
|
2016-11-29 23:59:56 +09:00 |
|
Dean Herbert
|
2947121e48
|
Hook up ScoreProcessor to Scoreoverlay etc.
|
2016-11-29 21:28:43 +09:00 |
|
Dean Herbert
|
9d2a69f1e2
|
Add concept of ScoreProcessor.
|
2016-11-29 20:30:16 +09:00 |
|
Dean Herbert
|
9871960112
|
Basic score flow.
|
2016-11-29 17:34:16 +09:00 |
|
Dean Herbert
|
396ca9fe91
|
Remove HitJudgementResolver; reimplement in DrawableHitObject.
|
2016-11-26 16:51:51 +09:00 |
|
Dean Herbert
|
f9f72f25a2
|
Add basic flow for hitobject judgement.
|
2016-11-25 16:26:50 +09:00 |
|
Dean Herbert
|
6c69bd2ba3
|
Fix regression causing crash on using z/x in player mode.
|
2016-11-24 21:27:12 +09:00 |
|
Dean Herbert
|
3e9c398652
|
Update input handler logic to match framework changes.
|
2016-11-21 21:36:11 +09:00 |
|
Thomas Müller
|
c6d688898f
|
Initial implementation of a beatmap carousell and various minor improvements to song select.
No big optimizations yet, but groundwork is laid out.
|
2016-11-20 20:34:16 +01:00 |
|
Thomas Müller
|
40805ad32c
|
Adjust size of wedged background overlay.
|
2016-11-20 12:29:38 +01:00 |
|
Thomas Müller
|
57e7c7097d
|
Update framework and add rudimentary fading to song select screen.
|
2016-11-20 12:16:54 +01:00 |
|
Thomas Müller
|
0fdd505807
|
Add wedged background overlay to song select.
|
2016-11-20 10:02:20 +01:00 |
|
Thomas Müller
|
f8788bb24b
|
Update the background according to the currently selected beatmap and blur it within song select.
|
2016-11-19 17:39:43 +01:00 |
|
Dean Herbert
|
b61521a93c
|
Tidy up Player.cs.
|
2016-11-16 15:48:35 +09:00 |
|
Huo Yaoyuan
|
53deaf2a00
|
Merge branch 'master'
|
2016-11-16 10:51:39 +08:00 |
|
Dean Herbert
|
d846246ef2
|
ShowToolbar -> ShowOverlays; include MusicController.
|
2016-11-15 20:55:57 +09:00 |
|
Dean Herbert
|
5dd4e31011
|
Move DrawableHitObject.
|
2016-11-14 19:49:29 +09:00 |
|
Dean Herbert
|
4590be552f
|
Move play modes to their own projects.
|
2016-11-14 18:54:24 +09:00 |
|
Dean Herbert
|
06f4f93918
|
Move play modes to Modes namespace.
|
2016-11-14 18:03:20 +09:00 |
|
Dean Herbert
|
0f4538f69f
|
Rename GameModes namespace to Screens.
|
2016-11-14 17:23:33 +09:00 |
|