Commit Graph

607 Commits

Author SHA1 Message Date
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
184403c7e1 Merge branch 'master' into resume-cursor-2 2019-04-01 14:24:00 +09:00
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
612db31c38 Apply newline additions 2019-04-01 12:16:32 +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
14cef94a53 Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation 2019-03-29 12:59:26 +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
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +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
9bf48863b0 Fix DrawableRuleset drawable creation method's name 2019-03-25 00:00:29 +09:00
f43e7a880c Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-20 15:27:06 +09:00
c186629b8a Reorder class 2019-03-20 14:55:38 +09:00
936c3e1ed9 Add safety type check to DrawableScrollingRuleset 2019-03-20 11:34:06 +09:00
45b8bfcfd3 Better protect not-generic DrawableRuleset 2019-03-20 11:31:03 +09:00
7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
68f28326a2 Refactor RulesetContainer for readability 2019-03-19 20:21:31 +09:00
9433a97747 Add resume requesting support and fix exit scenarios 2019-03-18 20:33:43 +09:00
9ca4d9d4d1 Remove regions 2019-03-18 10:48:44 +09:00
771d676ba1 Split RulesetInputManager out to FrameStabilityContainer 2019-03-17 13:30:52 +09:00
a73e3d9700 Move cursor construction to BDL 2019-03-08 15:01:45 +09:00
2c98ba1c0c Split out consumption and creation into two separate code paths 2019-03-08 14:59:45 +09:00
62716851a1 Revert some unnecessary changes 2019-03-06 17:41:54 +09:00
7aa30ca3f6 Change method of cursor creation 2019-03-06 17:41:54 +09:00