Dean Herbert
|
8b190edde0
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 13:32:14 +09:00 |
|
Dean Herbert
|
1b936dfc17
|
Merge pull request #3706 from smoogipoo/no-drawable-speedchangevis
Make scroll algorithms not tied to drawable hitobjects
|
2018-11-14 13:31:35 +09:00 |
|
Dean Herbert
|
8d59b7299f
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-14 13:22:01 +09:00 |
|
Dean Herbert
|
059f1d9bcb
|
Merge pull request #3671 from gotopie/hide-seekbar-with-no-song
Hide seekbar when no song is playing
|
2018-11-14 12:16:42 +09:00 |
|
Dean Herbert
|
b9278b3488
|
Fix brackets
|
2018-11-14 12:05:07 +09:00 |
|
Dean Herbert
|
161d476091
|
Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song
|
2018-11-14 11:53:43 +09:00 |
|
Dean Herbert
|
c77412992e
|
Merge conditionals
|
2018-11-14 11:53:34 +09:00 |
|
Dean Herbert
|
3caf0cb0d9
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-13 19:42:04 +09:00 |
|
Dean Herbert
|
7a918b06d9
|
Merge pull request #3704 from smoogipoo/immutable-sliderpath
Make SliderPath immutable
|
2018-11-13 18:27:36 +09:00 |
|
Dean Herbert
|
e7d984415b
|
Merge branch 'master' into immutable-sliderpath
|
2018-11-13 18:06:14 +09:00 |
|
Dean Herbert
|
302196e985
|
Merge pull request #3705 from peppy/update-framework
Update framework and resources
|
2018-11-12 19:58:03 +09:00 |
|
Dan Balasescu
|
e885c03cfa
|
Merge branch 'master' into update-framework
|
2018-11-12 17:45:16 +09:00 |
|
Dean Herbert
|
27a794f1d5
|
Merge pull request #3684 from peppy/better-rider-ignore
Change .idea ignore rules to not ignore run configurations
|
2018-11-12 17:41:31 +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 |
|
Dan Balasescu
|
5051263106
|
Merge branch 'master' into better-rider-ignore
|
2018-11-12 17:19:39 +09:00 |
|
smoogipoo
|
f3ba429701
|
Make sure control points is internally initialised
|
2018-11-12 17:14:06 +09:00 |
|
Dean Herbert
|
1101e161d9
|
Update framework and resources
|
2018-11-12 17:02:46 +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
|
51e4feeda7
|
Adjust to new path structure
|
2018-11-12 13:55:14 +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 |
|
Dan Balasescu
|
0833ba2692
|
Merge pull request #3697 from peppy/fix-compose-mode
Fix compose mode not working
|
2018-11-09 12:33:17 +09:00 |
|
Dean Herbert
|
4783df1d4b
|
Fix compose mode not working
|
2018-11-09 11:36:06 +09:00 |
|
Dean Herbert
|
00749ffcec
|
Merge pull request #3693 from smoogipoo/manual-position-adjustments
Let selection blueprints handle positional adjustments
|
2018-11-09 11:22:13 +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
|
8583fd1380
|
Fix testcase never working
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
c6350c6efd
|
Remove IHasEditablePosition
|
2018-11-08 13:03:11 +09:00 |
|