smoogipoo
958c891d15
Update with framework-side bindable list changes
2020-02-17 15:06:14 +09:00
mcendu
9aa5db88d4
move auto fade in to mod
2020-02-10 14:14:04 +08:00
mcendu
68873830aa
make spm counter show up automatically with spun out
2020-02-09 13:49:08 +08:00
mcendu
d314b38699
rename trackable to enabled and cleanup code
2020-02-09 13:46:06 +08:00
杜Nate
8d480c794a
Merge branch 'master' into spun-out
2020-02-08 13:54:39 +08:00
mcendu
efa95ecebb
fix spinner unspinnable
2020-02-08 10:52:59 +08:00
mcendu
4d9232a895
Move autospin logic to mods
2020-02-08 09:51:32 +08:00
mcendu
25a930c438
Implement OsuModSpunOut
2020-02-08 08:59:35 +08:00
Dean Herbert
6297606baa
Make sMake spinner's EndTime correct on construction
2020-02-07 19:08:37 +09:00
Dean Herbert
daf5fa9da4
Throw NotSupportedException instead
2020-02-06 13:16:32 +09:00
Dean Herbert
cd6902a312
Make EndTime and RepeatCount settable
2020-02-05 17:52:51 +09:00
mcendu
9f79713fb3
move rotation logic to its own method
2020-02-05 14:23:59 +08:00
mcendu
d773eb2c22
refactor rotation logic to use explicit delta value
2020-02-05 14:05:12 +08:00
Dean Herbert
84fcf45aae
Make slider tracking match what is on screen
2020-02-03 11:55:14 +09:00
Dean Herbert
cf4788d7ef
Merge branch 'master' into fix-follow-circle
2020-02-03 09:58:12 +09:00
TheWildTree
35032e2ddd
Make variables private
2020-02-02 14:34:06 +01:00
TheWildTree
f7abfdb40e
Remove unnecessary parameter
2020-02-02 14:33:48 +01:00
TheWildTree
e2589b2dcb
Rename drawable
2020-02-02 11:24:28 +01:00
Bartłomiej Dach
434c0d92e4
Use Bindable{Float,Double}s everywhere
...
To avoid further floating-point comparison bugs, remove all usages of
Bindable<{float,double}>, replacing them with their
Bindable<Float,Double> counterparts.
2020-02-01 22:50:29 +01:00
TheWildTree
9f4261111b
Match osu-stable behaviour and size
2020-02-01 16:55:30 +01:00
smoogipoo
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
smoogipoo
92daf9b8f1
Cleanup
2020-01-14 18:14:31 +09:00
Dean Herbert
fe09e34f1b
Remove limiting clause
2020-01-14 01:48:20 +09:00
Dean Herbert
ab4f31639d
Remove weird time clause
2020-01-14 01:47:44 +09:00
Dean Herbert
210d06b75e
Remove default value
2020-01-14 01:45:32 +09:00
Dean Herbert
c5085aea24
Use Child, not InternalChild
2020-01-14 01:45:10 +09:00
Dean Herbert
619fe29871
Make reverse arrow animate faster via divisor specification
...
Adds MinimumBeatLength to BeatSyncedContainer to make sure things don't get out of hand.
2020-01-14 01:39:45 +09:00
Sebastian Krajewski
45cf65a28a
Merge remote-tracking branch 'upstream/master' into reverse-arrows
2020-01-13 14:15:37 +01:00
Dean Herbert
87645f6a41
Remove excess namespace specification
2020-01-10 01:13:42 +08:00
Dean Herbert
3be2fc27f3
Merge branch 'master' into Remove_osuTK.MathHelper
2020-01-10 00:28:46 +08:00
smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
Berkan Diler
ed2bf5154d
Use tuple deconstruction to swap values
2020-01-08 20:46:17 +01:00
Berkan Diler
34d8740ec4
Remove remaining usage of osuTK.MathHelper
2020-01-08 20:21:13 +01:00
Sebastian Krajewski
21468eb070
Remove settings related to reverse arrow
2020-01-07 04:55:05 +01:00
Sebastian Krajewski
3194658998
Fix repeat point pulsing when it is in fade out state
2020-01-04 13:12:37 +01:00
Sebastian Krajewski
46271ccbc8
Add slider reverse arrow pulse settings
2020-01-04 13:01:42 +01:00
Sebastian Krajewski
fc0b622a69
Change reverse arrow pulse easing to OutQuad
2020-01-04 10:35:10 +01:00
Sebastian Krajewski
9da7eec0d9
Add pulse to slider reverse arrows
2020-01-04 08:21:48 +01:00
Salman Ahmed
b7565f5943
Remove unnecessary using directive
2019-12-25 05:36:58 +03:00
Salman Ahmed
949ab4e0d3
Move spinner bonus scoring to it's own component class
...
Also fixes counter rewinding issue and does optimizations.
2019-12-25 05:34:12 +03:00
Dean Herbert
419656cea4
Merge branch 'master' into add-spinner-bonus-score
2019-12-20 19:55:53 +09:00
Dean Herbert
f150d22eaf
Fix SPM calculation logic not handling paused clocks ( #7253 )
...
Fix SPM calculation logic not handling paused clocks
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-18 16:30:18 +09:00
smoogipoo
1fe0e45a9c
Implement legacy slider border shadow
2019-12-18 13:37:37 +09:00
Salman Ahmed
cbfbbf9999
Make SpmCounter public
2019-12-18 03:04:37 +03:00
Salman Ahmed
7e58b4a948
Early-return on potential division by zero in SPM calculation
2019-12-18 03:03:12 +03:00
smoogipoo
35276c3739
Prevent test scene failures through casting softly
2019-12-17 21:26:23 +09:00
smoogipoo
7c2884700e
Fix various display issues by abstracting further
2019-12-17 19:29:27 +09:00
smoogipoo
9caed9e98a
Add legacy slider body support
2019-12-17 18:16:25 +09:00
smoogipoo
1e798a8dbe
Add abstract implementation of slider path
2019-12-17 17:54:05 +09:00
Dean Herbert
88ce4c12f0
Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score
2019-12-17 14:09:28 +09:00
smoogipoo
a554ca728b
Don't reuse the same control point references
2019-12-16 15:27:54 +09:00
Salman Ahmed
10e1e512fd
Update the nested hitobject logic inline with new implementation
2019-12-12 15:15:16 +03:00
Dean Herbert
06352a95be
Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score
2019-12-11 20:02:51 +09:00
smoogipoo
883d5bc11d
Remove automatic slider path offsetting
2019-12-09 17:54:22 +09:00
smoogipoo
fa1468325e
Refactor hitobjects to remove default control point
2019-12-09 17:48:27 +09:00
smoogipoo
4905709ea4
Remove unused usings
2019-12-09 13:19:21 +09:00
smoogipoo
b9d12e5fe4
Fix nested hitobjects not updating
2019-12-06 20:53:40 +09:00
smoogipoo
16f8341a02
Handle control point positional updates within SliderPath
2019-12-06 18:49:01 +09:00
smoogipoo
3ebbf62b2a
Initial game-wide update with the new SliderPath
2019-12-05 19:53:36 +09:00
Dean Herbert
990f94dc34
Merge branch 'master' into expand-number-piece-on-old-skins
2019-12-05 01:42:13 +09:00
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
a43b0ee01b
Apply naming and styling changes
2019-11-12 10:45:46 +09:00
smoogipoo
df31acb294
Fix slider nested hitobject samples not getting updated
2019-11-08 15:43:34 +09:00
smoogipoo
6fc1be64c2
Make hitobject samples a bindable list
2019-11-08 14:04:57 +09: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
smoogipoo
7a3ebcd0b1
Fix path changes not updating tail circle
2019-10-31 15:52:38 +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
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply
2019-10-18 19:45:10 +09:00
Dean Herbert
f3ed71d336
Move scoring distance constant to a central/shared location
2019-10-17 16:36:47 +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
iiSaLMaN
53b99811a2
Merge remote-tracking branch 'upstream/master' into expand-number-piece-on-old-skins
2019-10-15 21:59:28 +03:00
iiSaLMaN
a75ae14cb2
Use foreach loop to avoid too long lines
2019-10-14 00:40:36 +03:00
iiSaLMaN
68e370ce7c
Set spinner tick start time to allow result reverting
2019-10-14 00:39:20 +03:00
iiSaLMaN
5d2fe87339
Use empty hit windows for spinner ticks
2019-10-14 00:38:45 +03:00
iiSaLMaN
c8593f1215
Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score
2019-10-13 23:04:05 +03:00
Dean Herbert
51bf600ea7
Use empty hitwindows instead of null
2019-10-09 19:08:31 +09:00
Dean Herbert
b09d9b7e1f
Add todo in slider tail to avoid confusion
2019-10-08 17:56:56 +09:00
iiSaLMaN
023c4d64d8
Remove redundant using directive
2019-10-03 06:00:22 +03:00
iiSaLMaN
957bbee3e4
Scale pieces individually and use skin source directly
2019-10-03 05:58:20 +03:00
smoogipoo
c5540048ab
Fix tail circle not moving with slider position changes
2019-10-01 19:39:06 +09:00
iiSaLMaN
ef8f9aa276
Fix possible nullref exception
2019-10-01 08:43:03 +03:00
iiSaLMaN
9e314cd664
Add expand number piece bindable to hit circle
2019-10-01 08:15:48 +03:00
smoogipoo
45f2bcc440
Fix combo bindings not being bound to nested hitobjects
2019-09-26 17:39:19 +09:00
smoogipoo
3155a90501
Use bindables for displayed circle piece numbers
2019-09-26 16:58:20 +09:00
smoogipoo
bbf0544a8d
Add bindables for IHasComboInformation properties
2019-09-26 16:55:08 +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
iiSaLMaN
33f4a6897c
Assign to the text property directly
2019-09-07 18:01:15 +03:00
iiSaLMaN
6b7cb46dda
Add null hit windows
2019-09-07 17:27:02 +03:00
iiSaLMaN
87d10c6a32
Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score
2019-09-07 14:50:23 +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
f8c1afa539
Fix two more cases of judgements appearing on hit error display when they shouldn't
2019-09-03 20:17:39 +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
smoogipoo
f3656475de
Return null hitwindows for non-time-based objects
2019-09-02 16:10:30 +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
Salman Ahmed
f4f15cc803
Merge branch 'master' into add-spinner-bonus-score
2019-08-22 09:48:09 +03: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
iiSaLMaN
e4179fe440
Show bonus text if contains bonus points (1,000)
2019-08-20 21:51:32 +03:00
iiSaLMaN
07795c9922
Add logic to gain bonus score from spinner ticks
2019-08-20 21:50:49 +03:00
iiSaLMaN
bb4178fa03
Add drawable spinner ticks implementation
2019-08-20 21:17:27 +03: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
59a5df8bca
Update framework (with cached changes) ( #5666 )
...
Update framework (with cached changes)
2019-08-09 23:47:40 +09:00
Dean Herbert
6264a6a1c9
Adjust slider snaking and hitcircle fading to match stable
2019-08-09 20:18:02 +09:00
Dean Herbert
90b1fe81f3
Update cached usage in line with framework changes
2019-08-09 19:12:29 +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
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
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
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns
2019-03-13 18:17:42 +09:00
David Zhao
527b77b07d
Make all inheritors of drawablejudgement use new method
2019-03-12 19:52:44 +09:00
Dean Herbert
63fea65c0c
Clarify repeat index
2019-03-11 14:53:21 +09:00
Dean Herbert
489153579a
Add xmldoc and clarify struct variables
2019-03-11 14:36:29 +09:00
Dean Herbert
93a999396e
LegacyFinalTick -> LegacyLastTick to match existing variable
2019-03-08 20:13:11 +09:00
Dean Herbert
165a353a83
Add extensive commenting about LegacyLastTick usage
2019-03-08 20:12:48 +09:00
Dean Herbert
355705f0a5
Fix legacy tick handling
2019-03-08 19:57:30 +09:00
Dean Herbert
973f29b765
Apply review
2019-03-08 15:14:57 +09:00
Dean Herbert
551380dd42
Extract slider tick creation so it can be shared with osu!catch
2019-03-08 14:46:26 +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
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
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +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
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
Dan Balasescu
c9c8cccd68
Merge branch 'master' into use-lifetime-optimization
2019-02-18 15:22:34 +09:00
Dean Herbert
810175235d
Fix incorrect application of scaling in some cases
...
Isolates different usages of hitcircle scale so they can't ever cause regressions.
2019-02-14 18:47:05 +09:00
Dean Herbert
5b1f111922
Rollback other fallthrough regressions
2019-02-05 18:14:43 +09:00
Dean Herbert
2f8f4fac64
Fix combo colour fallbacks when skin is not providing any
2019-02-05 17:54:14 +09:00
ekrctb
504e79b968
Merge branch 'master' into use-lifetime-optimization
2019-01-29 12:15:02 +09:00
Unknown
77763fde8b
revert accidentally renamed variables
2019-01-25 11:22:05 +01:00
Unknown
8ddff673b7
revert previous rename and rename ruleset specific classes instead
2019-01-25 11:14:37 +01:00
Unknown
5446c99f22
Merge branch 'master' into move-osu-settings
2019-01-25 10:57:04 +01:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Unknown
cf147083cd
move osu! settings into its ruleset
2019-01-23 13:17:29 +01:00
Unknown
4a9bcf4937
rename OsuConfigManager to GameConfigManager
...
also OsuSetting to GameSetting
2019-01-23 13:17:29 +01:00
smoogipoo
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
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
Dean Herbert
881b10a18f
Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini
2019-01-08 11:01:04 +09:00
Dean Herbert
7eed3ffe75
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-08 10:02:06 +09:00
Dean Herbert
4cee21f356
Make skinning better
2019-01-07 20:12:39 +09:00
Dean Herbert
13b077c83b
Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini
2019-01-07 18:11:17 +09:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
smoogipoo
3fa5a33fb1
Inline const
2019-01-03 18:58:07 +09:00
smoogipoo
273b14b19c
Add a maximum length for slider ticks to be generated
2019-01-03 18:51:47 +09:00
smoogipoo
c56d8b75c1
Cache slider's endposition
2019-01-03 17:43:10 +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
Dragicafit
ec3c87dbea
Make Slider's CustumColors skinnable
2018-12-07 22:24:24 +01:00
Dean Herbert
1a974f64de
Initial design for user registration dialog
2018-12-05 12:57:26 +09:00
smoogipoo
aea84f737b
Fix taiko hitobjects potentially disappearing before being judged
2018-11-29 12:12:29 +09:00
smoogipoo
52bc47499f
Fix spinners not having proper lifetimes
2018-11-29 12:11:45 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
050af88be9
Fix post-merge issues
2018-11-14 14:29:22 +09:00
smoogipoo
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
smoogipoo
3aba462e52
Make Path.Distance a property again
2018-11-12 14:07:48 +09:00
smoogipoo
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
smoogipoo
cc8531790a
Use bindables for hitobject events
2018-11-09 13:58:46 +09:00
smoogipoo
c6350c6efd
Remove IHasEditablePosition
2018-11-08 13:03:11 +09:00
smoogipoo
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
Dean Herbert
63cbc8e0e8
Merge branch 'master' into slider-placement
2018-11-02 19:45:34 +09:00
Dean Herbert
7f1ee3bcb4
Disallow spinner movement for now
2018-11-02 12:06:53 +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
b0f5ace0e8
Implement slider control point visualisation
2018-10-29 15:29:34 +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
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
smoogipoo
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
smoogipoo
ea6db8b793
Make the hitobject masks move within their placement/selection
2018-10-25 18:16:25 +09:00
Dean Herbert
cd718812b2
Merge branch 'master' into tighten-diffcalc-tolerances
2018-10-18 14:01:47 +09:00
smoogipoo
e8ce5a7e6c
Fix crashes when manually creating sliders
2018-10-16 18:27:09 +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
smoogipoo
47be95ce0b
Fix slider nodes using the wrong samples
2018-10-16 17:10:24 +09:00
smoogipoo
5095fbcdf7
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
2018-10-16 10:27:18 +09:00
smoogipoo
657bd5e371
Add some xmldocs
2018-10-15 12:32:59 +09:00
smoogipoo
2f943e77aa
Make Velocity and TickDistance private set
2018-10-15 12:31:52 +09:00
smoogipoo
26b91c96fb
Fix wrong number of ticks on some legacy beatmaps
2018-10-15 12:27:58 +09:00
smoogipoo
83fd251c7b
Pass sub-controlpoints as span slices
2018-10-11 17:44:25 +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
eb6f1ae72c
Fix spinners providing one extra combo
2018-08-17 09:16:28 +09:00
smoogipoo
31f324945e
Implement combo offsets
2018-08-15 11:47:31 +09:00
smoogipoo
3a7488767c
Make HitObject not store the judgement
2018-08-06 11:50:18 +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
Dan Balasescu
0a7a2c83a8
Merge branch 'master' into fix-follow-circle-size
2018-07-31 15:41:15 +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
21f3ff6e77
Fix slider repeat points appearing far too late
2018-07-30 18:51:25 +09: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
tgi74000
52d9461f03
Add support for reversearrow skinning
2018-07-29 20:51:06 +02:00
tgi74000
2a9818a128
Add support for sliderscorepoint skinning
2018-07-29 20:42:05 +02:00
smoogipoo
ff2a3a6e92
Fix hitobjects not properly expiring if scrolling in the editor
2018-07-26 20:07:16 +09:00
Dean Herbert
10656be954
Add interpolation to repeat point during sliding
2018-07-23 16:55:38 +02:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
79af5cb0a0
Limit shake duration to ensure it doesn't overlap miss window
2018-07-06 17:24:30 +09:00
Dean Herbert
e041352690
Add comment regarding add/clear/remove overrides
2018-07-06 13:19:43 +09:00
Dean Herbert
48d90a67ae
xmldoc and formatting
2018-07-06 12:13:23 +09:00
Dean Herbert
aa96d91762
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
2018-07-06 11:57:32 +09:00
Dean Herbert
d453414070
Forward shakes from slider head objects to sliders
2018-07-06 11:52:58 +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
smoogipoo
45a4187923
Tidy up lookups to NestedHitObjects
2018-07-02 16:10:56 +09:00
Dan Balasescu
f35ea18755
Merge branch 'master' into hit-shake
2018-06-29 17:38:02 +09:00
tgi74000
3d50050089
Move shake duration to a constant
2018-06-29 10:36:00 +02:00
Dan Balasescu
e3317b5145
Make method protected
2018-06-29 17:31:13 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring
2018-06-29 17:16:14 +09:00
Dean Herbert
cacabeb67e
Remove unused field
2018-06-29 17:00:41 +09:00
Dean Herbert
9d4bc7b630
Fix combo index being wrong
2018-06-29 01:34:47 +09:00
Dean Herbert
0a945e4709
Check whether initialised first
2018-06-28 22:44:40 +09:00
tgi74000
59e03fa528
Move Shake to DrawableOsuHitObject, Clean up Shake()
2018-06-28 15:33:59 +02:00
tgi74000
61c416dc16
Trigger Shake if HitCircles are hit too early
2018-06-28 13:41:23 +02:00
Dean Herbert
e197ebe4c5
Fix slider heads displaying in incorrect colour
2018-06-28 01:55:09 +09:00
smoogipoo
0366b0f081
The tail circle will always be the last hitobject
2018-06-27 12:09:40 +09:00
smoogipoo
80501de4b9
Add legacy slider offsets
2018-06-27 12:09:21 +09:00
Dan Balasescu
0b1b3319aa
Merge branch 'master' into update-framework
2018-06-19 20:57:19 +09:00
Dean Herbert
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
Tom Arrow
4aa89de2d7
Fix reverse arrow displayed with incorrect angle
2018-06-18 17:22:01 +02:00
smoogipoo
f67d263596
Move ruleset-specific hitwindows to post-converted hitobjects
2018-05-17 13:35:15 +09:00
smoogipoo
0dce7a5b61
Update framework + fix CI errors
2018-04-20 18:19:17 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
d9c5a0c6d1
Fix position editing not working
2018-03-29 22:38:44 +09:00
smoogipoo
6d4f94756e
Rewrite the way drag + click selections happen
...
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).
I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.
1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
Dean Herbert
af65f2dd48
Move AccentColour changes local to rulesets which rely on it
2018-03-22 18:53:16 +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
78a8f60b39
IHasComboIndex -> IHasComboInformation
2018-03-22 12:35:17 +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
a42035f494
Make DrawableHitObject a CompositeDrawable
...
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Dean Herbert
a0691168cb
Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
2018-03-14 15:35:24 +09:00
smoogipoo
212142429f
Derive from IHasPosition
2018-03-12 17:25:34 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning
2018-03-12 11:55:50 +09:00
Dean Herbert
d27cf16bf9
Merge remote-tracking branch 'ppy/master' into more-skinning
2018-03-12 10:46:37 +09:00
Dan Balasescu
8ba87dfdbd
Merge branch 'master' into fix-duplicate-judgements
2018-03-12 10:29:50 +09:00
smoogipoo
92b302971f
Trim whitespace
2018-03-10 01:23:53 +09:00
smoogipoo
24501c37dd
Merge branch 'drawableslider-cleanup' into editor-hitobject-movement
2018-03-10 01:15:24 +09:00
smoogipoo
8ed5fce43a
Split out the slider head into a separate drawable hitobject
2018-03-10 01:13:59 +09:00
smoogipoo
376f6eec58
SetPosition -> OffsetPosition
2018-03-10 00:02:13 +09:00
smoogipoo
4a48136e4f
Make hitobject positions adjustable
2018-03-09 23:12:34 +09:00
Dean Herbert
b62ed004f2
Remove judgements when deciding a new judgement for a HitObject
...
Generally happens when rewinding.
2018-03-07 19:14:42 +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
05eb678654
Add skin support for judgements
2018-03-07 18:21:05 +09:00
Dean Herbert
4dfd3a61cc
Remove alpha setting
2018-03-06 18:40:39 +09:00
Dean Herbert
7cf1d4450a
SliderTick transform improvements
2018-03-06 18:28:36 +09:00
Dean Herbert
ea6e3938c0
Fix hard crash due to spinner spin requirement being zero
...
Resolves #2133 .
2018-03-04 03:01:47 +09:00
Dean Herbert
0704d823a9
Fix slider selection point not being set to new origin
2018-03-01 22:03:00 +09:00
smoogipoo
d5d4bcb558
Merge branch 'master' into editor-hitobject-overlays
2018-03-01 14:04:38 +09:00
Dean Herbert
5b4fef0180
Add bare minimum sanity checking of beatmap input values to make broken maps load
...
Resolves ppy/osu#1988 .
2018-02-28 18:12:24 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays
2018-02-26 17:53:50 +09:00
Dean Herbert
1218a75b7f
Improve vector conditional
2018-02-26 16:11:26 +09:00
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework
2018-02-26 15:00:18 +09:00
Dean Herbert
f1ddfa0581
Fix sliders never getting a correct lifetime set
2018-02-25 16:25:56 +09:00
smoogipoo
50d1183ec2
Division-by-zero safety + reference our own size
2018-02-24 02:53:02 +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
smoogipoo
604b0fa20a
Fix post-merge issues
2018-02-22 14:11:06 +09:00
smoogipoo
ded2644df8
Merge branch 'master' into editor-hitobject-overlays
2018-02-22 14:08:36 +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
f903e6d241
Fix stacking not working with sliders
...
Fixes #2093 .
2018-02-21 17:46:45 +09:00
smoogipoo
f877b642da
Clean up and document better what "progress" means
2018-02-21 17:10:18 +09:00
smoogipoo
7fe0989427
Merge branch 'general-slider-improvements' into editor-hitobject-overlays
2018-02-20 23:51:47 +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
ad2f556133
Add hitobject overlays to selected hitobjects
2018-02-20 18:01:45 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement
2018-02-13 18:56:16 +09:00
smoogipoo
87baa6febd
Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments
2018-02-12 19:08:13 +09:00
smoogipoo
cfb2b3f1e8
Rework SelctionLayer to support click-selections
2018-02-12 16:02:42 +09:00
Aergwyn
c3ce015869
fade slider ticks with hidden mod
2018-02-11 11:03:01 +01:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows
2018-02-08 17:46:29 +09:00
smoogipoo
c213e58eff
Make slider tails not play hitsounds
2018-02-08 14:40:35 +09:00
smoogipoo
46284c61ae
Return HitResult.None instead of null
2018-02-08 14:25:59 +09:00
smoogipoo
beaecbafbd
Merge branch 'master' into unified-hitwindows
2018-02-08 13:22:44 +09:00
Dean Herbert
3d0ef8b3bd
Move property back to local variable
...
Never used elsewhere
2018-02-06 18:14:08 +09:00
Dean Herbert
27fd42fb17
Adjust appear animations of repeats and ticks
2018-02-06 18:10:15 +09:00
Dean Herbert
e417aaa23f
Adjust scale out effect
2018-02-06 17:46:56 +09:00
Dean Herbert
60fb78e49d
Simplify iteration code
2018-02-06 17:46:45 +09:00
ColdVolcano
bf26fc94d8
Merge branch 'master' into repeat-points
2018-02-03 23:56:40 -06:00
smoogipoo
b15f184261
Make osu! use HitWindows
2018-02-02 20:33:59 +09:00
Dan Balasescu
cf665b717f
Merge branch 'master' into starrating-fix
2018-02-01 18:44:04 +09:00
Dan Balasescu
39e626f29e
Merge branch 'master' into fix-ticks-appearing-late
2018-02-01 18:28:42 +09:00
Dean Herbert
b8f6dcffaf
Merge remote-tracking branch 'upstream/master' into repeat-points
2018-02-01 13:32:53 +09:00
ColdVolcano
06b615c474
Merge branch 'master' into repeat-points
2018-01-31 21:30:28 -06:00
smoogipoo
cd4a0612c0
Properly construct slider ends using HitObject.AddNested
2018-01-30 16:53:19 +09:00
smoogipoo
27357e100a
Simplify condition
2018-01-30 16:28:38 +09:00
smoogipoo
702c4efb88
Give Slider a tail hitobject to make slider ends counts towards score
2018-01-30 16:28:14 +09:00
smoogipoo
b293408147
Construct the head of sliders from Slider
2018-01-30 15:50:48 +09:00
Aergwyn
373b3871f9
update SliderTick calculation + more ticks in tests
...
math is hard >_<
2018-01-29 12:03:44 +01:00
Thomas Tan
33c5fdcedb
AppVeyor fix
2018-01-29 16:30:46 +08:00
Thomas Tan
c36859ea3a
Create Slider.StackedPositionAt method
2018-01-29 16:22:14 +08:00
Aergwyn
214938b98d
fix SliderTicks appearing too late
2018-01-25 10:52:03 +01:00
ColdVolcano
1f51149da8
Add xmldoc
2018-01-24 15:41:51 -06:00
ColdVolcano
cee8bb50c9
Fix reference points being wrongly selected
2018-01-24 15:34:52 -06:00
Aergwyn
52c4d22c41
review changes
...
- use doubles instead of floats
- simplify logic
2018-01-24 09:44:50 +01:00
Aergwyn
4baadfdd16
fix oversight
2018-01-23 16:44:33 +01:00
ColdVolcano
efae00c149
make repeat points look better
2018-01-23 04:31:37 -06:00
Aergwyn
24b7d91f5b
Merge branch 'master' into fix-repeats-appearing-early
2018-01-23 09:04:45 +01:00
smoogipoo
33c52ba30f
Fix off-by-ones in RepeatPoint code
2018-01-23 13:58:43 +09:00
smoogipoo
d37844c068
Clean up off-by-one offsets from repeat-related properties
2018-01-23 13:37:25 +09:00
Aergwyn
b726f90c37
remove unnecessary variable
2018-01-22 12:44:55 +01:00
Aergwyn
66176f2882
fix RepeatPoint animations
...
- FadeIn and -Out for RepeatPoints are now calculated instead of fixed values
- TimePreempt is now cut down if too long for RepeatPoints following the first one to only show up to two RepeatPoints at any given time
2018-01-22 12:36:38 +01:00
Shawdooow
29466438a3
fix values
2018-01-19 20:58:43 -05:00
Shawdooow
c29eea870d
correct values
2018-01-19 20:56:41 -05:00
Shawdooow
e109d5fe20
fix slider heads
2018-01-19 11:13:49 -05:00
Shawdooow
4d1142a0ce
overall difficulty
2018-01-19 11:11:28 -05:00
smoogipoo
6908597b95
Fix inverted ternary
...
See #1935 - repeat index 1 is at the end of the slider, not the start.
2018-01-18 23:44:00 +09:00
Dan Balasescu
46ba2cda10
Remove unused using
2018-01-18 21:19:06 +09:00
Dean Herbert
1a83770a06
Fix incorrect math
2018-01-18 21:16:15 +09:00
Dean Herbert
065d2a4887
Add licence header
2018-01-18 21:12:53 +09:00
Dean Herbert
01ff1584c2
Fix repeat points not following slider snaking correctly
2018-01-18 21:06:47 +09:00
Dean Herbert
e2965e1682
Remove unused using
2018-01-18 20:46:57 +09:00
Dean Herbert
063767e381
Prioritise hit normal
...
It's always first but not strictly guaranteed anywhere yet.
2018-01-18 20:37:46 +09:00
Dean Herbert
97884e1d05
Remove unnecessary null checks
2018-01-18 19:57:49 +09:00
Dean Herbert
b4f2bea37b
Fix slider samples playing twice when additions are present
2018-01-18 19:50:26 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
Dean Herbert
e5056e11f4
Remove extra newline
2018-01-12 18:07:40 +09:00
Dean Herbert
d0881e443b
Merge remote-tracking branch 'upstream/master' into approach-rate
2018-01-12 18:05:16 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements
2018-01-09 22:06: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
0cc8516aa3
Remove empty cases, add initial ball scale adjust.
2018-01-04 20:53:33 +09:00
Dean Herbert
717b263b77
Comment and better stacking of FadeOuts
2018-01-04 20:47:42 +09:00
Dean Herbert
1f62fe19d5
Make animation a bit more subtle
2018-01-04 20:43:42 +09:00
Dean Herbert
ffc7f7ecf4
Add a better slider "hit" state fade out animation
2018-01-04 20:16:10 +09:00
Dean Herbert
bde957940d
Disallow SliderBall from contracting after EndTime
2018-01-04 20:09:58 +09:00
Shawdooow
94f81a1784
fix
2018-01-03 10:04:36 -05:00
Shawdooow
9122eaa28e
Merge branch 'master' into approach-rate
2018-01-03 10:02:55 -05:00
