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

17920 Commits

Author SHA1 Message Date
Dan Balasescu
ac58815907
Merge pull request #4539 from peppy/better-player-flags
Remove read/write player flags
2019-03-29 13:59:29 +09:00
Dean Herbert
95bf0b9ed6 Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset 2019-03-29 13:57:02 +09:00
Dean Herbert
c4096fb628 Remove unused using 2019-03-29 13:56:56 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags 2019-03-29 13:45:45 +09:00
Dan Balasescu
dc6b438f06
Merge pull request #4548 from peppy/framed-replay-handler-fixes
Fix FramedReplayInputHandler frame handling
2019-03-29 13:37:06 +09:00
Dean Herbert
c72705217a
Merge branch 'master' into framed-replay-handler-fixes 2019-03-29 12:59:51 +09:00
Dean Herbert
ad44116845
Merge pull request #4542 from smoogipoo/convert-ranking-statistics
Fix incorrect statistics being shown in results

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 12:59:44 +09:00
Dean Herbert
14cef94a53 Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation 2019-03-29 12:59:26 +09:00
Dean Herbert
0439216f7e
Merge branch 'master' into stable-storyboard-ordering 2019-03-29 12:44:09 +09:00
Dean Herbert
a71e9fdb0e
Merge branch 'master' into convert-ranking-statistics 2019-03-29 12:42:49 +09:00
Dean Herbert
47665f7a81
Merge pull request #4020 from HoLLy-HaCKeR/ctb-pp
Add Catch PerformanceCalculator

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 12:42:26 +09:00
Dean Herbert
e7b38cdc75 Remove unnecessary set 2019-03-29 12:38:47 +09:00
Dean Herbert
5b0aa7bf8d Split out current/next frame conditionals for readability 2019-03-29 12:38:40 +09:00
Dean Herbert
19825cf237
Merge branch 'master' into ctb-pp 2019-03-29 12:34:17 +09:00
Dean Herbert
4d66b7e1b9
Merge pull request #4543 from Aergwyn/wedge-fix
Fix WedgeBackground bleeding into other elements

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 12:34:03 +09:00
Dean Herbert
e5b49b1657
Merge branch 'master' into ctb-pp 2019-03-29 12:24:47 +09:00
Dean Herbert
d6f8dbfd5c
Merge branch 'master' into wedge-fix 2019-03-29 12:23:42 +09:00
Dean Herbert
8d770404c0
Merge pull request #4156 from Aergwyn/correct-preview-loop
Correctly loop from preview point in song select

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 12:16:48 +09:00
Dean Herbert
fed58fba3a Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 12:14:28 +09:00
Dean Herbert
26a73b4a65
Merge branch 'master' into correct-preview-loop 2019-03-29 12:00:58 +09:00
Dan Balasescu
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
Dean Herbert
ed0bf59e73
Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:51:44 +09:00
Dan Balasescu
aaeb598649
Merge pull request #4536 from peppy/key-counter-display
Rename KeyCounterCollection -> KeyCounterDisplay
2019-03-29 11:49:44 +09:00
Dean Herbert
1e369628a5 Fix incorrect type specification 2019-03-29 11:38:45 +09:00
Dean Herbert
82b9dfdeb1 Add important section rewind tests 2019-03-29 11:37:12 +09:00
Dan Balasescu
bab7d78130
Remove redundant cast
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-29 11:36:40 +09:00
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