Commit Graph

17586 Commits

Author SHA1 Message Date
26a73b4a65 Merge branch 'master' into correct-preview-loop 2019-03-29 12:00:58 +09:00
8e7e02b824 Merge pull request #4533 from peppy/universal-playfield-adjust
Move all playfield adjustments to universal PlayfieldAdjustmentContainer
2019-03-29 12:00:16 +09:00
ed0bf59e73 Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:51:44 +09:00
aaeb598649 Merge pull request #4536 from peppy/key-counter-display
Rename KeyCounterCollection -> KeyCounterDisplay
2019-03-29 11:49:44 +09:00
1e369628a5 Fix incorrect type specification 2019-03-29 11:38:45 +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
97dad5804a Merge pull request #4544 from peppy/sprite-icon-compatibility
Update icon usage to match framework changes
2019-03-29 11:22:47 +09:00
7715606188 Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
724675dd49 Merge pull request #4535 from peppy/gameplay-cursor-last-state
Add base gameplay cursor class to retrieve true visibility state
2019-03-29 11:15:21 +09:00
772f0cac8a Merge branch 'master' into gameplay-cursor-last-state 2019-03-29 11:01:13 +09:00
bf61f35870 Merge pull request #4534 from peppy/gameplay-paused-no-update
Don't update gameplay loop while paused
2019-03-29 11:00:59 +09:00
7ab24e35f9 Merge branch 'master' into gameplay-paused-no-update 2019-03-29 10:53:32 +09:00
759c5b3db9 Restore previous resume behaviour for the time being 2019-03-29 10:52:26 +09:00
71c4fefe69 Merge pull request #4531 from peppy/testability-improvements
Add ManualInputManager to screen tests
2019-03-29 10:51:31 +09:00
3b1f83da1d Merge remote-tracking branch 'upstream/master' into correct-preview-loop 2019-03-29 10:31:15 +09:00
4c038e7f67 Merge branch 'master' into testability-improvements 2019-03-29 10:23:12 +09:00
fc41a7015a Merge pull request #4528 from peppy/drawable-clear-safety
Add safety against accidental clearing of DrawableHitObject children
2019-03-29 10:23:00 +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
f134b9c886 Merge pull request #4547 from peppy/fix-slider-ball-positional
Fix slider ball not always receiving position in time
2019-03-28 15:13:06 +09:00
8f5e769425 Fix slider ball not always receiving position in time 2019-03-28 12:42:28 +09:00
fc59e6dec5 Merge pull request #4494 from Joehuu/clean-overlays-code-1
Remove specified depths of overlays
2019-03-28 11:27:36 +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
cd65ea4865 Fix TestCaseDrawings regression 2019-03-28 01:24:48 +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
a14701619e Update icon test case 2019-03-27 21:44:13 +09:00
1a0d1b238e Fix storage regression 2019-03-27 20:58:07 +09:00
842231e820 Merge pull request #4541 from nyquillerium/background-test-fix
Fix TestCaseBackgroundScreenBeatmap getting stuck
2019-03-27 20:27:32 +09:00
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
2c059efbab Rename to BlockLoad 2019-03-27 17:34:58 +09:00
be62cd9d72 Fix TestCaseBackgroundsScreenBeatmap 2019-03-27 14:33:50 +09:00
4e8945a2aa Merge pull request #4538 from peppy/fix-test-working-clock
Fix TestWorkingBeatmap not running for times below zero
2019-03-27 12:04:05 +09:00
3fcbc2eab3 Fix key counter getting overridden 2019-03-27 10:31:21 +09:00
7cfc2f7dcb Add back adjustment container 2019-03-26 17:11:14 +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
8658de5108 Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
2019-03-26 13:52:48 +09:00
2951d3e0e4 Apply CI fixes 2019-03-26 13:50:30 +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