Commit Graph

1449 Commits

Author SHA1 Message Date
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
184403c7e1 Merge branch 'master' into resume-cursor-2 2019-04-01 14:24:00 +09:00
79b5c2482b Merge pull request #4562 from peppy/fix-editor-blueprints
Fix editor blueprints being misplaced
2019-04-01 11:17:17 +09:00
6896ec7731 Remove unnecessary method 2019-04-01 10:39:55 +09:00
d1a175675d Use variable 2019-04-01 10:37:02 +09:00
5d91c3bcfc Fix replay handler nullref crashes 2019-03-31 01:33:56 +09:00
42eaabe24c Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
6949c233bf Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 15:02:12 +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
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
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
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
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
70f99400ad Fix many behavioural issues and add tests 2019-03-28 19:28:13 +09:00
148e26a6d4 Fix FramedReplayInputHandler starting at frame 0 when it shouldn't 2019-03-28 12:42:57 +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
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
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
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
c97116c91a Add safety against DrawableHitObject implementations clearing children 2019-03-25 13:34:22 +09:00
9bf48863b0 Fix DrawableRuleset drawable creation method's name 2019-03-25 00:00:29 +09:00
15f9a6b9df Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-21 16:04:18 +09:00
fe255c54d0 Merge pull request #4496 from smoogipoo/reinstantiate-mods
Fix mods being reused for difficulty calculation
2019-03-20 19:10:52 +09:00
c510385aa8 Remove unnecessary allocations 2019-03-20 16:46:16 +09:00