Commit Graph

379 Commits

Author SHA1 Message Date
ef9d93ff6b Remove mod multipliers
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
2018-12-20 19:46:39 +09:00
d3368df94d Simplify changes to RulesetContainer 2018-12-20 19:35:32 +09:00
7d9cdf6f81 Remove unnecessary private field 2018-12-07 20:13:03 +09:00
3cb91979bd Merge branch 'master' of https://github.com/ppy/osu into mod-fl2 2018-12-06 12:14:48 +01:00
271dcded3c Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
595e2ffbff Unbind event when column changes 2018-11-19 16:20:21 +09:00
2ae139d260 Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:54:53 +09:00
2c277545e0 Merge branch 'add-mania-selection-testcase' into mania-selection-movement 2018-11-13 15:40:51 +09:00
b9b20607af Add IScrollAlgorithm.TimeAt() 2018-11-12 17:43:22 +09:00
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
e7969ecec7 Move ScrollAlgorithm inside IScrollingInfo 2018-11-12 17:34:35 +09:00
54668a0dec Simplify construction of ScrollingInfo 2018-11-12 17:34:35 +09:00
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
48486895ba Remove unused code 2018-11-12 17:34:35 +09:00
9fde7f7f44 Move scrolling info to osu.Game 2018-11-12 17:34:35 +09:00
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
33056b8098 Adjust namespaces 2018-11-08 14:04:21 +09:00
f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
2f87f267a3 Fix height being set instead of width 2018-11-08 14:04:20 +09:00
195f82fa96 Give visualiser methods range+length params again 2018-11-08 14:04:20 +09:00
f41bfd14ca Add some xmldocs 2018-11-08 14:04:20 +09:00
76ea314c27 Reorder params 2018-11-08 14:04:20 +09:00
589c3a47e2 Remove state computation + updates from ISpeedChangeVisualiser 2018-11-08 14:04:20 +09:00
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