Commit Graph

312 Commits

Author SHA1 Message Date
68a79f895a Fix mania throwing an exception on start of map 2018-08-30 14:58:00 +09:00
fcf98390f5 Cleanup 2018-08-21 12:10:00 +09:00
ff0dfa7acf Merge branch 'master' into relax 2018-08-16 17:36:24 +09:00
c1517e1521 Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
2a54b5b78d ResetResult -> RevertResult 2018-08-06 12:29:22 +09:00
5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
0c920fe486 Merge branch 'master' into mania-mask-container 2018-08-06 04:22:21 +09:00
07d6a75e23 Rename variables to be human readable 2018-08-04 00:18:09 +02:00
7310c38df9 Add relax mod 2018-08-03 14:03:11 +02:00
3619290c34 Split out judgement definition from judgement result 2018-08-02 20:35:54 +09:00
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
aead4be134 Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container 2018-07-23 06:36:10 +02:00
d868d81b59 Merge branch 'master' into centralise-judgement-display 2018-07-23 02:58:49 +09:00
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
3fc7f33e90 Merge branch 'master' into centralise-judgement-display 2018-07-20 17:29:15 +09:00
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
c2cdf12986 Better pause logic 2018-07-18 19:59:04 +09:00
6437fdd9db Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
3905a9105c Add a playfield method to retrieve all hitobjects 2018-07-17 15:51:10 +09:00
48190e3b5a Make NestedPlayfields non-null 2018-07-17 15:48:51 +09:00
569d0f7993 Merge branch 'master' into scrolldirection-cleanup 2018-07-17 15:39:13 +09:00
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
b967fe714b Fix lead-in time now being long enough in many cases 2018-07-17 14:29:22 +09:00
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
d71b61c122 Rewrite disable mouse buttons logic 2018-07-03 20:04:15 +09:00
1e1ff8339e Merge branch 'master' into non-null-nestedobjects 2018-07-03 19:43:46 +09:00
f0ec117bcb Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
# Conflicts:
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-07-02 17:21:18 +09:00
45a4187923 Tidy up lookups to NestedHitObjects 2018-07-02 16:10:56 +09:00
594cc0d21d Merge branch 'master' into mania-playfield-inversions 2018-06-25 18:36:23 +09:00
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
ad883e087a RulesetContainer<TObject> cannot be derived 2018-06-19 14:31:24 +02:00
57011ff13b Merge branch 'master' into mania-playfield-inversions 2018-06-15 18:33:40 +09:00
0e0e64895a Merge branch 'master' into mania-step-interval 2018-06-13 13:55:27 +09:00
bcfb092e53 Change step to 200 2018-06-12 18:03:45 +09:00
ae136e89a4 Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
9994c69d58 Merge branch 'master' into fix-object-ordering 2018-06-11 17:53:33 +09:00
563a2667d3 Merge branch 'ruleset-configs' into mania-playfield-inversions 2018-06-11 15:08:48 +09:00
14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
be01dbae3a Move ruleset dependency caching to CreateLocalDependencies
In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.
2018-06-11 15:07:29 +09:00
f49b7d6e16 Add mania direction to settings 2018-06-11 14:36:19 +09:00
93696fb5e5 Merge branch 'ruleset-configs' into mania-playfield-inversions
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-06-11 13:46:39 +09:00
4fb6a8627e Merge remote-tracking branch 'origin/master' into mania-playfield-inversions 2018-06-11 13:45:47 +09:00
eca016ec6c Move ruleset config managers to Ruleset 2018-06-11 13:17:08 +09:00
63ec36b3be Explicitly handle null settings case + add annotations 2018-06-11 12:57:56 +09:00
b219c17115 Move dependency creation under ctor 2018-06-11 12:57:26 +09:00
9bdb3113ce Revert "Always update children when ruleset input manager is updated"
This reverts commit 4eb7a34944.
2018-06-08 21:05:28 +09:00
2a48e0e44a Fix sequential speed change visualiser not working with 0 control points 2018-06-08 15:11:43 +09:00
55a5dfa9b6 Add column testcase 2018-06-07 20:24:33 +09:00
5e9a1961cb Greatly increase the playfield scroll speed adjust step
It was so small previously that I believe many people didn't even realise it was working.
2018-06-07 14:35:33 +09:00