1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 21:03:08 +08:00
Commit Graph

493 Commits

Author SHA1 Message Date
Dean Herbert
fb1f77bd04 Move implementation and colour logic to legacy implementation 2019-07-30 23:06:18 +09:00
Dean Herbert
4ee20bae30 Merge branch 'master' into slider-ball-scaling 2019-07-30 07:54:40 +09:00
smoogipoo
c01461b951 Recalculate path size when path radius changes 2019-07-29 19:12:41 +09:00
Dean Herbert
a4f30daf13
Merge pull request #5462 from peppy/skin-metric-parity
Bring playfield ratio in line with stable
2019-07-29 18:49:21 +09:00
Dean Herbert
8487ecf98a
Fix slider ticks being scaled incorrectly (#5460)
Fix slider ticks being scaled incorrectly
2019-07-29 18:48:27 +09:00
Dean Herbert
afd6024ba2
Fix repeat points being scaled incorrectly (#5459)
Fix repeat points being scaled incorrectly
2019-07-29 18:48:04 +09:00
Dean Herbert
f2e90fdb26
Scale follow points by circle size (#5458)
Scale follow points by circle size
2019-07-29 18:47:48 +09:00
Dean Herbert
53a91b46e0
Fix approach circles not scaling to circle correctly when a ski… (#5455)
Fix approach circles not scaling to circle correctly when a skin is applied
2019-07-29 18:47:36 +09:00
Dan Balasescu
b74c11ad22
Merge branch 'master' into explode-circle-earlier 2019-07-29 18:05:47 +09:00
Dan Balasescu
7779302e82
Merge branch 'master' into skin-scaling-modes 2019-07-29 17:47:07 +09:00
smoogipoo
d4f85af19c Force snaking slider paths to retain a fixed size 2019-07-25 18:22:56 +09:00
Dean Herbert
6cc6aff66e Fix slider ball sizing when legacy skin falls back to default 2019-07-25 16:30:50 +09:00
Dean Herbert
5e8867066c Correctly handling bindable scale changes 2019-07-25 14:43:44 +09:00
Dean Herbert
46e17646ac Align slider path size with legacy skins 2019-07-25 14:22:26 +09:00
Dean Herbert
5e153a3dd3 Use scale correctly in DrawableSliderTick 2019-07-25 13:50:20 +09:00
Dean Herbert
2cb3619b54 Allow scaling outside of defined area
Caters to skins which show borders outside of the circle for repeats.
2019-07-25 13:27:41 +09:00
Dean Herbert
5a9d18380c Use scale correctly in DrawableRepeatPoint 2019-07-25 13:25:31 +09:00
Dean Herbert
28653e871c Give repeat points a size specification 2019-07-25 13:24:35 +09:00
Dean Herbert
2b184658d1 Adjust follow points by circle size 2019-07-25 13:06:25 +09:00
Dean Herbert
c989185774 Fix incorrect approach circle scaling 2019-07-25 11:27:24 +09:00
Dean Herbert
c16af88299 Start exploding animation earlier (don't wait for flash) 2019-07-25 11:11:26 +09:00
Dean Herbert
efad9b3150
Merge branch 'master' into skin-scaling-modes 2019-07-24 18:37:31 +09:00
Dan Balasescu
9b526ef61e
Merge branch 'master' into move-state-logic 2019-07-23 20:37:57 +09:00
Dean Herbert
91e21688d8
Make AccentColour a bindable (#5420)
Make AccentColour a bindable

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-23 20:37:47 +09:00
smoogipoo
b1a9ce85e7 Fix ticks being given an extra colour 2019-07-23 20:30:47 +09:00
Dean Herbert
c3b81bef4a Flip default to the preferred method going forward 2019-07-22 15:55:38 +09:00
Dean Herbert
be170b4124 Naming and documentation improvements 2019-07-22 15:50:02 +09:00
Dean Herbert
6d889c8a37 Revert unintended change 2019-07-22 15:43:27 +09:00
Dean Herbert
91f86adb66 Move DrawableHitObject state management to base class 2019-07-22 15:07:12 +09:00
Dean Herbert
8327452fe1 Make AccentColour a bindable 2019-07-22 14:48:59 +09:00
Dean Herbert
74c961bcff Add more flexible skin element confine modes 2019-07-22 14:42:56 +09:00
Dean Herbert
e50b70d615 Centralise osu! circle radius specification 2019-07-22 14:40:02 +09:00
smoogipoo
a9286fee07 Recycle slider paths when the parenting slider dies 2019-07-17 16:20:27 +09:00
smoogipoo
ed203cb0ff Delay intial hitobject updates 2019-07-16 13:45:59 +09:00
Salman Ahmed
d11b799571 Add explaining comment 2019-06-30 18:28:20 +03:00
Salman Ahmed
f42ded3437 Move to DrawableOsuHitObject 2019-06-30 18:27:47 +03:00
Dean Herbert
60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +09:00
Dean Herbert
aca9289d89 Use SkinnableSprite for approach circle 2019-06-24 15:17:56 +09:00
smoogipoo
ae438213a5 Remove secondary buffered container from slider body 2019-06-06 16:32:43 +09:00
Dean Herbert
daa2786dbd Use a constant for the default value 2019-05-12 23:08:42 +09:00
Dean Herbert
487a56549e Fix CI issues 2019-05-12 22:53:12 +09:00
Dean Herbert
ce0e4c506e
Merge branch 'master' into dev 2019-05-12 21:45:52 +09:00
Dean Herbert
b8446fb67f Fix fallbacks for SliderTrackOverride and SliderBall too 2019-05-12 18:51:31 +09:00
Dean Herbert
cbf126db25
Merge branch 'master' into fix-slider-border-color 2019-05-12 17:25:49 +09:00
smoogipoo
117f8bdd01 Merge remote-tracking branch 'Joehuu/master' into flashlight-dim 2019-05-08 13:25:01 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
David Zhao
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
Joehu
8ef6a745f7 Fix slider border not reverting to default color 2019-05-05 22:43:03 -07:00
David Zhao
664a4ba540 Implement flashlight dimming on slider slide 2019-04-12 10:47:22 +09:00
smoogipoo
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00