|
|
e9b47c6233
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 18:22:34 +09:00 |
|
|
|
a1dd1057ce
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 17:15:24 +09:00 |
|
|
|
7274908059
|
Implement interface
|
2018-11-14 15:33:09 +09:00 |
|
|
|
fb22fc11f6
|
Merge remote-tracking branch 'upstream/master' into Private_Messages
|
2018-11-14 13:59:17 +09:00 |
|
|
|
9a9d5e60af
|
More refactors
|
2018-11-14 13:59:02 +09:00 |
|
|
|
2ae139d260
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 13:54:53 +09:00 |
|
|
|
34973a3e9f
|
Merge branch 'master' into scrollalgorithm-timeat
|
2018-11-14 13:32:16 +09:00 |
|
|
|
8b190edde0
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 13:32:14 +09:00 |
|
|
|
8d59b7299f
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-14 13:22:01 +09:00 |
|
|
|
c4769f6802
|
Refactors
|
2018-11-14 13:19:51 +09:00 |
|
|
|
396a5b3cd0
|
Merge branch 'master' into Private_Messages
|
2018-11-14 12:49:54 +09:00 |
|
|
|
b9278b3488
|
Fix brackets
|
2018-11-14 12:05:07 +09:00 |
|
|
|
161d476091
|
Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song
|
2018-11-14 11:53:43 +09:00 |
|
|
|
c77412992e
|
Merge conditionals
|
2018-11-14 11:53:34 +09:00 |
|
|
|
3caf0cb0d9
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-13 19:42:04 +09:00 |
|
|
|
e7d984415b
|
Merge branch 'master' into immutable-sliderpath
|
2018-11-13 18:06:14 +09:00 |
|
|
|
72ae22b0c4
|
Add support for creating new PM conversations
|
2018-11-13 17:24:11 +09:00 |
|
|
|
f241fcdba1
|
Add back support for new API and private messages
|
2018-11-13 15:20:59 +09:00 |
|
|
|
8b9f7f6691
|
Merge branch 'master' into Private_Messages
|
2018-11-12 20:43:10 +09:00 |
|
|
|
4b1282235a
|
Merge remote-tracking branch 'upstream/master' into Private_Messages
|
2018-11-12 20:41:10 +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 |
|
|
|
f3ba429701
|
Make sure control points is internally initialised
|
2018-11-12 17:14:06 +09:00 |
|
|
|
1101e161d9
|
Update framework and resources
|
2018-11-12 17:02:46 +09:00 |
|
|
|
f4fd6189f8
|
Implement IEquatable
|
2018-11-12 16:53:30 +09:00 |
|
|
|
0220ed21b0
|
Ignore distance for json serialisation
|
2018-11-12 16:38:49 +09:00 |
|
|
|
0e92b385f0
|
Define default json deserialisation constructor
|
2018-11-12 16:38:33 +09:00 |
|
|
|
8ad9b6a02a
|
Safety for default(SliderPath)
|
2018-11-12 16:38:14 +09:00 |
|
|
|
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 |
|
|
|
77d16aa968
|
Add xmldocs
|
2018-11-12 14:16:21 +09:00 |
|
|
|
4eef1134a6
|
Re-order file
|
2018-11-12 14:08:36 +09:00 |
|
|
|
3aba462e52
|
Make Path.Distance a property again
|
2018-11-12 14:07:48 +09:00 |
|
|
|
3b88d94793
|
Make SliderPath.ControlPoints read-only
|
2018-11-12 14:03:54 +09:00 |
|
|
|
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 |
|
|
|
4783df1d4b
|
Fix compose mode not working
|
2018-11-09 11:36:06 +09:00 |
|
|
|
27549586e6
|
Merge branch 'master' into manual-position-adjustments
|
2018-11-09 10:53:41 +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 |
|
