Dan Balasescu
66e89f56d9
Merge pull request #10280 from peppy/editor-fix-spinner-extending
...
Fix extending spinners in editor causing them to disappear temporarily
2020-09-28 19:41:44 +09:00
Max Hübner
54852991f3
Move SpinnerNoBlink to OsuSkinConfiguration
2020-09-28 12:24:30 +02:00
Max Hübner
40a4654ef9
Invert spinnerNoBlink to spinnerBlink locally
2020-09-28 12:21:43 +02:00
smoogipoo
b6bc829bd5
Guard against nulls (load not run)
2020-09-28 17:46:22 +09:00
Dean Herbert
fd58a24183
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-28 17:45:48 +09:00
Dan Balasescu
1b6ef60f36
Merge branch 'master' into editor-fix-slider-drag-after-snaking
2020-09-28 17:45:04 +09:00
Dean Herbert
e60e47ff66
Unbind events on disposal
2020-09-28 17:41:10 +09:00
Dean Herbert
63b5b8b841
Fix sliders not dragging correctly after snaking has begun
...
Closes #10278 .
2020-09-28 17:33:00 +09:00
Dean Herbert
8692c24dfc
Fix extending spinners in editor causing them to disappear temporarily
2020-09-28 17:20:36 +09:00
Dean Herbert
5237fa7bf2
Remove unused local in case statement
2020-09-28 16:37:54 +09:00
Dean Herbert
467a16bf75
Fix fade out extension logic (and make it generally look better for sliders)
2020-09-28 16:21:20 +09:00
Dean Herbert
6095446f10
Fix autoplay generators failing on empty hitobjects lists
2020-09-28 15:38:54 +09:00
Max Hübner
33d000e532
Add support for SpinnerNoBlink in legacy spinner
2020-09-26 16:25:57 +02:00
Dean Herbert
b2261f03e2
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-25 20:21:35 +09:00
Dean Herbert
346d14d40b
Rename variables to match
2020-09-25 17:45:19 +09:00
Dean Herbert
22511c36c3
Ensure toggles are not instantiated more than once for safety
2020-09-25 17:43:09 +09:00
Dean Herbert
ae68dcd962
Add ternary toggle buttons to editor toolbox selection
2020-09-25 16:38:12 +09:00
Dean Herbert
0f8551e9ea
Merge branch 'editor-ternary-states' into new-combo-toggle
2020-09-25 15:36:33 +09:00
Dean Herbert
bca774a0d4
Allow BlueprintContainer to specify toggles
2020-09-25 14:09:31 +09:00
Dean Herbert
7df8b5bce7
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-25 13:17:03 +09:00
Dean Herbert
d9e8ac6842
Add support for slider end snapping
2020-09-24 16:24:35 +09:00
Dean Herbert
44be0ab762
Add basic osu! object to object snapping
2020-09-24 16:24:35 +09:00
Dean Herbert
ba160aab76
Fix large construction/disposal overhead on beatmaps with hitobjects at same point in time
2020-09-23 15:41:43 +09:00
Dan Balasescu
625c146460
Merge pull request #10199 from peppy/fix-editor-binding-crash
...
Fix bindings not correctly being cleaned up in OsuHitObjectComposer
2020-09-23 12:38:18 +09:00
Dan Balasescu
53788968c8
Merge pull request #10205 from peppy/fix-composer-distance-snap-selection
...
Fix compose mode not showing distance snap grid when entering with a selection
2020-09-23 11:55:42 +09:00
Dean Herbert
b1f7cfbd5b
Reduce children levels in RingPiece
2020-09-22 17:34:21 +09:00
Dean Herbert
8e43266460
Fix compose mode not showing distance snap grid when entering with a selection
2020-09-22 16:02:07 +09:00
Dean Herbert
25bf160d94
Fix missing GameplayClock in some tests
2020-09-21 22:30:14 +09:00
Dean Herbert
3f788da06d
Fix SPM changing incorrectly with playback rate changes
2020-09-21 19:39:54 +09:00
Dean Herbert
842f8bea55
Fix bindings not correctly being cleaned up in OsuHitObjectComposer
2020-09-21 18:15:33 +09:00
Dean Herbert
1e09d8fd1a
Merge branch 'master' into catch-combo-counter
2020-09-21 17:53:00 +09:00
Dean Herbert
141fbbf5bb
Merge pull request #10180 from smoogipoo/beatmap-conversion-cancellation
...
Make beatmap conversion support cancellation tokens
2020-09-17 22:30:46 +09:00
smoogipoo
c7d24203ce
Make beatmap conversion support cancellation tokens
2020-09-17 17:40:05 +09:00
smoogipoo
009e1b4445
Make Spinner use cancellation token
2020-09-17 17:05:24 +09:00
Dan Balasescu
0761aab42f
Merge branch 'master' into catch-combo-counter
2020-09-15 17:20:31 +09:00
Dean Herbert
a8b405791a
Fix non-convert slider and spinner serialization
2020-09-14 17:32:32 +09:00
Dean Herbert
23b51e8f7f
Merge pull request #10106 from smoogipoo/score-recalc
2020-09-10 19:05:42 +09:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc
2020-09-10 18:30:41 +09:00
Dean Herbert
df1537f2a0
Update framework
2020-09-10 18:10:39 +09:00
Dan Balasescu
6f6adb61d7
Merge pull request #10099 from peppy/add-editor-tool-icons
...
Add icons for editor toolbox tools
2020-09-09 22:22:58 +09:00
Dean Herbert
fb2aced3ac
Add toggle for distance snap
2020-09-09 19:15:35 +09:00
Dean Herbert
c9f5005efd
Add icons for editor toolbox tools
2020-09-09 18:40:01 +09:00
smoogipoo
117c7ec6b2
Merge branch 'master' into score-recalc
2020-09-09 14:38:36 +09:00
Dean Herbert
4680728b9c
Merge branch 'master' into update-dcc-exclusions
2020-09-07 18:01:44 +09:00
Dan Balasescu
025ead195c
Merge branch 'master' into fix-sliderborder-more-thicker
2020-09-07 15:40:34 +09:00
smoogipoo
1143d5d992
Update class exclusion for dynamic compilation
2020-09-04 20:41:08 +09:00
Salman Ahmed
569a56eccb
Revert "Move adjustment to LegacySkinConfiguration as a default value"
...
This reverts commit 18927304f1
2020-09-04 13:33:23 +03:00
Dean Herbert
25e142965d
Strongly type and expose default beatmap information icon implementations for other rulesets
2020-09-04 15:01:32 +09:00
Salman Ahmed
18927304f1
Move adjustment to LegacySkinConfiguration as a default value
2020-09-03 16:29:38 +03:00
Dean Herbert
72cb65c22f
Update and add missing beatmap statistic icons to info wedge
2020-09-03 17:52:22 +09:00
Salman Ahmed
5180d71fd9
Attach an inline comment explaining how the value was reached
2020-09-03 06:09:52 +03:00
Salman Ahmed
e7eaaf8b02
Bring legacy slider border width closer to osu!stable
2020-09-03 04:46:26 +03:00
Salman Ahmed
99a68e880a
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-09-01 20:46:38 +03:00
Salman Ahmed
a0a4501008
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-09-01 20:17:25 +03:00
Dean Herbert
3d0121ceb1
Merge pull request #10022 from PajLe/auto-on-low-duration-spinners
2020-09-01 12:19:44 +09:00
Bartłomiej Dach
69ec2a76ef
Replace reaction time check with spins required check
2020-08-31 17:20:45 +02:00
PajLe
0655fc1473
changed comparing Duration to autoplay's reactionTime instead of 0
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-08-31 16:50:31 +02:00
Pavle Aleksov
fde4b03dab
added spinner duration check - skip HitObjectReplay if duration is 0
2020-08-31 16:21:00 +02:00
smoogipoo
acbeb5406f
Add/improve xmldoc
2020-08-31 13:33:41 +09:00
Bartłomiej Dach
3ab32a5d35
Change structure of old style spinner to be closer to stable
2020-08-29 23:29:29 +02:00
Dean Herbert
cd0a73883d
Merge pull request #9945 from smoogipoo/skin-colour-fix-2
...
Exactly reproduce osu!stable skin colour alphas
2020-08-29 20:06:26 +09:00
smoogipoo
1c1afa1c96
Move MaxCombo to base DifficultyAttributes
2020-08-28 19:16:20 +09:00
Bartłomiej Dach
43d6d2b2e8
Add back unstable rate display
2020-08-27 20:46:49 +02:00
Bartłomiej Dach
f152e1b924
Revert IStatisticRow changes
2020-08-27 20:13:44 +02:00
Bartłomiej Dach
05e725d59f
Add unstable rate statistic to rulesets in which it makes sense
2020-08-26 22:06:29 +02:00
Bartłomiej Dach
bbb3d7522e
Scope up return type to IStatisticRow
2020-08-26 19:24:12 +02:00
smoogipoo
ab8d9be095
Move out into a separate method
2020-08-25 15:16:41 +09:00
Salman Ahmed
cf6b34db1e
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-08-22 13:07:28 +03:00
smoogipoo
08078b9513
Rename method to remove "InitialColour" namings
2020-08-22 00:56:29 +09:00
smoogipoo
16a2ab9dea
Update osu with legacy colour setters
2020-08-22 00:20:33 +09:00
Salman Ahmed
deb5cc752b
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-08-19 08:39:58 +03:00
Salman Ahmed
422100192c
Move HasFont to legacy skin extensions class instead
2020-08-19 07:58:23 +03:00
smoogipoo
da07354f05
Fix some judgements potentially giving wrong score
2020-08-18 19:51:16 +09:00
Bartłomiej Dach
5f35b3ebb9
Fix constant casing
2020-08-15 20:44:02 +02:00
Ron B
390e872730
Fix acoording to review
2020-08-15 21:34:17 +03:00
Ron B
a1079bac32
Move frequency values into consts
2020-08-15 21:19:47 +03:00
Ron B
40445d0005
replicate osu-stable behaviour for spinningSample frequency
2020-08-15 21:07:44 +03:00
Ron B
07c25d5a78
Move spinnerFrequencyModulate set to ApplySkin
2020-08-15 20:51:33 +03:00
Ron B
61de3c7540
Replace accidental tab with spaces
2020-08-15 20:18:56 +03:00
Ron B
896a87e629
Replace accidental tab with spaces
2020-08-15 20:14:36 +03:00
Ron B
5c11270b98
Add SpinnerFrequencyModulate skin config option
2020-08-15 20:12:06 +03:00
Dan Balasescu
b7ae70ff96
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-14 19:01:32 +09:00
Dean Herbert
662281d727
Adjust legacy spinners to fade in later
...
Matches stable 1:1 for legacy skins. I've left lazer default as it is
because changing to use the shorter apperance looks bad. This will
probably change as we proceed with the redesign of the default skin.
2020-08-13 18:20:46 +09:00
Dean Herbert
05b06e7451
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-12 22:01:04 +09:00
Bartłomiej Dach
4f3f95540b
Check for zero rate to prevent crashes on unpause
2020-08-11 22:34:46 +02:00
Bartłomiej Dach
bcaaf25278
Fix Spun Out mod being affected by rate-changing mods
2020-08-11 22:04:18 +02:00
Bartłomiej Dach
cca78235d5
Replace CumulativeRotation with RateAdjustedRotation
2020-08-10 23:02:06 +02:00
Dean Herbert
365aae799e
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-10 23:55:51 +09:00
Bartłomiej Dach
a636c7052c
Merge branch 'master' into adujustable-skinnablesound
2020-08-08 21:51:47 +02:00
Dean Herbert
0d1f273603
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-08 23:24:03 +09:00
Dan Balasescu
d8ffc00f75
Merge pull request #6345 from frenzibyte/expand-number-piece-on-old-skins
...
Expand number piece for legacy old skins
2020-08-07 17:18:36 +09:00
smoogipoo
3c3756e42d
Merge branch 'master' into expand-number-piece-on-old-skins
2020-08-07 16:36:58 +09:00
smoogipoo
bce3f3952f
Split out variable declaration
2020-08-07 16:36:40 +09:00
Dan Balasescu
3c8fe12ccf
Merge branch 'master' into playfield-shift
2020-08-07 16:27:03 +09:00
Dean Herbert
e3105fd4c8
Add more resilient logic for whether to avoid playing SkinnableSound on no volume
2020-08-06 19:16:26 +09:00
smoogipoo
9a00ad48c6
Update components to use extension methods
2020-08-06 14:43:39 +09:00
Salman Ahmed
9465e7abe1
Rename sprites container to "circleSprites"
2020-08-05 23:45:00 +03:00
Salman Ahmed
43161697f8
Fix wrong english
2020-08-05 23:42:05 +03:00
Sebastian Krajewski
2c73fc0e1b
Merge branch 'master' into playfield-shift
2020-08-05 22:34:43 +02:00
Salman Ahmed
1ab6110c05
Apply fade out to the number piece with quarter the pieces duration
2020-08-05 20:07:26 +03:00
Salman Ahmed
84f6b7608c
Remove misleading ExpandNumberPiece lookup
2020-08-05 20:05:53 +03:00
Dean Herbert
bb73489ae5
Fix very short spinners being impossible to complete
2020-08-05 18:46:58 +09:00
smoogipoo
24bc9b33b1
Always place spinners behind hitcircles/sliders
2020-08-05 15:40:45 +09:00
Salman Ahmed
2771c95bec
Merge remote-tracking branch 'upstream/master' into expand-number-piece-on-old-skins
2020-08-04 22:17:54 +03:00
Sebastian Krajewski
9fb7b8f3d8
Rename the property to "AlignWithStoryboard"
2020-08-04 15:43:33 +02:00
Salman Ahmed
29053048ff
Add support to use legacy combo fonts for the counter on legacy skins
2020-08-03 21:40:20 +03:00
Sebastian Krajewski
675f618b28
Apply playfield's offset only in play mode
2020-08-03 14:18:45 +02:00
Sebastian Krajewski
c48648ea2a
Add playfield shift like in osu-stable
2020-08-03 13:00:36 +02:00
smoogipoo
cd9896c35e
Merge branch 'master' into spinner-spinning
2020-08-01 01:06:53 +09:00
Dean Herbert
180afff805
Ensure damp is always positive exponent
2020-08-01 00:39:04 +09:00
Dean Herbert
bb01ee5be9
Fix trackign alpha not being applied
2020-08-01 00:27:00 +09:00
Dean Herbert
9e244be489
Use better conditional for choosing which spinner type to use
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-08-01 00:05:04 +09:00
Dean Herbert
186b452331
Apply common multiplication refactor
2020-07-31 14:48:56 +09:00
Dean Herbert
86784e30ad
Fix spacing
2020-07-31 09:54:30 +09:00
Dean Herbert
cd570433f4
Move private methods to bottom of class
2020-07-31 09:04:20 +09:00
Dean Herbert
8e49256a5c
Rename and split up statement to make more legible
2020-07-31 09:03:29 +09:00
Dean Herbert
38a4bdf068
Add spinner spin sample support
2020-07-30 19:34:59 +09:00
Dean Herbert
ec0d7760af
Move todo?
2020-07-30 13:07:11 +09:00
Dean Herbert
41c0f7557a
Remove traceable spinner reference for now
2020-07-30 12:56:30 +09:00
Dean Herbert
c1085d49d3
Add more xmldoc
2020-07-30 12:55:34 +09:00
Dean Herbert
19fb350cd8
Move offset and scale to constant
2020-07-30 12:51:05 +09:00
Dean Herbert
743d165319
Add old style spin metre
2020-07-30 12:32:19 +09:00
Dean Herbert
d2b3fe1e7b
Add scale to old legacy spinner
2020-07-30 12:08:04 +09:00
Dean Herbert
4d822742e8
Add scale and tint to new legacy style spinner
2020-07-30 12:05:19 +09:00
Dean Herbert
54fee7e716
Simplify and standardise scale for default display
2020-07-30 11:50:13 +09:00
Dean Herbert
64c7ae7686
Fix hit transforms not playing out correctly
2020-07-30 11:25:49 +09:00
Dean Herbert
ca21f038e0
Add xmldoc for legacy classes
2020-07-30 10:35:48 +09:00
Dean Herbert
2b71ffa2ed
Add back legacy implementations
2020-07-29 22:32:21 +09:00
Dean Herbert
023feaf438
Refactor to centralise implementation into a single component
...
Turns out this is a better way forward.
2020-07-29 22:31:52 +09:00
Dean Herbert
2a5e9fed4d
Move default background implementation out of DrawableSpinner
2020-07-29 18:15:19 +09:00
Dean Herbert
2cd6e89cb0
Move default centre implementation out of DrawableSpinner
2020-07-29 18:02:12 +09:00
Dean Herbert
1c00cf95d5
Add initial support for spinner middle skinning
2020-07-29 16:55:47 +09:00
Dean Herbert
e98154b432
Add initial support for spinner background layer
2020-07-29 16:37:32 +09:00
Dean Herbert
d01d1ce3f1
Add initial support for spinner disc skinning
2020-07-29 16:25:10 +09:00
Dean Herbert
f97656351d
Merge branch 'master' into scaleMod
2020-07-28 18:55:07 +09:00
Dan Balasescu
bf6cf2144a
Merge pull request #9699 from peppy/fix-autopilow-wind-up
...
Fix Autopilot mod incompatibility with WindUp/WindDown
2020-07-28 18:49:52 +09:00
Dean Herbert
3cb1cc0555
Merge branch 'master' into scaleMod
2020-07-28 15:05:35 +09:00
Dean Herbert
afceab685b
Merge pull request #9688 from peppy/less-spinner-bonus-score
...
Reduce spinner tick and bonus score
2020-07-28 14:21:48 +09:00
Dean Herbert
72c8f0737e
Fix Autopilot mod incompatibility with WindUp/WindDown
2020-07-28 14:18:21 +09:00
Dan Balasescu
89f2d7d38a
Merge branch 'master' into less-spinner-bonus-score
2020-07-28 13:32:55 +09:00
Dean Herbert
dc577aa6fa
Fix display of bonus score
2020-07-28 11:22:58 +09:00
Bartłomiej Dach
7ad3101d08
Bring back custom fade-out delay if hit lighting is on
2020-07-27 19:21:01 +02:00
Bartłomiej Dach
21ae33e284
Determine whether to show lighting at prepare time
2020-07-27 19:07:21 +02:00
Bartłomiej Dach
bbc7d69524
Add failing test cases
2020-07-27 19:07:21 +02:00
Dean Herbert
10101d5b31
Reduce spinner tick and bonus score
2020-07-27 18:06:14 +09:00
Salman Ahmed
5e7237bf56
Fix incorrect default hitcircle font overlapping applied to legacy skins
2020-07-27 10:29:16 +03:00
Dean Herbert
a6a7961af9
Change div to subtraction to fix calculation
2020-07-24 22:09:25 +09:00
Dean Herbert
dd45f0bd40
Adjust max spins to "match" stable
2020-07-24 21:10:46 +09:00
Dean Herbert
82e4050fdd
Fix xmldoc
2020-07-24 19:41:34 +09:00
Dean Herbert
eb84f25036
Adjust maximum spins to roughly match stable
2020-07-24 19:34:13 +09:00
