Huo Yaoyuan
|
c0fe91a84c
|
Merge branch 'master' into sharpen
|
2019-11-26 18:21:50 +08:00 |
|
Dean Herbert
|
709ec1404f
|
Centralise End/StartTime retrieval to extension method
|
2019-11-25 19:09:14 +09:00 |
|
Berkan Diler
|
fccdbffa93
|
Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
|
2019-11-25 00:45:42 +01:00 |
|
Dean Herbert
|
c2e85a2057
|
Apply CornerExponent fixes
|
2019-11-22 19:49:20 +09:00 |
|
Huo Yaoyuan
|
818553027b
|
Merge branch 'master' into sharpen
|
2019-11-21 23:42:46 +08:00 |
|
Berkan Diler
|
6cab517b2d
|
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
|
2019-11-20 13:37:47 +01:00 |
|
Huo Yaoyuan
|
dcfa98414f
|
Use ??=.
|
2019-11-12 19:56:51 +08:00 |
|
Dean Herbert
|
7b5b3ff15c
|
Remove unused returns
|
2019-11-06 16:36:12 +09:00 |
|
Dean Herbert
|
ee544e174a
|
Group -> Connection
|
2019-11-06 16:33:42 +09:00 |
|
smoogipoo
|
68ca5cb26a
|
Adjust comments
|
2019-11-05 23:20:46 +09:00 |
|
smoogipoo
|
aff275ea21
|
Revert "Fix follow point lifetime not being updated correctly"
This reverts commit 1ef2b81041.
|
2019-11-05 23:03:05 +09:00 |
|
smoogipoo
|
0a2af2b0fe
|
Apply transform override at a higher level
|
2019-11-05 23:02:39 +09:00 |
|
smoogipoo
|
d762ec959c
|
Schedule group refresh when loaded
|
2019-11-05 22:50:38 +09:00 |
|
smoogipoo
|
68a81e0eb0
|
Fix follow point transforms not working after rewind
|
2019-11-05 22:50:21 +09:00 |
|
smoogipoo
|
f2118b0eba
|
Add automated test cases
|
2019-11-05 19:31:58 +09:00 |
|
smoogipoo
|
6c58faf30c
|
Fix group ends potentially not being updated correctly
|
2019-11-05 19:31:48 +09:00 |
|
smoogipoo
|
1ef2b81041
|
Fix follow point lifetime not being updated correctly
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
3b6064336b
|
Implement group re-ordering based on start time
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
a19e26f8aa
|
Improve performance of refreshes
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
712253ff50
|
Replace follow point renderer with new implementation
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
ddfcda9e02
|
Remove abstract ConnectionRenderer class
|
2019-11-05 17:33:02 +09:00 |
|
Dean Herbert
|
e9cb3337b3
|
Fix 1x1 white pixel appearing in the centre of hitcircles on default skin
|
2019-10-29 22:31:27 +09:00 |
|
Dean Herbert
|
02efd0e943
|
Merge pull request #6556 from smoogipoo/fix-slider-stack-change
Fix sliders not moving with stacking changes
|
2019-10-23 17:48:06 +09:00 |
|
smoogipoo
|
c34d3362df
|
Fix hit circles selection area being too large
|
2019-10-21 17:14:08 +09:00 |
|
smoogipoo
|
5f8d46f666
|
Fix sliders not moving with stacking change
|
2019-10-21 16:24:06 +09:00 |
|
smoogipoo
|
bc41eb176e
|
Clean up head/tail setting in various DHOs
|
2019-10-17 14:02:23 +09:00 |
|
smoogipoo
|
f429a8f7c2
|
Add back/obsolete old AddNested() method
|
2019-10-17 14:02:08 +09:00 |
|
smoogipoo
|
d8f3678c3c
|
Rename parameter
|
2019-10-17 12:53:54 +09:00 |
|
smoogipoo
|
3a1acf7b0a
|
Fix slider approach circle proxies
|
2019-10-17 12:50:26 +09:00 |
|
smoogipoo
|
8d7453c251
|
Rework construction of nested hitobjects
|
2019-10-16 22:10:50 +09:00 |
|
smoogipoo
|
4ac2e1c58e
|
Move load() to below ctor()
|
2019-10-16 21:41:18 +09:00 |
|
Dean Herbert
|
b09d9b7e1f
|
Add todo in slider tail to avoid confusion
|
2019-10-08 17:56:56 +09:00 |
|
smoogipoo
|
3155a90501
|
Use bindables for displayed circle piece numbers
|
2019-09-26 16:58:20 +09:00 |
|
Dan Balasescu
|
13f922211f
|
Merge branch 'master' into decrease-disc-rotation-on-rewind
|
2019-09-24 12:58:27 +09:00 |
|
iiSaLMaN
|
57310c86c7
|
Remove unnecessary fields
|
2019-09-20 15:09:51 +03:00 |
|
iiSaLMaN
|
093ed8421e
|
Remove "allow slider ball tinting" ruleset setting
|
2019-09-20 15:08:00 +03:00 |
|
iiSaLMaN
|
1b45014ff6
|
Use logical-OR
|
2019-09-20 00:25:16 +03:00 |
|
iiSaLMaN
|
f6291170b1
|
Implement tinting slider ball with combo colour
|
2019-09-20 00:11:37 +03:00 |
|
Dan Balasescu
|
027d6194f2
|
Merge branch 'master' into add-hit-lighting
|
2019-09-19 18:07:29 +09:00 |
|
Dean Herbert
|
cfdac956c2
|
Fix issues with colour and skin application
|
2019-09-18 20:04:49 +09:00 |
|
Dean Herbert
|
ba76f09c99
|
Add initial implementation of hit lighting
Requires a supporting skin, like osu!classic for now.
|
2019-09-18 02:49:54 +09:00 |
|
smoogipoo
|
5c2c055614
|
Set lifetime on initial state update
|
2019-09-13 18:49:21 +09:00 |
|
Dean Herbert
|
f21e47d6d2
|
Move expire to DrawableHitObject
|
2019-09-12 19:29:08 +09:00 |
|
iiSaLMaN
|
aec04dcf90
|
Use Clock.ElapsedFrameTime instead
|
2019-09-09 15:36:20 +03:00 |
|
iiSaLMaN
|
c4aee11fe0
|
Revert renaming changes
|
2019-09-09 15:35:18 +03:00 |
|
iiSaLMaN
|
9defcb0e99
|
Remove redundant using directive
|
2019-09-08 21:37:50 +03:00 |
|
iiSaLMaN
|
f5f2713a17
|
Account angle change negatively on rewind
|
2019-09-08 16:14:14 +03:00 |
|
iiSaLMaN
|
3d8b27abfa
|
RotationAbsolute -> BidirectionalRotation
|
2019-09-08 16:13:36 +03:00 |
|
Dean Herbert
|
f925e781a9
|
Refactor HitWindows for legibility
|
2019-09-06 15:24:14 +09:00 |
|
Dean Herbert
|
2983918f71
|
Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor
|
2019-09-04 13:40:41 +09:00 |
|
Dean Herbert
|
858828d4ef
|
Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.1' into fix-catch-catcher
|
2019-09-03 18:31:19 +09:00 |
|
Dean Herbert
|
bebc3309ce
|
Refactor skin configuration to be infinitely extensible
|
2019-09-03 17:57:34 +09:00 |
|
Dan Balasescu
|
3854bc68e0
|
Merge branch 'master' into fix-ring-glow-lookup
|
2019-09-03 16:14:07 +09:00 |
|
Dean Herbert
|
d1cdf49dd5
|
Revert SkinnableSprite lookups to old behaviour
|
2019-09-03 14:21:54 +09:00 |
|
Dean Herbert
|
05ed9d3802
|
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
|
2019-09-03 13:07:58 +09:00 |
|
Dean Herbert
|
4f3511e8e9
|
Fix ring glow lookup being incorrect
|
2019-09-03 12:32:10 +09:00 |
|
smoogipoo
|
8302658186
|
Fix other potential nullref cases that rider missed
|
2019-09-02 18:31:33 +09:00 |
|
smoogipoo
|
0c73c5acf3
|
Expose full hitobject rather than hit windows
|
2019-09-02 17:14:40 +09:00 |
|
smoogipoo
|
f2bdf94a1d
|
Add HitWindows to JudgementResult to indicate timing errors
|
2019-09-02 16:28:14 +09:00 |
|
Dean Herbert
|
70e417533f
|
Update naming
|
2019-08-30 15:13:29 +09:00 |
|
Dean Herbert
|
a15828ab25
|
Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
|
2019-08-30 14:55:52 +09:00 |
|
Dean Herbert
|
9a98f39f06
|
Share logic with other rulesets (and make default)
|
2019-08-28 18:12:47 +09:00 |
|
Dean Herbert
|
9752dbf950
|
Fix osu! approach circles fading in too late
|
2019-08-28 18:10:58 +09:00 |
|
Dean Herbert
|
745bd58f37
|
Merge remote-tracking branch 'upstream/master' into update-framework-blending
|
2019-08-21 15:10:08 +09:00 |
|
Dean Herbert
|
48716f8f2b
|
Update framework
|
2019-08-21 13:29:50 +09:00 |
|
Dean Herbert
|
62a24bf16d
|
Fix a couple of rotation-related issues
|
2019-08-20 13:18:34 +09:00 |
|
Dean Herbert
|
d0766fa1cd
|
Add slider ball animation support
|
2019-08-19 19:55:47 +09:00 |
|
Dean Herbert
|
6264a6a1c9
|
Adjust slider snaking and hitcircle fading to match stable
|
2019-08-09 20:18:02 +09:00 |
|
Dean Herbert
|
8e9f8bb565
|
Merge branch 'master' into slider-ball-scaling
|
2019-07-30 23:19:28 +09:00 |
|
Dean Herbert
|
fb1f77bd04
|
Move implementation and colour logic to legacy implementation
|
2019-07-30 23:06:18 +09:00 |
|
Dean Herbert
|
e6bd02d276
|
Simplify namespace definition
|
2019-07-30 22:41:20 +09:00 |
|
Dean Herbert
|
307a6c1095
|
Remove DefaultCirclePiece
|
2019-07-30 22:38:29 +09:00 |
|
Dean Herbert
|
1fbaa97218
|
Merge branch 'master' into add-legacy-hit-animations
|
2019-07-30 22:20:29 +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
|
766cf9295d
|
Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations
|
2019-07-29 19:03:36 +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
|
859233526d
|
Move circle visual implementation to new class
Allows for more precise skin control over state animations.
|
2019-07-25 16:09:20 +09:00 |
|
Dean Herbert
|
3ca41b9c0a
|
Merge branch 'skin-metric-parity' into add-legacy-hit-animations
|
2019-07-25 16:07:23 +09:00 |
|
Dean Herbert
|
73b5a39c6e
|
Merge branch 'explode-circle-earlier' into add-legacy-hit-animations
|
2019-07-25 16:06:04 +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
|
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 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
176b4ecc38
|
Merge branch 'master' into sprite-icon-compatibility
|
2019-03-28 23:47:44 +09:00 |
|
Dean Herbert
|
8f5e769425
|
Fix slider ball not always receiving position in time
|
2019-03-28 12:42:28 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Santeri Nogelainen
|
b624ecabde
|
Max = 8
|
2019-03-16 12:47:37 +02:00 |
|
Santeri Nogelainen
|
cbb7498a42
|
Border size to float, add min and max size, other small changes
|
2019-03-16 12:41:03 +02:00 |
|
Santeri Nogelainen
|
92595e43f6
|
slider border thickness
|
2019-03-14 21:57:39 +02:00 |
|
Jamie Taylor
|
5cc670cd19
|
Prevent ApplyTransformsAt from propogating to SliderBall children
|
2019-03-14 19:17:28 +09:00 |
|
David Zhao
|
527b77b07d
|
Make all inheritors of drawablejudgement use new method
|
2019-03-12 19:52:44 +09:00 |
|
Dean Herbert
|
340997f505
|
Rename remaining usage of PathWidth naming convention
|
2019-03-07 20:21:59 +09:00 |
|
David Zhao
|
b3e046c4d1
|
Rename PathWidth to PathRadius
|
2019-03-07 17:39:19 +09:00 |
|
smoogipoo
|
0322bd8812
|
Make config nullable, removing testcase code
|
2019-03-05 14:40:27 +09:00 |
|
smoogipoo
|
78596dfe80
|
Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
|
2019-03-05 13:25:03 +09:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +09:00 |
|
Dean Herbert
|
c8793911a8
|
Enable more stringent inspectcode style inspections
|
2019-02-27 21:25:40 +09:00 |
|
smoogipoo
|
a07d797d75
|
Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization
|
2019-02-27 12:08:43 +09:00 |
|
smoogipoo
|
d06f38b3f3
|
Cleanup
|
2019-02-25 15:57:07 +09:00 |
|
Dean Herbert
|
7f5780c615
|
Simplify SliderBall and fix incorrect key up handling
Was not processing timeToAcceptAnyKeyAfter when cursor was outside valid tracking area, but should have been.
|
2019-02-23 14:38:53 +09:00 |
|
Dan Balasescu
|
5fdd7f9bff
|
Fix typo in comment
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-02-23 14:14:34 +09:00 |
|
Dean Herbert
|
3a57ff40cd
|
Add comment about other cases, rewind handling
|
2019-02-23 14:14:34 +09:00 |
|