Dean Herbert
|
302196e985
|
Merge pull request #3705 from peppy/update-framework
Update framework and resources
|
2018-11-12 19:58:03 +09:00 |
|
smoogipoo
|
3d8ef97e81
|
Add testcase
|
2018-11-12 19:41:06 +09:00 |
|
smoogipoo
|
1403fa26cf
|
Fix placement not working correctly for downwards scroll
|
2018-11-12 19:40:57 +09:00 |
|
smoogipoo
|
1d40a042f6
|
Extract common methods into ManiaPlacementBlueprint
|
2018-11-12 18:32:44 +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
|
e302d5d005
|
Separate NoteSelectionBlueprint into a note piece
|
2018-11-12 17:59:39 +09:00 |
|
smoogipoo
|
9e1b54f1ef
|
Merge branch 'more-global-scrollalgo' into note-placement
|
2018-11-12 17:47:02 +09:00 |
|
Dan Balasescu
|
e885c03cfa
|
Merge branch 'master' into update-framework
|
2018-11-12 17:45:16 +09:00 |
|
smoogipoo
|
b9b20607af
|
Add IScrollAlgorithm.TimeAt()
|
2018-11-12 17:43:22 +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
|
2e0e1befe9
|
Add selection mask testcases
# Conflicts:
# osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs
|
2018-11-12 17:40:09 +09:00 |
|
smoogipoo
|
8be6e351f5
|
Merge branch 'fix-mania-selections' into add-mania-selection-testcase
|
2018-11-12 17:39:58 +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
|
e3c60c2f96
|
Cleanups
|
2018-11-12 17:18:58 +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 |
|
jorolf
|
023924396d
|
Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time
|
2018-11-11 18:38:12 +01:00 |
|
smoogipoo
|
13279f707b
|
Cleanups
|
2018-11-09 14:19:50 +09:00 |
|
smoogipoo
|
cc8531790a
|
Use bindables for hitobject events
|
2018-11-09 13:58:46 +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
|
03af600273
|
Merge remote-tracking branch 'upstream/master' into fix-mania-selections
|
2018-11-09 11:35:46 +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
|
d0b63e8f8d
|
Fix missing references
|
2018-11-08 14:13:57 +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 |
|