RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,155 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

292 Commits

Author SHA1 Message Date
smoogipoo 050af88be9 Fix post-merge issues 2018-11-14 14:29:22 +09:00
smoogipoo cc8531790a Use bindables for hitobject events 2018-11-09 13:58:46 +09:00
Dean Herbert 63cbc8e0e8
Merge branch 'master' into slider-placement 2018-11-02 19:45:34 +09:00
Dean Herbert c1304eca1b Merge remote-tracking branch 'upstream/master' into slider-placement 2018-11-01 17:59:37 +09:00
Dean Herbert 5fd21d35dc
Merge branch 'master' into spinner-selection 2018-11-01 17:47:59 +09:00
Dean Herbert bb2f8deb18 ControlPoint -> PathControlPoint 
Also Curve -> Path.
 2018-11-01 03:56:51 +09:00
smoogipoo af1de01ed6 Add a spinner selection mask 2018-10-29 18:23:23 +09:00
smoogipoo 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
smoogipoo acd703c27b Make sliders respond to control point changes 2018-10-29 15:36:43 +09:00
smoogipoo 660cd24750 Make sliders respond to scale changes 2018-10-29 15:26:28 +09:00
smoogipoo 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
smoogipoo 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
Dean Herbert 4f65d67e2b
Merge branch 'master' into skinnable-spritetext 2018-10-28 08:35:25 -07:00
smoogipoo 22c545ea8c Make circle piece respond to hitobject scale 2018-10-26 15:26:19 +09:00
smoogipoo 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
Dan Balasescu a2838d32bf
Merge branch 'master' into skinnable-spritetext 2018-10-09 16:23:43 +09:00
smoogipoo 42664f1c19 Make SliderBody use the new SmoothPath 2018-10-05 15:45:45 +09:00
smoogipoo 1cd11a6e5b Fix StackHeight changes not causing position updates 2018-10-03 17:06:18 +09:00
ekrctb 68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb 50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb 99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo 0d8276c5f8 Implement skinnable sprite text 2018-09-27 17:40:28 +09:00
smoogipoo a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert 7cca990be4 Merge remote-tracking branch 'upstream/master' into framework-image-changes 2018-09-07 18:56:00 +09:00
Dean Herbert 9f67119ba9 Fix potential nullref in IsPresent override 2018-09-06 18:01:32 +09:00
Dean Herbert 4ff66bf531 Update in line with framework Image changes 2018-09-06 13:28:44 +09:00
Dean Herbert 03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo 1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake 
# Conflicts:
#	osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
 2018-08-24 15:26:36 +09:00
smoogipoo 34b1abeca3 Remove sliderball's input override 2018-08-21 12:24:48 +09:00
smoogipoo 741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo ab642b563f CreateJudgementResult -> CreateResult 2018-08-06 11:07:41 +09:00
smoogipoo 2a4994e5ce Make hitobjects only have one judgement + result 2018-08-03 15:38:48 +09:00
smoogipoo 4548d2c87f Make Rulesets.Osu use the new judgement result structure 2018-08-02 20:36:38 +09:00
smoogipoo 462f1033c0 Migrate Rulesets.Osu to the new judgement system 2018-08-02 15:21:23 +09:00
Dean Herbert 51506efd1a Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-31 16:49:31 +09:00
Dean Herbert ea6cab498e Add comment 2018-07-31 16:47:13 +09:00
Dan Balasescu 04252293a7
Merge branch 'master' into fix-repeat-arrow-interpolation 2018-07-31 16:21:15 +09:00
Dean Herbert 874b5636e4 Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning 2018-07-31 16:15:27 +09:00
Dean Herbert 976653fdf9 Minor formatting fixes 2018-07-31 16:13:52 +09:00
Dean Herbert 132241424d Apply FollowPoint alpha to inner container (should not affect legacy skins) 2018-07-31 15:59:06 +09:00
Dean Herbert a98bb057e2 Fix follow circle being scaled far larger than it should be 2018-07-31 15:27:21 +09:00
tgi74000 36afae5a24 Remove the inner followcircle fade, Fade the entire followcircle instead 2018-07-30 13:43:02 +02:00
Dean Herbert f4cda695e6 Improve rotation handling in edge cases 2018-07-30 18:50:59 +09:00
tgi74000 c6aabc6d2d Move the FollowCircle border to its own container 2018-07-30 10:52:37 +02:00
Dean Herbert a39188f762 Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-30 17:29:21 +09:00
tgi74000 84135c49ca Fix small FollowPoint rotation bug 2018-07-29 23:21:05 +02:00
tgi74000 18096490b6 Add support for followpoint skinning 2018-07-29 23:20:37 +02:00
tgi74000 4322475ad2 Add support for sliderb skinning (single frame only) 2018-07-29 22:29:07 +02:00
tgi74000 257c035f30 Add support for sliderfollowcircle skinning 2018-07-29 21:28:13 +02:00