Commit Graph

11144 Commits

Author SHA1 Message Date
fed58fba3a Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 12:14:28 +09:00
ed0bf59e73 Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:51:44 +09:00
bab7d78130 Remove redundant cast
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-29 11:36:40 +09:00
785433bb74 Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
d410054ec8 Merge branch 'master' into key-counter-display 2019-03-29 11:22:59 +09:00
7715606188 Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
772f0cac8a Merge branch 'master' into gameplay-cursor-last-state 2019-03-29 11:01:13 +09:00
7ab24e35f9 Merge branch 'master' into gameplay-paused-no-update 2019-03-29 10:53:32 +09:00
4c038e7f67 Merge branch 'master' into testability-improvements 2019-03-29 10:23:12 +09:00
900c00ba59 Merge branch 'master' into drawable-clear-safety 2019-03-29 10:14:41 +09:00
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
2f5668f4e7 Fix remaining framework changes 2019-03-29 00:29:14 +09:00
176b4ecc38 Merge branch 'master' into sprite-icon-compatibility 2019-03-28 23:47:44 +09:00
bca8714905 Update framework 2019-03-28 23:25:31 +09:00
23b5271ce4 Merge branch 'master' into clean-overlays-code-1 2019-03-28 11:17:29 +09:00
d756a5d987 Merge pull request #4532 from peppy/update-framework
Update framework
2019-03-28 10:50:20 +09:00
cdf79ffe39 Merge branch 'master' into clean-overlays-code-1 2019-03-27 10:32:13 -07:00
dfb7d78903 Fix remaining game host regressions 2019-03-28 01:29:06 +09:00
61b8fb0366 Allow ScreenTestCase to support content 2019-03-27 22:28:32 +09:00
5c4f2cefea Fix Loader and TestCaseLoaderAnimation 2019-03-27 22:28:25 +09:00
1a0d1b238e Fix storage regression 2019-03-27 20:58:07 +09:00
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
3fcbc2eab3 Fix key counter getting overridden 2019-03-27 10:31:21 +09:00
15821c7511 Fix cursor adding 2019-03-26 17:04:14 +09:00
83076e32c7 Fix TestWorkingBeatmap not running for times below zero 2019-03-26 16:35:34 +09:00
dde7788c44 Merge branch 'universal-playfield-adjust' into resume-cursor-2 2019-03-26 13:58:48 +09:00
fb302e7ad8 Remove using 2019-03-26 13:58:07 +09:00
8658de5108 Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
2019-03-26 13:52:48 +09:00
27cb4ce0d1 Remove poop 2019-03-26 13:48:35 +09:00
fbc97edc55 Add base cursor class to retrieve true visibility state 2019-03-26 13:41:30 +09:00
b4d785c76c Don't update gameplay loop while paused 2019-03-26 13:36:17 +09:00
ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
e512d88899 Apply required refactor 2019-03-26 13:29:26 +09:00
5d166a011d Update framework 2019-03-26 13:28:59 +09:00
868367511e Add ManualInputManager to screen tests
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:26:55 +09:00
256a579de0 Allow player to not pause on focus loss 2019-03-26 13:17:00 +09:00
c403dede20 Add ManualInputManager to screen tests
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:16:46 +09:00
4c0121a112 Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-26 11:31:23 +09:00
b75ea295db Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
2019-03-26 11:28:43 +09:00
82140c38fc Apply CI fixes 2019-03-25 22:00:33 +09:00
a642f10131 Remove redundant cast 2019-03-25 21:52:01 +09:00
15aea7f745 Update framework 2019-03-25 21:50:28 +09:00
245f463e3f Don't update gameplay loop while paused 2019-03-25 20:31:55 +09:00
a23dfb58ad Add base cursor class to retrieve true visibility state 2019-03-25 20:31:55 +09:00
06d4856e17 Remove unnecessary CursorTargetContainer 2019-03-25 20:31:55 +09:00
c79d187a89 Add final osu! resume screen implementation 2019-03-25 20:31:55 +09:00
38e481686f Make PlayfieldAdjustmentContainer universal 2019-03-25 20:31:55 +09:00
57b3b7b54b Add back resume overlay 2019-03-25 20:31:55 +09:00
a694626cc6 Add proper resume request logic 2019-03-25 20:31:55 +09:00
8ad4009c33 osu! resume overlay 2019-03-25 20:31:55 +09:00