Commit Graph

751 Commits

Author SHA1 Message Date
0bdeebbce2 Expose basic values from ISpeedChangeVisualiser 2018-11-08 14:04:20 +09:00
b28c0cd128 Merge branch 'master' into editor-mask-placement 2018-10-31 06:46:48 +09:00
6d00aff9fd Add type parameter to IApplicableToBeatmap 2018-10-30 00:13:33 -04:00
df6fc4013a Add interface to adjust Beatmaps 2018-10-28 02:21:25 -04:00
3b08ad0742 Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
Changes how OsuModBlinds passes the playfield and how DrawableOsuBlinds
handles the restrictTo parameter.
2018-10-27 16:34:48 +02:00
d36ac59ca2 Reduce complexity of creating edit ruleset containers 2018-10-17 18:06:00 +09:00
70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
ad42f2244d Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer 2018-10-12 19:15:11 +09:00
460c943958 Merge branch 'master' into mod-fl2 2018-10-12 11:44:55 +02:00
1de770e093 Merge branch 'master' into fix-sv 2018-10-12 18:13:50 +09:00
e0a8157d92 Merge branch 'master' into mod-fl2 2018-10-10 19:48:46 +09:00
841b2e8692 Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
06ea174f34 Merge branch 'master' into fix-sv 2018-10-09 18:00:34 +09:00
ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
b9d0fc927b Remove duplicated code 2018-10-04 18:03:34 +09:00
593dee202c Fix gameplay mouse button disable setting no longer having any effect
Regressed at 50091252e2 (diff-20562da8cde558aacafa9540b97b7975)
2018-10-04 03:07:00 +09:00
540a010fbb Implement an intermediary EditRulesetContainer 2018-10-03 15:36:24 +09:00
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
b68eeae777 Fix scrolling rulesets not accounting for slider multiplier 2018-10-01 18:12:30 +09:00
6c1b3cf1a5 Merge remote-tracking branch 'origin/AR_Catch' into AR_Catch 2018-09-30 16:09:27 +02:00
b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00
0bc2bcaf14 Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00
368ceec47c Simplify creation of a playfield 2018-09-21 14:35:50 +09:00
826dc6ceb7 Make Playfield not a ScalableContainer 2018-09-21 14:02:32 +09:00
4b907336c5 Move readonly field above ctor 2018-09-20 13:17:17 +09:00
309d8c8cb4 CI 2018-09-19 18:43:39 +02:00
e7d78b94ae Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
c8e9d9375f Use new InputStateChangeEvent for RulesetInputManager 2018-09-19 11:36:55 +09:00
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