Commit Graph

519 Commits

Author SHA1 Message Date
6d229716e7 Remove unused using directives 2018-09-18 20:42:55 +02:00
2afcdb1451 Add the file 2018-09-18 20:23:25 +02:00
e3cc25a96a Implement ConstantScrollingSpeedVisualiser 2018-09-18 20:21:10 +02:00
5f3c0549c9 Sprites in blinds mod & gameplay improvements
There are now skinnable actual blinds (shoji screen panels)
The black overlay is still behind them to avoid cheating with skins
The blinds don't open linearly anymore, they are health squared now
When easy mod is on, there is always a little gap open
2018-09-15 23:44:22 +02:00
040a44d42c Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2 2018-09-15 20:12:06 +02:00
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
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
b011edd85d added Overlays container to RulesetContainer
this is required for mods such as flashlight which always want to draw
objects above hitcircles. If just adding children to a RulesetContainer
the hit circles would always be above the added children (no matter
the Depth).
2018-08-05 13:12:31 +02: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