1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 14:02:55 +08:00
Commit Graph

17944 Commits

Author SHA1 Message Date
Dean Herbert
785433bb74
Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
Dan Balasescu
d410054ec8
Merge branch 'master' into key-counter-display 2019-03-29 11:22:59 +09:00
Dan Balasescu
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
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
Dan Balasescu
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
Dan Balasescu
772f0cac8a
Merge branch 'master' into gameplay-cursor-last-state 2019-03-29 11:01:13 +09:00
Dan Balasescu
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
Dan Balasescu
7ab24e35f9
Merge branch 'master' into gameplay-paused-no-update 2019-03-29 10:53:32 +09:00
Dean Herbert
759c5b3db9 Restore previous resume behaviour for the time being 2019-03-29 10:52:26 +09:00
Dan Balasescu
71c4fefe69
Merge pull request #4531 from peppy/testability-improvements
Add ManualInputManager to screen tests
2019-03-29 10:51:31 +09:00
Dean Herbert
3b1f83da1d Merge remote-tracking branch 'upstream/master' into correct-preview-loop 2019-03-29 10:31:15 +09:00
Dan Balasescu
4c038e7f67
Merge branch 'master' into testability-improvements 2019-03-29 10:23:12 +09:00
Dan Balasescu
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
Dan Balasescu
900c00ba59
Merge branch 'master' into drawable-clear-safety 2019-03-29 10:14:41 +09:00
Dean Herbert
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
Dean Herbert
d770dac3bc Fix interpolation nullrefs 2019-03-29 00:35:26 +09:00
Dean Herbert
6e41506766 Merge remote-tracking branch 'upstream/master' into framed-replay-handler-fixes 2019-03-29 00:32:03 +09:00
Dean Herbert
2f5668f4e7 Fix remaining framework changes 2019-03-29 00:29:14 +09:00
Dean Herbert
176b4ecc38
Merge branch 'master' into sprite-icon-compatibility 2019-03-28 23:47:44 +09:00
Dean Herbert
bca8714905 Update framework 2019-03-28 23:25:31 +09:00
Dean Herbert
70f99400ad Fix many behavioural issues and add tests 2019-03-28 19:28:13 +09:00
David Zhao
f066bd1138 Adjust facade scale now that the size is different 2019-03-28 16:35:15 +09:00
David Zhao
9d66a5e4b2 Ensure logo stops tracking before suspend animation 2019-03-28 16:29:35 +09:00
David Zhao
039e451ab1 ensure logo is where it already needs to be on resume 2019-03-28 16:14:28 +09:00
David Zhao
bfe44eb33d Remove SizeForFlow magic number 2019-03-28 15:40:58 +09:00
Dan Balasescu
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
Dean Herbert
5b92c93e18 Merge branch 'framed-replay-handler-fixes' into better-player-flags 2019-03-28 15:09:46 +09:00
Dean Herbert
09a7950a3b Fix handlers for other rulesets 2019-03-28 15:09:06 +09:00
Joehu
9a3528ea9d Fix field modifier 2019-03-27 22:31:40 -07:00
Joehu
2254c572c4 Remove unnecessary newline 2019-03-27 22:21:28 -07:00
Joehu
53f3dacdfb Fix login overlay behavior 2019-03-27 22:01:06 -07:00
smoogipoo
0066459968 Don't convert 100s/50s for catch 2019-03-28 12:55:56 +09:00
Dean Herbert
467ee12edf Merge branch 'framed-replay-handler-fixes' into better-player-flags 2019-03-28 12:45:25 +09:00
Dean Herbert
e9eb33a1b1 Merge branch 'fix-slider-ball-positional' into better-player-flags 2019-03-28 12:45:22 +09:00
Dean Herbert
148e26a6d4 Fix FramedReplayInputHandler starting at frame 0 when it shouldn't 2019-03-28 12:42:57 +09:00
Dean Herbert
8f5e769425 Fix slider ball not always receiving position in time 2019-03-28 12:42:28 +09:00
Joehu
bdb39a79a9 Fix offset of music controller when toolbar is hidden 2019-03-27 20:27:26 -07:00
David Zhao
9b047d9b90 Add back menu logo transform 2019-03-28 12:00:50 +09:00
Dean Herbert
fc59e6dec5
Merge pull request #4494 from Joehuu/clean-overlays-code-1
Remove specified depths of overlays
2019-03-28 11:27:36 +09:00
Dean Herbert
253b18b92f Merge remote-tracking branch 'upstream/master' into better-player-flags 2019-03-28 11:18:54 +09:00
Dean Herbert
23b5271ce4
Merge branch 'master' into clean-overlays-code-1 2019-03-28 11:17:29 +09:00
Dean Herbert
d756a5d987
Merge pull request #4532 from peppy/update-framework
Update framework
2019-03-28 10:50:20 +09:00
Joseph Madamba
cdf79ffe39
Merge branch 'master' into clean-overlays-code-1 2019-03-27 10:32:13 -07:00
Dean Herbert
dfb7d78903 Fix remaining game host regressions 2019-03-28 01:29:06 +09:00
Dean Herbert
cd65ea4865 Fix TestCaseDrawings regression 2019-03-28 01:24:48 +09:00
Dean Herbert
61b8fb0366 Allow ScreenTestCase to support content 2019-03-27 22:28:32 +09:00
Dean Herbert
5c4f2cefea Fix Loader and TestCaseLoaderAnimation 2019-03-27 22:28:25 +09:00
Dean Herbert
a14701619e Update icon test case 2019-03-27 21:44:13 +09:00
Dean Herbert
1a0d1b238e Fix storage regression 2019-03-27 20:58:07 +09:00
Dean Herbert
842231e820
Merge pull request #4541 from nyquillerium/background-test-fix
Fix TestCaseBackgroundScreenBeatmap getting stuck
2019-03-27 20:27:32 +09:00