|
|
6949c233bf
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 15:02:12 +09:00 |
|
|
|
a1fa497ec0
|
Merge pull request #4546 from Joehuu/fix-music-controller-offset
Fix offset of music controller when toolbar is hidden
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
|
2019-03-29 14:26:28 +09:00 |
|
|
|
bda8ce2dbb
|
Merge pull request #4537 from peppy/stable-storyboard-ordering
Add stable storyboard element ordering
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
|
2019-03-29 14:15:26 +09:00 |
|
|
|
3e8952b087
|
Merge pull request #4521 from peppy/hitobject-drawable-representation
Fix DrawableRuleset drawable creation method's name
|
2019-03-29 14:08:23 +09:00 |
|
|
|
9c57b9eed2
|
Merge branch 'master' into fix-music-controller-offset
|
2019-03-29 14:02:49 +09:00 |
|
|
|
e45c08ad23
|
Adjust comment
|
2019-03-29 14:02:19 +09:00 |
|
|
|
95bf0b9ed6
|
Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset
|
2019-03-29 13:57:02 +09:00 |
|
|
|
c4096fb628
|
Remove unused using
|
2019-03-29 13:56:56 +09:00 |
|
|
|
202a0086cc
|
Merge branch 'master' into better-player-flags
|
2019-03-29 13:45:45 +09:00 |
|
|
|
c72705217a
|
Merge branch 'master' into framed-replay-handler-fixes
|
2019-03-29 12:59:51 +09:00 |
|
|
|
14cef94a53
|
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
|
2019-03-29 12:59:26 +09:00 |
|
|
|
0439216f7e
|
Merge branch 'master' into stable-storyboard-ordering
|
2019-03-29 12:44:09 +09:00 |
|
|
|
a71e9fdb0e
|
Merge branch 'master' into convert-ranking-statistics
|
2019-03-29 12:42:49 +09:00 |
|
|
|
e7b38cdc75
|
Remove unnecessary set
|
2019-03-29 12:38:47 +09:00 |
|
|
|
5b0aa7bf8d
|
Split out current/next frame conditionals for readability
|
2019-03-29 12:38:40 +09:00 |
|
|
|
19825cf237
|
Merge branch 'master' into ctb-pp
|
2019-03-29 12:34:17 +09:00 |
|
|
|
e5b49b1657
|
Merge branch 'master' into ctb-pp
|
2019-03-29 12:24:47 +09:00 |
|
|
|
d6f8dbfd5c
|
Merge branch 'master' into wedge-fix
|
2019-03-29 12:23:42 +09:00 |
|
|
|
fed58fba3a
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 12:14:28 +09:00 |
|
|
|
26a73b4a65
|
Merge branch 'master' into correct-preview-loop
|
2019-03-29 12:00:58 +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 |
|
|
|
759c5b3db9
|
Restore previous resume behaviour for the time being
|
2019-03-29 10:52:26 +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 |
|
|
|
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 |
|
|
|
70f99400ad
|
Fix many behavioural issues and add tests
|
2019-03-28 19:28:13 +09:00 |
|
|
|
0066459968
|
Don't convert 100s/50s for catch
|
2019-03-28 12:55:56 +09:00 |
|
|
|
467ee12edf
|
Merge branch 'framed-replay-handler-fixes' into better-player-flags
|
2019-03-28 12:45:25 +09:00 |
|
|
|
e9eb33a1b1
|
Merge branch 'fix-slider-ball-positional' into better-player-flags
|
2019-03-28 12:45:22 +09:00 |
|
|
|
148e26a6d4
|
Fix FramedReplayInputHandler starting at frame 0 when it shouldn't
|
2019-03-28 12:42:57 +09:00 |
|
|
|
bdb39a79a9
|
Fix offset of music controller when toolbar is hidden
|
2019-03-27 20:27:26 -07:00 |
|
|
|
253b18b92f
|
Merge remote-tracking branch 'upstream/master' into better-player-flags
|
2019-03-28 11:18:54 +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 |
|
