1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 16:47:24 +08:00
Commit Graph

1196 Commits

Author SHA1 Message Date
smoogipoo
d5464702fa Fix post-merge issue 2018-11-15 20:56:34 +09:00
smoogipoo
eddba44d0f Merge branch 'note-placement' into inter-column-movements 2018-11-15 20:53:57 +09:00
smoogipoo
4b86c29f7b Merge remote-tracking branch 'origin/master' into placement-hiding 2018-11-14 18:34:45 +09:00
smoogipoo
c963fc7cd2 Reduce chaining 2018-11-14 18:34:13 +09:00
Dean Herbert
4dec2d1db0 Merge remote-tracking branch 'upstream/master' into note-placement 2018-11-14 18:29:31 +09:00
Dean Herbert
84d16ee71b
Merge branch 'master' into placement-hiding 2018-11-14 16:59:41 +09:00
Dean Herbert
2ae139d260
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:54:53 +09:00
Dean Herbert
34973a3e9f
Merge branch 'master' into scrollalgorithm-timeat 2018-11-14 13:32:16 +09:00
Dean Herbert
8b190edde0
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:32:14 +09:00
Dean Herbert
3caf0cb0d9
Merge branch 'master' into no-drawable-speedchangevis 2018-11-13 19:42:04 +09:00
smoogipoo
6d43baf4bf Make show/hide only invoked once each 2018-11-13 13:12:11 +09:00
smoogipoo
fbc20d2d4d Hide placement when cursor is not in the playfield 2018-11-13 12:52:04 +09:00
smoogipoo
3a1fee59fb Implement note placement 2018-11-12 18:24:18 +09:00
smoogipoo
a0c75a0597 Merge branch 'notepieces' into note-placement 2018-11-12 17:59:54 +09:00
smoogipoo
9e1b54f1ef Merge branch 'more-global-scrollalgo' into note-placement 2018-11-12 17:47:02 +09:00
smoogipoo
b9b20607af Add IScrollAlgorithm.TimeAt() 2018-11-12 17:43:22 +09:00
smoogipoo
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
e7969ecec7 Move ScrollAlgorithm inside IScrollingInfo 2018-11-12 17:34:35 +09:00
smoogipoo
54668a0dec Simplify construction of ScrollingInfo 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
48486895ba Remove unused code 2018-11-12 17:34:35 +09:00
smoogipoo
9fde7f7f44 Move scrolling info to osu.Game 2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
smoogipoo
aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
smoogipoo
f3ba429701 Make sure control points is internally initialised 2018-11-12 17:14:06 +09:00
smoogipoo
f4fd6189f8 Implement IEquatable 2018-11-12 16:53:30 +09:00
smoogipoo
0220ed21b0 Ignore distance for json serialisation 2018-11-12 16:38:49 +09:00
smoogipoo
0e92b385f0 Define default json deserialisation constructor 2018-11-12 16:38:33 +09:00
smoogipoo
8ad9b6a02a Safety for default(SliderPath) 2018-11-12 16:38:14 +09:00
smoogipoo
d594ce3530 Revert "Make SliderPath.ControlPoints read-only"
This reverts commit 3b88d94793.

# Conflicts:
#	osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 16:20:38 +09:00
smoogipoo
77d16aa968 Add xmldocs 2018-11-12 14:16:21 +09:00
smoogipoo
4eef1134a6 Re-order file 2018-11-12 14:08:36 +09:00
smoogipoo
3aba462e52 Make Path.Distance a property again 2018-11-12 14:07:48 +09:00
smoogipoo
3b88d94793 Make SliderPath.ControlPoints read-only 2018-11-12 14:03:54 +09:00
smoogipoo
54ab256c8e Instantiate a new path rather than setting properties on it
# Conflicts:
#	osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
#	osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
#	osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 13:50:19 +09:00
Dean Herbert
4783df1d4b Fix compose mode not working 2018-11-09 11:36:06 +09:00
Dean Herbert
27549586e6
Merge branch 'master' into manual-position-adjustments 2018-11-09 10:53:41 +09:00
smoogipoo
33056b8098 Adjust namespaces 2018-11-08 14:04:21 +09:00
smoogipoo
f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
smoogipoo
2f87f267a3 Fix height being set instead of width 2018-11-08 14:04:20 +09:00
smoogipoo
195f82fa96 Give visualiser methods range+length params again 2018-11-08 14:04:20 +09:00
smoogipoo
f41bfd14ca Add some xmldocs 2018-11-08 14:04:20 +09:00
smoogipoo
76ea314c27 Reorder params 2018-11-08 14:04:20 +09:00
smoogipoo
589c3a47e2 Remove state computation + updates from ISpeedChangeVisualiser 2018-11-08 14:04:20 +09:00
smoogipoo
0bdeebbce2 Expose basic values from ISpeedChangeVisualiser 2018-11-08 14:04:20 +09:00
smoogipoo
c6350c6efd Remove IHasEditablePosition 2018-11-08 13:03:11 +09:00
smoogipoo
5d51719572 Make selection blueprints handle position adjustments 2018-11-07 16:21:32 +09:00
smoogipoo
cf4dad0fe8 Fix hitobjects not updating IsMaskedAway after being judged 2018-11-07 15:42:40 +09:00
smoogipoo
52f4923c8e Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00