Commit Graph

23426 Commits

Author SHA1 Message Date
f12a8ace3f Moved Config logic to OsuConfigManager 2017-01-28 13:10:05 +03:00
ac7feafe9a Merge branch 'master' into login_fix 2017-01-28 11:24:08 +02:00
10897486ba Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-27 15:41:46 -05: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
490feac030 Working on design 2017-01-27 14:18:57 -04:00
3e7503e860 Make skip button work. 2017-01-27 21:57:22 +09:00
e115120543 Renamed pauseDisableTime to pauseCooldown 2017-01-27 08:13:39 -04:00
420e61fa97 TwoLayerButton 2017-01-27 21:08:36 +09:00
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
811cf4b04e Added newline, thanks Xamarin 2017-01-27 07:12:20 -04: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
dedd6a4bcf Small cleanups 2017-01-27 05:39:15 -04:00
fe265c01cb Added current work on pause overlay 2017-01-27 05:24:49 -04:00
6d44c5c8f1 Move logo colour definitions local to their usage. 2017-01-27 17:57:52 +09:00
9b2669e1ae Add flash when activating the osu! logo. 2017-01-27 17:23:53 +09:00
50e4c39e32 Add flash when activating a menu button. 2017-01-27 17:23:53 +09:00
a238637990 Move osu! logo colour declarations to palette. 2017-01-27 17:23:53 +09:00
f3e9da609e Merge pull request #295 from peppy/songselect-footer
Initial implementation of song select footer area.
2017-01-27 16:13:43 +09:00
8987a09741 Merge pull request #293 from peppy/general-fixes
Fix some nullrefs when running visualtests with no maps loaded.
2017-01-27 16:12:46 +09:00
335420ec30 Merge pull request #290 from peppy/player-extension
Add failing support
2017-01-27 16:12:17 +09:00
f3c5c1f0b8 Fixes following recent updates upstream 2017-01-26 21:31:28 -05:00
417933b7ec Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-26 13:57:55 -05:00
629605c6b4 Make HasFailed's set private. 2017-01-27 00:41:34 +09:00
4efedd942d Use null propagation. 2017-01-27 00:41:34 +09:00
f07b9591cd Add null check when popping backgrounds from the mode stack. 2017-01-27 00:41:34 +09:00
139cac5e57 Add fail dialog and flow. 2017-01-27 00:41:34 +09:00
1d24ad3db6 osu! mode starts with health being full. 2017-01-27 00:41:34 +09:00
c3699c1395 Remove unused prevCount variable. 2017-01-27 00:39:00 +09:00
c01863dfa2 Add min/max constraints to HealthDisplay. 2017-01-27 00:39:00 +09:00
9f44e634a4 Allow visualtests to share config etc. with osu!. 2017-01-27 00:39:00 +09:00
cd149f04fc Use bindable for HealthDisplay. 2017-01-27 00:38:21 +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
4a7b3cf391 Initial implementation of song select footer area. 2017-01-27 00:36:12 +09:00
d4e30f65db Adjust timing of TestCaseHitObjects a bit. 2017-01-27 00:16:02 +09:00
a2501cc81d Fix TestCaseHitObjects not working at all due to state being set before load is complete. 2017-01-27 00:16:02 +09:00
7ee6a50404 Fix checkbox design regressions. 2017-01-27 00:16:02 +09:00
c07001b566 Fix TestCasePlayer not working on consecutive executions (clock being set where it isn't necessary). 2017-01-27 00:16:02 +09:00
4aa2834082 Fix TestCasePlaySongSelect not working on consecutive executions. 2017-01-27 00:16:02 +09:00
162e183b36 Fix some nullrefs when running visualtests with no maps loaded. 2017-01-27 00:16:02 +09:00
d17bef12b6 Merge pull request #294 from peppy/framework-configuration
Move window/volume configuration to framework level.
2017-01-26 15:50:13 +01:00
db37a7e332 Update framework. 2017-01-26 23:36:35 +09:00
25da8a53dc Fix incorrect configuration retrievals. 2017-01-26 23:08:39 +09:00
1853bbdda8 Move window/volume configuration to framework level. 2017-01-25 18:44:51 +09:00
23938a810b Merge pull request #292 from peppy/general-fixes
Reset the beatmap database when it can't be read, rather than hard failing.
2017-01-23 21:43:52 +09:00
3a27178bb1 Merge pull request #289 from UselessToucan/JudgementsCapacity
Specify ScoreProcessor.Judgements.Capacity
2017-01-23 21:40:00 +09:00