1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 04:07:24 +08:00
Commit Graph

37 Commits

Author SHA1 Message Date
Thomas Müller
0f72ef7dc2 Make pause buttons OnClick and not OnMouseDown. 2017-02-05 20:17:02 +01:00
Thomas Müller
c56478e154 Add missing license header. 2017-02-05 20:16:40 +01:00
Thomas Müller
d291103d22 Avoid triangle bleeding by masking the triangle container without smoothness. 2017-02-05 16:34:47 +01:00
Andrey Zavadskiy
43dcf0bbc1 PauseButton Triangles 2017-02-05 13:47:37 +03:00
Thomas Müller
6db70f8850 Use MaskingSmoothness to make masked diagonal edges smoother. 2017-02-04 11:06:26 +01:00
Drew DeVault
52fb345e79 Merge branch 'master' into song-select-filtering 2017-02-02 09:25:27 -08:00
Dean Herbert
aec84ae725 Fix laggy animations, incorrect hiding logic. 2017-02-02 19:24:14 +09:00
DrabWeb
0d53d3c4ff Fixed quitting not working 2017-01-31 22:33:28 -04:00
DrabWeb
91a5d0b3cf Made requested changes 2017-01-31 09:17:47 -04:00
DrabWeb
bf54ae86ea Added flash when clicking a PauseButton 2017-01-31 08:07:05 -04:00
DrabWeb
fe09bab78f Removed empty ctor in PauseProgressGraph 2017-01-30 16:18:34 -04:00
DrabWeb
9d4a14074f Woops forgot to add PauseButton 2017-01-30 16:18:11 -04:00
DrabWeb
2f2f0ed9a3 Fixed an issue with PauseButton's glow not fading in 2017-01-30 09:26:24 -04:00
DrabWeb
740f6e5595 Moved delaying resuming to Player 2017-01-30 09:06:26 -04:00
DrabWeb
af8294f02c Renamed/removed various private constants 2017-01-30 08:45:10 -04:00
DrabWeb
dbb9078e30 Fixed glow on PauseButton not updating 2017-01-30 08:19:44 -04:00
DrabWeb
ed3ed8251f Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses 2017-01-30 08:04:39 -04:00
DrabWeb
dcb02eff65 Cleared out PauseProgressGraph 2017-01-30 07:19:14 -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
62282076c7 Changes on PauseButton to match design closer 2017-01-30 05:04:57 -04:00
DrabWeb
f8cbc35f8e Small cleanups 2017-01-30 04:43:06 -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
c75b234b1a Adjusted the fade time of the pause overlay, put a fill behind the colour of PauseButton to fix an issue where the background gray is visible when the pause overlay is fading out 2017-01-28 21:50:06 -04:00
DrabWeb
d0a22bfdd4 Added PauseOverlay.SetRetries for updating the retry indicator 2017-01-28 20:56:23 -04:00
DrabWeb
d4216eb539 Made resume not call until double the time of the fade animation 2017-01-28 20:45:10 -04:00
DrabWeb
6b57456681 Removed depth setting from PauseOverlay, removed shadow offset on PauseButton color(why was that even there?), fixed the triangles on PauseButton not masking to the sheared container, made PauseButton call it's action on MouseUp instead of MouseDown to match stable 2017-01-28 20:30:37 -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
490feac030 Working on design 2017-01-27 14:18:57 -04:00
DrabWeb
e115120543 Renamed pauseDisableTime to pauseCooldown 2017-01-27 08:13:39 -04:00
DrabWeb
8c6d9bdf2e Added commas to the end of UI creation to match how the rest of the project does, moved PauseButton audio loading to PauseOverlay, much more reliable(still using placeholder assets), made it so the player can't spam pause, cools down to one second 2017-01-27 08:03:32 -04: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
DrabWeb
dedd6a4bcf Small cleanups 2017-01-27 05:39:15 -04:00
DrabWeb
fe265c01cb Added current work on pause overlay 2017-01-27 05:24:49 -04:00