Commit Graph

589 Commits

Author SHA1 Message Date
e44bc57a3d Fix minDistanceFromEnd using seconds rather than milliseconds
Velocity in stable is defined as distance per SECOND, while lazer defines it as distance per MILLISECOND.
2019-01-15 19:18:56 +09:00
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
881b10a18f Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini 2019-01-08 11:01:04 +09:00
7eed3ffe75 Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 10:02:06 +09:00
4cee21f356 Make skinning better 2019-01-07 20:12:39 +09:00
13b077c83b Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini 2019-01-07 18:11:17 +09:00
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
3fa5a33fb1 Inline const 2019-01-03 18:58:07 +09:00
273b14b19c Add a maximum length for slider ticks to be generated 2019-01-03 18:51:47 +09:00
c56d8b75c1 Cache slider's endposition 2019-01-03 17:43:10 +09:00
6f8a2e6ff2 Use LifetimeManagementContainer
This is a significant performance boost for gameplay,
especially for long or stroyboard-heavy maps.
2018-12-13 15:23:06 +09:00
ec3c87dbea Make Slider's CustumColors skinnable 2018-12-07 22:24:24 +01:00
1a974f64de Initial design for user registration dialog 2018-12-05 12:57:26 +09:00
aea84f737b Fix taiko hitobjects potentially disappearing before being judged 2018-11-29 12:12:29 +09:00
52bc47499f Fix spinners not having proper lifetimes 2018-11-29 12:11:45 +09:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
050af88be9 Fix post-merge issues 2018-11-14 14:29:22 +09:00
29422345f7 Merge remote-tracking branch 'origin/master' into fix-mask-disposal
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
#	osu.Game.Rulesets.Osu/Objects/Slider.cs
2018-11-14 14:03:25 +09:00
3aba462e52 Make Path.Distance a property again 2018-11-12 14:07:48 +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
cc8531790a Use bindables for hitobject events 2018-11-09 13:58:46 +09:00
c6350c6efd Remove IHasEditablePosition 2018-11-08 13:03:11 +09:00
a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/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
2018-11-05 16:38:28 +09:00
63cbc8e0e8 Merge branch 'master' into slider-placement 2018-11-02 19:45:34 +09:00
7f1ee3bcb4 Disallow spinner movement for now 2018-11-02 12:06:53 +09:00
c1304eca1b Merge remote-tracking branch 'upstream/master' into slider-placement 2018-11-01 17:59:37 +09:00
5fd21d35dc Merge branch 'master' into spinner-selection 2018-11-01 17:47:59 +09:00
bb2f8deb18 ControlPoint -> PathControlPoint
Also Curve -> Path.
2018-11-01 03:56:51 +09:00
af1de01ed6 Add a spinner selection mask 2018-10-29 18:23:23 +09:00
08b16be3b8 Merge branch 'slider-controlpoint-masks' into slider-placement
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
2018-10-29 15:55:38 +09:00
acd703c27b Make sliders respond to control point changes 2018-10-29 15:36:43 +09:00
b0f5ace0e8 Implement slider control point visualisation 2018-10-29 15:29:34 +09:00
660cd24750 Make sliders respond to scale changes 2018-10-29 15:26:28 +09:00
619a0dfd59 Merge branch 'separate-slider-body' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
2018-10-29 15:24:15 +09:00
86e09a68f7 Separate slider body to bypass snaking logic
The snaking logic contains a lot of caching/optimisations and offsetting of the path which is tedious to re-compute when the path changes.
2018-10-29 15:15:29 +09:00
4f65d67e2b Merge branch 'master' into skinnable-spritetext 2018-10-28 08:35:25 -07:00
22c545ea8c Make circle piece respond to hitobject scale 2018-10-26 15:26:19 +09:00
f674fcf2c8 Merge branch 'mask-separation' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
#	osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
2018-10-26 14:05:30 +09:00
9656186b64 Make the hitobject masks move within their placement/selection
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
#	osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
#	osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
#	osu.Game/Rulesets/Edit/PlacementMask.cs
2018-10-26 13:45:31 +09:00
ea6db8b793 Make the hitobject masks move within their placement/selection 2018-10-25 18:16:25 +09:00
cd718812b2 Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-18 14:01:47 +09:00
e8ce5a7e6c Fix crashes when manually creating sliders 2018-10-16 18:27:09 +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
47be95ce0b Fix slider nodes using the wrong samples 2018-10-16 17:10:24 +09:00
5095fbcdf7 Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-16 10:27:18 +09:00
657bd5e371 Add some xmldocs 2018-10-15 12:32:59 +09:00
2f943e77aa Make Velocity and TickDistance private set 2018-10-15 12:31:52 +09:00
26b91c96fb Fix wrong number of ticks on some legacy beatmaps 2018-10-15 12:27:58 +09:00
83fd251c7b Pass sub-controlpoints as span slices 2018-10-11 17:44:25 +09:00
a2838d32bf Merge branch 'master' into skinnable-spritetext 2018-10-09 16:23:43 +09:00