1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 06:42:54 +08:00
Commit Graph

1513 Commits

Author SHA1 Message Date
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
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
Dean Herbert
6d44c5c8f1 Move logo colour definitions local to their usage. 2017-01-27 17:57:52 +09:00
Dean Herbert
9b2669e1ae Add flash when activating the osu! logo. 2017-01-27 17:23:53 +09:00
Dean Herbert
50e4c39e32 Add flash when activating a menu button. 2017-01-27 17:23:53 +09:00
Dean Herbert
a238637990 Move osu! logo colour declarations to palette. 2017-01-27 17:23:53 +09:00
Dean Herbert
f3e9da609e Merge pull request #295 from peppy/songselect-footer
Initial implementation of song select footer area.
2017-01-27 16:13:43 +09:00
Dean Herbert
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
Dean Herbert
335420ec30 Merge pull request #290 from peppy/player-extension
Add failing support
2017-01-27 16:12:17 +09:00
Drew DeVault
f3c5c1f0b8 Fixes following recent updates upstream 2017-01-26 21:31:28 -05:00
Drew DeVault
417933b7ec Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-26 13:57:55 -05:00
Dean Herbert
629605c6b4 Make HasFailed's set private. 2017-01-27 00:41:34 +09:00
Dean Herbert
4efedd942d Use null propagation. 2017-01-27 00:41:34 +09:00
Dean Herbert
f07b9591cd Add null check when popping backgrounds from the mode stack. 2017-01-27 00:41:34 +09:00
Dean Herbert
139cac5e57 Add fail dialog and flow. 2017-01-27 00:41:34 +09:00
Dean Herbert
1d24ad3db6 osu! mode starts with health being full. 2017-01-27 00:41:34 +09:00
Dean Herbert
c3699c1395 Remove unused prevCount variable. 2017-01-27 00:39:00 +09:00
Dean Herbert
c01863dfa2 Add min/max constraints to HealthDisplay. 2017-01-27 00:39:00 +09:00
Dean Herbert
9f44e634a4 Allow visualtests to share config etc. with osu!. 2017-01-27 00:39:00 +09:00
Dean Herbert
cd149f04fc Use bindable for HealthDisplay. 2017-01-27 00:38:21 +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
4a7b3cf391 Initial implementation of song select footer area. 2017-01-27 00:36:12 +09:00
Dean Herbert
d4e30f65db Adjust timing of TestCaseHitObjects a bit. 2017-01-27 00:16:02 +09:00
Dean Herbert
a2501cc81d Fix TestCaseHitObjects not working at all due to state being set before load is complete. 2017-01-27 00:16:02 +09:00
Dean Herbert
7ee6a50404 Fix checkbox design regressions. 2017-01-27 00:16:02 +09:00
Dean Herbert
c07001b566 Fix TestCasePlayer not working on consecutive executions (clock being set where it isn't necessary). 2017-01-27 00:16:02 +09:00
Dean Herbert
4aa2834082 Fix TestCasePlaySongSelect not working on consecutive executions. 2017-01-27 00:16:02 +09:00
Dean Herbert
162e183b36 Fix some nullrefs when running visualtests with no maps loaded. 2017-01-27 00:16:02 +09:00
Thomas Müller
d17bef12b6 Merge pull request #294 from peppy/framework-configuration
Move window/volume configuration to framework level.
2017-01-26 15:50:13 +01:00
Dean Herbert
db37a7e332 Update framework. 2017-01-26 23:36:35 +09:00
Dean Herbert
25da8a53dc Fix incorrect configuration retrievals. 2017-01-26 23:08:39 +09:00
Dean Herbert
1853bbdda8 Move window/volume configuration to framework level. 2017-01-25 18:44:51 +09:00
Dean Herbert
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
Dean Herbert
3a27178bb1 Merge pull request #289 from UselessToucan/JudgementsCapacity
Specify ScoreProcessor.Judgements.Capacity
2017-01-23 21:40:00 +09:00
Dean Herbert
373d2a0f35 Merge branch 'master' into general-fixes 2017-01-23 21:39:05 +09:00
Dean Herbert
0fcdc7ec11 Merge pull request #291 from peppy/mode-entering
Move Intro logic to OnEntering in line with framework changes.
2017-01-23 21:37:59 +09:00
Dean Herbert
f8da718da8 Update framework. 2017-01-23 21:33:45 +09:00
Dean Herbert
56fe69852d Change beatmap database reset logic to only run a maximum of once. 2017-01-23 18:13:06 +09:00
Dean Herbert
ef8347fe53 Reset the beatmap database when it can't be read, rather than hard failing. 2017-01-23 13:02:03 +09:00
Dean Herbert
ae464fcace Move Intro logic to OnEntering in line with framework changes. 2017-01-20 16:30:24 +08:00
TocoToucan
badc8def9a hitObjectsNumber -> hitObjectCount 2017-01-18 18:51:38 +03:00
Dean Herbert
2025e8ef71 Merge pull request #288 from peppy/hpdisplay
Simple HP display implementation.
2017-01-18 11:18:45 +08:00
Dean Herbert
cd8c9393f3 HP -> Health 2017-01-18 11:08:16 +08:00
Drew DeVault
678f0aaa16 Implement filtering with strings 2017-01-17 19:18:15 -05:00
Drew DeVault
75de03bd88 Use OsuColour for green text 2017-01-17 18:26:43 -05:00
Drew DeVault
46e7bcef8c Improve beatmap import 2017-01-17 17:05:06 -05:00
Drew DeVault
7559fc593a Use default background on empty song select screen 2017-01-17 16:43:53 -05:00