Dean Herbert
|
c2e85a2057
|
Apply CornerExponent fixes
|
2019-11-22 19:49:20 +09: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 |
|
Dean Herbert
|
e9cb3337b3
|
Fix 1x1 white pixel appearing in the centre of hitcircles on default skin
|
2019-10-29 22:31:27 +09:00 |
|
smoogipoo
|
3155a90501
|
Use bindables for displayed circle piece numbers
|
2019-09-26 16:58:20 +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
|
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
|
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 |
|
Dean Herbert
|
d1cdf49dd5
|
Revert SkinnableSprite lookups to old behaviour
|
2019-09-03 14:21:54 +09:00 |
|
Dean Herbert
|
4f3511e8e9
|
Fix ring glow lookup being incorrect
|
2019-09-03 12:32:10 +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
|
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
|
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
|
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
|
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
|
c989185774
|
Fix incorrect approach circle scaling
|
2019-07-25 11:27:24 +09:00 |
|
Dean Herbert
|
efad9b3150
|
Merge branch 'master' into skin-scaling-modes
|
2019-07-24 18:37:31 +09:00 |
|
Dean Herbert
|
6d889c8a37
|
Revert unintended change
|
2019-07-22 15:43:27 +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 |
|
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 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
8f5e769425
|
Fix slider ball not always receiving position in time
|
2019-03-28 12:42:28 +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 |
|
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 |
|
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 |
|
Dean Herbert
|
8e52e2330e
|
Add extensive commenting
|
2019-02-23 14:14:34 +09:00 |
|
Dean Herbert
|
1c75ee4e82
|
Add fixes
|
2019-02-23 14:14:34 +09:00 |
|
Dean Herbert
|
7566fcf536
|
Slider press fix
|
2019-02-23 14:14:34 +09:00 |
|
smoogipoo
|
d61dfe888e
|
Fix venera fonts not being correctly specified
|
2019-02-22 19:42:09 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
ekrctb
|
504e79b968
|
Merge branch 'master' into use-lifetime-optimization
|
2019-01-29 12:15:02 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
ekrctb
|
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 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
Dean Herbert
|
bb2f8deb18
|
ControlPoint -> PathControlPoint
Also Curve -> Path.
|
2018-11-01 03:56:51 +09:00 |
|
smoogipoo
|
acd703c27b
|
Make sliders respond to control point changes
|
2018-10-29 15:36:43 +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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|
tgi74000
|
c6aabc6d2d
|
Move the FollowCircle border to its own container
|
2018-07-30 10:52: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 |
|
Dean Herbert
|
0f37758314
|
Update framework
|
2018-07-21 16:21:53 +09:00 |
|
tgi74000
|
558b2622a7
|
Move the Shake logic to a new ShakeContainer
|
2018-07-05 15:48:54 +02:00 |
|
Dean Herbert
|
1d6609d9f3
|
Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
|
2018-07-05 15:54:41 +09:00 |
|
Dean Herbert
|
3819ecb2be
|
Update framework
|
2018-06-19 20:19:52 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
Dan Balasescu
|
ab9505652b
|
Merge branch 'master' into skin--completion
|
2018-03-22 16:44:00 +09:00 |
|
smoogipoo
|
4ccaf143b5
|
Give sliders a default accent colour
|
2018-03-22 15:50:19 +09:00 |
|
Dean Herbert
|
fb3d319d0e
|
Make fallback bool into a function
Allows correct handling now that beatmap skins are also a thing.
|
2018-03-20 16:40:11 +09:00 |
|
Dean Herbert
|
cb3d0db555
|
Move combo colours completely out of HitObjects
|
2018-03-20 15:50:12 +09:00 |
|
Dean Herbert
|
f2d7621df3
|
Add skin support for explode/flash layers
Basically to hide them for legacy skins, though.
|
2018-03-07 18:21:05 +09:00 |
|
Dean Herbert
|
9cbed461c4
|
Merge branch 'master' into sliderbody-rework
|
2018-02-26 15:00:18 +09:00 |
|
smoogipoo
|
066abfbdbc
|
Rename PositionAt -> CurvePositionAt to represent its new meaning
|
2018-02-24 02:43:36 +09:00 |
|
smoogipoo
|
8c90abe0dc
|
Make slider control points relative to start position
|
2018-02-23 20:59:27 +09:00 |
|
smoogipoo
|
08bb25347c
|
Make DrawableSlider contain the slider body
|
2018-02-23 20:27:05 +09:00 |
|
Dean Herbert
|
84b707f4f8
|
Add basic hitcircle skinning
|
2018-02-23 13:38:12 +09:00 |
|
Dean Herbert
|
3b4e4bd110
|
Merge remote-tracking branch 'upstream/master' into general-slider-improvements
|
2018-02-22 12:28:33 +09:00 |
|
smoogipoo
|
08e52e8c15
|
Remove unnecessary schedules
|
2018-02-21 18:02:52 +09:00 |
|
smoogipoo
|
9cd9c83f2c
|
Allow changing accentcolour/bordercolour post-load
|
2018-02-21 18:00:46 +09:00 |
|
smoogipoo
|
f877b642da
|
Clean up and document better what "progress" means
|
2018-02-21 17:10:18 +09:00 |
|
smoogipoo
|
ee055b8e5c
|
Allow customizing the snake-ability of sliders
|
2018-02-20 20:53:06 +09:00 |
|
smoogipoo
|
8270e4d758
|
Add BorderColour to SliderBody
|
2018-02-20 20:51:28 +09:00 |
|
smoogipoo
|
cfb2b3f1e8
|
Rework SelctionLayer to support click-selections
|
2018-02-12 16:02:42 +09:00 |
|
ColdVolcano
|
efae00c149
|
make repeat points look better
|
2018-01-23 04:31:37 -06:00 |
|
smoogipoo
|
d37844c068
|
Clean up off-by-one offsets from repeat-related properties
|
2018-01-23 13:37:25 +09:00 |
|
Dean Herbert
|
9b33499fe7
|
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
|
2018-01-16 20:04:34 +09:00 |
|
Dean Herbert
|
d0881e443b
|
Merge remote-tracking branch 'upstream/master' into approach-rate
|
2018-01-12 18:05:16 +09:00 |
|
TocoToucan
|
ae032cbf23
|
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
|
2018-01-07 23:40:00 +03:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
Dean Herbert
|
1f62fe19d5
|
Make animation a bit more subtle
|
2018-01-04 20:43:42 +09:00 |
|
Dean Herbert
|
bde957940d
|
Disallow SliderBall from contracting after EndTime
|
2018-01-04 20:09:58 +09:00 |
|
Aergwyn
|
1ce6219293
|
remove unnecessary override
|
2018-01-03 13:55:24 +01:00 |
|
Aergwyn
|
d94c313947
|
fix slider follow circle instantly disappearing on slider ends
|
2018-01-03 08:13:58 +01:00 |
|
Shawdooow
|
3ba5dce052
|
new Approach to approach rate
|
2017-12-31 11:15:14 -05:00 |
|
Aergwyn
|
4c2554595e
|
implement hidden (mostly)
some things work and others don't, I dunno
|
2017-12-26 17:25:18 +01:00 |
|
smoogipoo
|
cf859a6cf2
|
Make the dragger attach to objects it surrounds
Plus a lot more implementation.
|
2017-12-02 00:26:02 +09:00 |
|
smoogipoo
|
c7426ebed8
|
Fix spinners showing very weird numbers after rewinding
Fixes #1462
|
2017-11-06 17:22:22 +09:00 |
|
smoogipoo
|
5fd3115142
|
Fix slider ball not animating fade/scale after rewinding
Fixes #1455
|
2017-11-03 15:58:12 +09:00 |
|
Dean Herbert
|
ad685bd919
|
Merge branch 'master' into sliderbouncers
|
2017-10-22 14:12:03 +09:00 |
|
Dean Herbert
|
1b031ca328
|
Fix potential read from empty queue in SPM counter
|
2017-10-12 18:28:26 +09:00 |
|
Dean Herbert
|
1fc16693d6
|
Formatting
|
2017-10-11 11:20:44 +09:00 |
|
Huo Yaoyuan
|
09093013a7
|
Move spm calculation into counter.
|
2017-10-07 15:58:53 +08:00 |
|
Huo Yaoyuan
|
a876ab9b90
|
Move spm counter to a seperated control.
|
2017-10-07 15:31:42 +08:00 |
|
Huo Yaoyuan
|
404c4917dc
|
Use single queue for spinning record.
|
2017-10-06 20:42:24 +08:00 |
|
Huo Yaoyuan
|
29f9c8143d
|
Use RotationAbsolute to calculate spm.
|
2017-10-05 20:08:45 +08:00 |
|
Huo Yaoyuan
|
134e1299bb
|
Update spm value when spinner not active.
|
2017-10-05 19:23:58 +08:00 |
|
Huo Yaoyuan
|
3de42ee405
|
Smooth spm values into a time range.
|
2017-09-30 15:23:10 +08:00 |
|
Huo Yaoyuan
|
40a27c810a
|
Calculate SPM in spinner disc.
|
2017-09-29 19:24:14 +08:00 |
|
Shawdooow
|
801fa39145
|
remove old SliderBouncer
|
2017-09-26 12:23:13 -04:00 |
|
smoogipooo
|
19db7a8f72
|
Update in line with framework changes.
|
2017-09-07 22:46:21 +09:00 |
|
Shane Woolcock
|
71ddbd22a1
|
Convert ReceiveMouseInputAt override to lambda syntax, and make Tracking property private set
|
2017-08-20 14:00:53 +09:30 |
|
Shane Woolcock
|
51af233d66
|
Fix sliders not checking the correct cursor position once it moves out of the follow circle
|
2017-08-19 12:19:37 +09:30 |
|
Shane Woolcock
|
7e0fe6cbcb
|
Fix slider tracking to use pressed actions rather than directly querying the mouse buttons
|
2017-08-18 20:19:23 +09:30 |
|
Shane Woolcock
|
529732ea47
|
More CI fixes
|
2017-08-18 16:58:01 +09:30 |
|
Shane Woolcock
|
9628c0b6d6
|
Change spinner to check currently pressed actions rather than implementing IKeyBindingHandler
|
2017-08-18 16:46:00 +09:30 |
|
Dan Balasescu
|
f7ccc81875
|
Merge branch 'master' into fix-spinner-ignoring-actions
|
2017-08-17 12:33:18 +09:00 |
|