1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 02:27:51 +08:00
Commit Graph

3435 Commits

Author SHA1 Message Date
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dean Herbert
048507478e Join declaration and specification 2020-10-06 14:12:46 +09:00
Dean Herbert
ed982e8dd1 Make stacked hitcircles more visible when using default skin 2020-10-06 14:09:31 +09:00
Dean Herbert
767a2a10bd Fix incorrect sliderendcircle fallback logic
Correctly handle the case where a skin has "sliderendcircle.png" but not
"sliderendcircleoverlay.png".
2020-10-06 13:56:42 +09:00
Dan Balasescu
6d50a1ed7d
Merge branch 'master' into osu-selection-flip-rotate-buttons 2020-10-05 19:17:33 +09:00
Dan Balasescu
08f7b18dbe
Merge pull request #10294 from peppy/osu-selection-scaling
Add selection scale and rotate support
2020-10-05 19:17:19 +09:00
Dan Balasescu
cbf697336f
Merge pull request #10323 from peppy/skin-slider-end-circle-support
Add legacy skin "sliderendcircle" support
2020-10-05 19:02:38 +09:00
Dan Balasescu
b20dc793cc
Merge pull request #10321 from LittleEndu/trail-density
Try to match stable's cursor trail density
2020-10-05 19:02:28 +09:00
Dan Balasescu
2df5ea8ba8
Merge branch 'master' into osu-selection-scaling 2020-10-05 18:47:17 +09:00
Dean Herbert
f0b5ba9534
Merge branch 'master' into skin-slider-end-circle-support 2020-10-05 17:45:51 +09:00
Dan Balasescu
692ca87bec
Merge branch 'master' into fix-spinner-rewind-crash 2020-10-05 15:32:52 +09:00
Dean Herbert
5dea37792c
Merge branch 'master' into health-adjustments 2020-10-04 21:38:40 +09:00
Bartłomiej Dach
a366591d6d
Merge branch 'master' into osu-selection-scaling 2020-10-04 13:28:59 +02:00
Bartłomiej Dach
26eff0120d Apply same fix for miss-triggering case
See 5888ecd - the same fix is applied here, but in the miss case.
2020-10-03 21:11:34 +02:00
Dean Herbert
5888ecdeb1 Fix spinner crashing on rewind 2020-10-04 01:08:24 +09:00
Lucas A
27cc6c5046 Rename HitCirclesCount -> HitCircleCount. 2020-10-03 16:52:33 +02:00
Lucas A
d7747ebb2d Remove unused WorkingBeatmap argument. 2020-10-03 16:51:22 +02:00
Bartłomiej Dach
db31280671 Award health for completed slider tails 2020-10-03 12:16:22 +02:00
Bartłomiej Dach
1f0620ffd4 Replace assignment references to HitResult.Miss with Judgement.MinResult 2020-10-02 23:31:24 +02:00
Bartłomiej Dach
2b1ef16f89 Replace comparison references to HitResult.Miss with IsHit 2020-10-02 23:31:24 +02:00
Lucas A
abd395a030 Remove unecessary using references. 2020-10-02 19:41:24 +02:00
Lucas A
cb2f695fdd Calculate hit circle count in OsuPerformanceCalculator. 2020-10-02 19:34:41 +02:00
Lucas A
0163688a17 Remove IBeatmap from PerformanceCalculator. 2020-10-02 19:24:30 +02:00
Endrik Tombak
676f58c3bf Merge branch 'master' of https://github.com/ppy/osu into trail-density 2020-10-02 19:36:40 +03:00
Endrik Tombak
8cd13729ee Actually multiply by the multiplier 2020-10-02 19:34:49 +03:00
Endrik Tombak
16f331cf6d Move implementation to LegacyCursorTrail 2020-10-02 19:34:06 +03:00
Dean Herbert
b1e7a5113e
Merge pull request #10328 from smoogipoo/fix-spinner-transforms
Fix spinners not transforming correctly
2020-10-02 23:51:09 +09:00
Dean Herbert
a3ecc6c5a4 Remove redundant array type specification 2020-10-02 19:56:24 +09:00
Dean Herbert
5a6c45e2ff Fix hidden mod support for sliderendcircle 2020-10-02 18:41:28 +09:00
smoogipoo
fe818a020a Fix spinners not transforming correctly 2020-10-02 16:17:57 +09:00
Dean Herbert
dde7f706aa Avoid rapid triangle repositioning during editor slider placement 2020-10-02 15:51:14 +09:00
Dean Herbert
ad4cac13ac Add preempt adjustment and fade in first end circle with slider to match stable 2020-10-02 15:21:52 +09:00
Dean Herbert
2975ea9210 Adjust repeat/tail fade in to match stable closer 2020-10-02 14:50:03 +09:00
Dean Herbert
2427ae43da Share fade in logic with repeats 2020-10-02 14:50:03 +09:00
Dean Herbert
5d2a8ec764 Add final sliderendcircle display support 2020-10-02 14:50:03 +09:00
Dean Herbert
fc7f3173e1 Add the ability to use LegacyMainCirclePiece with no combo number displayed 2020-10-02 14:50:03 +09:00
Dean Herbert
fce3eacd7d Move tail circle to display beneath ticks etc. 2020-10-02 14:50:03 +09:00
Endrik Tombak
fa1903cd03 Get bound copy instead 2020-10-01 23:41:24 +03:00
Endrik Tombak
abf1afd3f1 Do not decrease density 2020-10-01 23:27:57 +03:00
Endrik Tombak
9e52f9c858 Consider cursor size in trail interval 2020-10-01 23:23:28 +03:00
Dean Herbert
3069428efe
Merge pull request #10316 from smoogipoo/fix-spinner-flicker
Fix default spinner flashing yellow glow before completion
2020-10-01 22:29:48 +09:00
Dean Herbert
94996f2cc0
Merge branch 'master' into osu-selection-scaling 2020-10-01 21:09:52 +09:00
smoogipoo
6d3f4c8699 Fix a few more similar cases 2020-10-01 20:38:47 +09:00
Dan Balasescu
df07ca445f
Merge branch 'master' into legacy-SpinnerNoBlink 2020-10-01 20:34:23 +09:00
smoogipoo
ba76089219 Fix spinner flashing yellow glow before completion 2020-10-01 20:24:32 +09:00
smoogipoo
3e6af7ce43 Refactor for readability 2020-10-01 20:09:09 +09:00
Max Hübner
7e5ecd84bc Add braces to clear up operator precedence 2020-10-01 12:41:44 +02:00
Dean Herbert
b6dc8bb2d3 Fix remaining manual degree-to-radian conversions 2020-10-01 18:10:05 +09:00
Dan Balasescu
3a81602d0c
Merge pull request #10286 from peppy/fix-hitobject-sample-stuck-on-future-seek
Fix HitObject samples getting stuck in a playing state on seeking far into the future
2020-10-01 18:08:17 +09:00
Dean Herbert
538973e394 Use float methods for math operations 2020-10-01 17:06:05 +09:00
Dean Herbert
b7ac779760 Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek 2020-10-01 16:46:14 +09:00
Dean Herbert
983b693858 Add flip logic to OsuSelectionHandler 2020-10-01 16:24:50 +09:00
Dean Herbert
02f14ab4b0 Rename operation start/end to be more encompassing 2020-10-01 16:24:09 +09:00
smoogipoo
7890319802 Merge branch 'master' into adjust-hit-result-types 2020-10-01 16:19:07 +09:00
smoogipoo
cb6b35116a Merge branch 'master' into scoring-standardisation 2020-10-01 12:28:51 +09:00
smoogipoo
3c9ee6abc1 Use local static to determine score per spinner tick 2020-10-01 12:15:34 +09:00
Dean Herbert
4b70fe8585 Merge branch 'fix-storyboard-sample-pausing' into fix-hitobject-sample-stuck-on-future-seek 2020-09-30 22:46:09 +09:00
Dean Herbert
7f579850dd
Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 17:03:23 +09:00
Dean Herbert
414c40d298 Reverse inheritance order of SkinnableSound's pause logic 2020-09-30 15:45:14 +09:00
Dean Herbert
59ce9fcab9 Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 15:35:55 +09:00
Dean Herbert
7fad9ce34a Simplify HandleScale method 2020-09-30 15:20:25 +09:00
Dean Herbert
f1298bed79 Combine scale operations and tidy up scale drag handle construction 2020-09-30 15:08:56 +09:00
Dean Herbert
313b0d149f Refactor scale and rotation operations to share code better
Also adds support for scaling individual sliders.
2020-09-30 14:41:33 +09:00
Dean Herbert
39b55a85df Move a lot of the implementation to base SelectionHandler 2020-09-30 13:52:57 +09:00
Dean Herbert
99a3801267 Tidy up scale/rotation operation code 2020-09-30 13:02:05 +09:00
Dean Herbert
5ae6b2cf5b Fix syntax 2020-09-29 20:10:17 +09:00
Dean Herbert
a2e2cca396 Add proper change handler support 2020-09-29 20:08:56 +09:00
Dean Herbert
934db14e03 Add rotation support 2020-09-29 20:08:56 +09:00
Dean Herbert
33b24b6f46 Refactor to be able to get a quad for the current selection 2020-09-29 20:08:56 +09:00
Dean Herbert
0a10e40ce0 Add scaling support to osu! editor 2020-09-29 20:08:56 +09:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00
smoogipoo
cd895c792c Merge branch 'master' into scoring-standardisation 2020-09-29 17:04:59 +09:00
smoogipoo
bad48d6d44 Merge branch 'master' into scoring-standardisation 2020-09-29 16:33:38 +09:00
smoogipoo
31fae045fa Update judgement processors with new hit results 2020-09-29 16:33:38 +09:00
smoogipoo
a1394c1830 Fix a few missed judgements 2020-09-29 16:33:38 +09:00
smoogipoo
a77741927c Use new hit results in osu 2020-09-29 16:33:38 +09:00
Dean Herbert
5d1c377379 Fix HitObject samples getting stuck in a playing state on seeking far into the future 2020-09-29 15:07:55 +09:00
Dean Herbert
d6f3beffb6 Use existing bindable flow instead 2020-09-29 12:50:17 +09:00
Dean Herbert
cc9bf67d42
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-29 12:10:24 +09:00
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
Yao Chung Hu
96f39dd350 Merge remote-tracking branch 'upstream/master' into visible-playfield-boundary 2020-09-05 01:50:13 -05: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
Dean Herbert
0050f6348f
Merge branch 'master' into add-spinner-bonus-score 2020-07-23 23:05:04 +09:00
smoogipoo
c348599189 Merge branch 'master' into add-slider-slide-support 2020-07-23 21:24:45 +09:00
smoogipoo
f883cb85d7 Null out the sample too 2020-07-23 21:24:31 +09:00
Dan Balasescu
f106106dc4
Merge pull request #9648 from peppy/fix-slider-ball-rotation
Fix slider ball rotation being applied to follow circle and specular layer
2020-07-23 19:39:58 +09:00
Dean Herbert
113fac84dd Fix circle container type 2020-07-22 21:14:04 +09:00
Dan Balasescu
372754f1a2
Merge pull request #9649 from peppy/hide-repeat-judgements
Hide slider repeat judgements temporarily
2020-07-22 20:36:00 +09:00
Dan Balasescu
a640541324
Merge pull request #9612 from peppy/input-handler-updates
Input handler updates in line with framework changes
2020-07-22 20:30:32 +09:00
Dean Herbert
2c62b23d85 Update naming 2020-07-22 19:53:45 +09:00
Dean Herbert
bd6a51f545 Hide slider repeat judgements temporarily 2020-07-22 19:30:10 +09:00
Dean Herbert
53a9ac3c1a Fix slider ball rotation being applied to follow circle and specular layer 2020-07-22 19:06:39 +09:00
Dean Herbert
2126f6bffc Add slider "sliding" sample support 2020-07-22 16:37:58 +09:00
Dean Herbert
bc079fccf5 Add health drain for spinner ticks 2020-07-21 19:52:16 +09:00
Dean Herbert
1560e1786a Revert back to bool for application 2020-07-21 19:48:44 +09:00
Dean Herbert
7f2ae694cc Simplify rewind handling 2020-07-21 19:21:30 +09:00
Dean Herbert
947f4e0d4c Move tick handling to DrawableSpinner itself 2020-07-21 19:20:19 +09:00
Dean Herbert
05102bc1ba Split ticks up into bonus and non-bonus 2020-07-21 18:22:37 +09:00
Salman Ahmed
35ad409da6 Fix spinner bonus ticks samples not actually playing 2020-07-21 06:59:29 +03:00
Dean Herbert
4dd40542d5 Rename rotation set method to match others 2020-07-21 11:31:29 +09:00
Dean Herbert
f48984920d Change bonus volume logic to work 2020-07-21 11:31:29 +09:00
Dean Herbert
35d53139e7 Merge branch 'master' into add-spinner-bonus-score 2020-07-21 11:21:17 +09:00
Dean Herbert
e06d3c5812 Minor adjustments to tick clearance 2020-07-20 17:52:59 +09:00
Dean Herbert
4cbc176cb6 Add less fill and more transparency 2020-07-20 17:50:11 +09:00
Dean Herbert
33e58bb7db Fix sizing and colour not correct on hit 2020-07-20 17:22:30 +09:00
Dean Herbert
55d921ef85 Improve feel of animation 2020-07-20 17:22:30 +09:00
Dean Herbert
648e414c14 Update InputHandlers in line with framework changes 2020-07-19 11:39:11 +09:00
Fabian
56b0094d43 Update slider labels & descriptions 2020-07-18 23:10:05 +02:00
Fabian
0975610bf7 Increased maximum start modifier higher (15x -> 25x)
Tried playing around with higher values and personally had quite fun when the circles covered the whole screen so I raised the max modifier to 25. Works best with an AR of <6.
2020-07-18 02:21:55 +02:00
Fabian
a6cf77beae Clarified what the slider value is 2020-07-17 17:53:20 +02:00
Fabian
9857779d42 Added slider for the grow/deflate mod 2020-07-17 16:12:01 +02:00
Dan Balasescu
f3a498482b
Merge pull request #9553 from peppy/difficulty-adjust-range-match-stabl
Change difficulty adjust mod to match stable range of 0-10
2020-07-14 20:12:28 +09:00
Dean Herbert
b59e4f8a7e Change difficulty adjust mod to match stable range of 0-10 2020-07-14 08:15:14 +09:00
smoogipoo
8a3cadc111 Fix judgement animations not resetting on use 2020-07-13 21:21:59 +09:00
Dean Herbert
dd025262d0 Fix one more nullref 2020-07-10 22:48:34 +09:00
Dean Herbert
0a61f80c8b Remove result nullable check 2020-07-10 22:39:35 +09:00
Dean Herbert
13205319f3 Fix null reference if hit lighting is disabled 2020-07-10 22:37:29 +09:00
Yao Chung Hu
d40f209f4b Move Playfield Border to OsuPlayfield Ruleset 2020-07-10 07:36:21 -05:00
Dean Herbert
024fb52726 Fix unnecessary using 2020-07-10 19:05:31 +09:00
Dean Herbert
c9e54651d5
Merge branch 'master' into judgement-pooling 2020-07-10 18:51:42 +09:00
Dean Herbert
f872343bab Make Apply virtual to further simplify application process 2020-07-10 18:35:20 +09:00
Dean Herbert
8aff828dfe Move application of judgements to Apply method 2020-07-10 18:34:31 +09:00
Dean Herbert
1b9f09f9c2
Merge branch 'master' into osu-cursor-visibility 2020-07-10 17:15:34 +09:00
Dean Herbert
3138cc455c
Merge branch 'master' into judgement-pooling 2020-07-10 17:15:19 +09:00
Dean Herbert
bd5957bc0a Add dynamic compilation exclusion rules for ruleset types 2020-07-10 14:49:44 +09:00
Dean Herbert
c562435267 Adjust cursor transforms for better feel 2020-07-10 14:44:30 +09:00
Dean Herbert
a21c2422c5 Make cursor centre portion non-expanding and more visible with outline 2020-07-10 14:44:20 +09:00
Dean Herbert
e211ba5e7d Fix cursor scale potentially not being updated if set too early 2020-07-10 14:43:30 +09:00
Dean Herbert
efb2c2f4ae Rename variable to be more clear on purpose 2020-07-09 12:01:00 +09:00
Bartłomiej Dach
4cd874280c Add clarifying xmldoc for RotationAbsolute 2020-07-08 22:37:50 +02:00
Bartłomiej Dach
213dfac344 Fix broken spinner rotation logic 2020-07-08 22:37:50 +02:00
Dean Herbert
e6ec883084 Remove slider tail circle judgement requirements 2020-07-08 20:21:44 +09:00
Dean Herbert
51050ec4ef Add per-result type pooling 2020-07-06 12:54:39 +09:00
Bartłomiej Dach
d229993e5c Use RotationAbsolute instead 2020-07-05 02:12:26 +02:00
Bartłomiej Dach
cd6bdcdb88 Replace further spinner transforms with manual lerp 2020-07-05 00:25:01 +02:00
Dean Herbert
ffec4298a7 Use DrawablePool for DrawableJudgements 2020-07-04 16:45:50 +09:00
Dean Herbert
c095753f24 Add better line smoothing 2020-06-25 19:02:04 +09:00
Dean Herbert
fd13c0a6dd Standardise line thickness 2020-06-25 18:44:04 +09:00
Dean Herbert
0d3bc1ac29 Add basic heatmap colour scaling based on peak value 2020-06-24 22:29:30 +09:00
Dean Herbert
9119f41604 Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-24 18:22:51 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
smoogipoo
cb03e6faa9 Improve visual display of arrow 2020-06-22 21:09:47 +09:00
smoogipoo
beb6e6ea88 Buffer the accuracy heatmap for performance 2020-06-22 21:00:13 +09:00
smoogipoo
1aec1ea53f Fix off-by-one causing auto to not be centred 2020-06-22 20:45:44 +09:00
smoogipoo
983f0ada2d Increase number of points to ensure there's a centre 2020-06-22 20:45:33 +09:00
smoogipoo
988baad16f Expand statistics to fill more of the screen 2020-06-22 19:20:43 +09:00
smoogipoo
30aa6ec2d3 Don't consider slider tails in accuracy heatmap 2020-06-22 19:05:41 +09:00
smoogipoo
2b7fb2b71d Rename to Position 2020-06-22 19:04:51 +09:00
smoogipoo
261adfc4e6 Create a local playable beatmap instead 2020-06-22 18:38:41 +09:00
smoogipoo
9dbd230ad3 Don't consider slider tails in timing distribution 2020-06-22 18:06:52 +09:00
smoogipoo
533d6e72eb Refactor + comment angle math 2020-06-22 18:05:21 +09:00
smoogipoo
21f776e51f Simplify/optimise heatmap point additoin 2020-06-22 15:48:42 +09:00
smoogipoo
33fdd7466c Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-22 15:38:48 +09:00
Bartłomiej Dach
ad85c5f538 Add base legacy skin transformer 2020-06-21 23:06:55 +02:00
smoogipoo
486b899e8f Rename method 2020-06-19 22:11:29 +09:00
smoogipoo
863666f7c4 Move accuracy heatmap to osu! ruleset, rename, remove magic number 2020-06-19 21:14:31 +09:00
smoogipoo
49997c54d0 Remove unused class 2020-06-19 21:14:17 +09:00
smoogipoo
89a863a337 Refactor OsuRuleset 2020-06-19 21:02:20 +09:00
smoogipoo
ad3bc99e7c Fix hit event position offset not being set 2020-06-19 20:49:05 +09:00
smoogipoo
83e6c3efdb Adjust API for returning statistics 2020-06-19 20:31:52 +09:00
smoogipoo
1cbbd6b442 Move timing distribution graph to osu.Game 2020-06-19 20:03:18 +09:00
smoogipoo
eab00ec9d9 Move hit events to the ScoreProcessor 2020-06-19 19:58:35 +09:00
smoogipoo
ef56225d9a Rename CursorPosition -< PositionOffset 2020-06-19 19:43:46 +09:00
smoogipoo
8c9506197d Increase the number of bins in the timing distribution 2020-06-19 19:41:46 +09:00
smoogipoo
d3e4e63258 Remove unnecessary class 2020-06-19 19:12:48 +09:00
smoogipoo
cae3a5f447 Rework heatmap for more consistent performance 2020-06-19 19:08:36 +09:00
smoogipoo
20db5b33ab Rework score processor to provide more generic events 2020-06-18 22:11:03 +09:00
smoogipoo
a2ddb4edb4 Change interface for creating statistic rows 2020-06-16 17:49:28 +09:00
smoogipoo
076eac2362 Inset entire graph rather than just the axis 2020-06-16 17:46:34 +09:00
smoogipoo
3dbe164b2c Add some very basic safety checks around non-existent data 2020-06-16 17:20:38 +09:00
smoogipoo
9ea7c3dc90 Make heatmap support dynamic sizing 2020-06-16 16:31:02 +09:00
smoogipoo
89b54be673 Add initial implementation of the statistics panel 2020-06-15 22:45:18 +09:00
smoogipoo
900da88498 Populate hit offsets from score processor 2020-06-15 22:44:55 +09:00
smoogipoo
f9db37a1de Split out types 2020-06-15 21:48:59 +09:00
smoogipoo
3b630eabd6 Merge branch 'master' into results-screen-statistics 2020-06-12 17:46:11 +09:00
smoogipoo
f3b5149648 Move some suggestions to warnings, resolve issues 2020-06-03 16:48:44 +09:00
smoogipoo
dc41e74e19 Fix cursor trail not displaying 2020-06-02 23:54:23 +09:00
smoogipoo
e98f51923a Add timing distribution to OsuScoreProcessor 2020-06-02 23:38:24 +09:00
Dan Balasescu
a8b137bb71
Merge pull request #9123 from peppy/move-setter-to-duration
Move setter from EndTime to Duration
2020-06-01 16:52:38 +09:00
Dan Balasescu
64d1b4b11b
Merge branch 'master' into move-setter-to-duration 2020-06-01 15:55:48 +09:00
Dean Herbert
b9464a2aa8
Merge branch 'master' into editor-create-composer-fix 2020-06-01 15:38:15 +09:00
Dean Herbert
0ef971be28 Merge branch 'master' into i-has-curve-with-repeats 2020-05-31 22:30:18 +09:00
Dean Herbert
d4b7c81f96
Merge branch 'master' into results-screen-condensed-panel 2020-05-30 23:13:52 +09:00
Dean Herbert
e8b43e8e1f Merge branch 'master' into move-setter-to-duration 2020-05-29 16:04:23 +09:00
Dean Herbert
8fa8c561e7 Pass hitobjects as a parameter to CreateBlueprintContainer 2020-05-29 12:20:50 +09:00
Dean Herbert
f5c974dd89 Hide non-alive selection blueprints by default 2020-05-27 13:40:16 +09:00
Dean Herbert
cbd563e80b Rename to IHasDuration 2020-05-27 12:38:39 +09:00
Dean Herbert
b8e0a6f127 Move sett from EndTime to Duration 2020-05-27 12:37:44 +09:00
Dean Herbert
6b5b215299 Split out IHasPath from IHasCurve to better define hitobjects 2020-05-26 17:44:47 +09:00
smoogipoo
51e74687f8 Merge branch 'editor-scrolling-playfield-support' of https://github.com/peppy/osu; branch 'results-screen-condensed-panel' of https://github.com/smoogipoo/osu into results-screen-condensed-panel 2020-05-26 15:39:39 +09:00
Dan Balasescu
b5de30ef3d
Merge branch 'master' into editor-scrolling-playfield-support 2020-05-26 14:46:58 +09:00
Dean Herbert
0cc6d6d97c
Merge pull request #9033 from smoogipoo/applydefaults-cancellation
Add cancellation token support to CreateNestedHitObjects()
2020-05-26 12:04:06 +09:00
Dean Herbert
e7442ec3a2 Remove need for ManiaSnapResult 2020-05-25 19:33:03 +09:00
smoogipoo
ebe2e97372 Merge branch 'master' into editor-clock-transform 2020-05-25 19:01:04 +09:00
smoogipoo
bc35bc5efb Merge branch 'master' into applydefaults-cancellation 2020-05-25 16:45:30 +09:00
Dean Herbert
decdc58de5 Merge branch 'editor-clock-cache' into editor-clock-transform 2020-05-24 12:55:47 +09:00
Dean Herbert
a8dbfe2791 Fix distance snap grid not disappearing when exiting playfield 2020-05-23 10:57:17 +09:00
Dean Herbert
bc82c2d3b7 Move drawable addition above event bindings 2020-05-23 10:44:53 +09:00
Dean Herbert
a3a9810344 Merge branch 'master' into editor-clock-cache 2020-05-23 00:44:04 +09:00
Dean Herbert
1311fd2f64
Merge branch 'master' into editor-move-distance-snap-grid 2020-05-23 00:42:43 +09:00
smoogipoo
d5ea076427 Merge branch 'master' into results-screen-condensed-panel 2020-05-22 20:45:39 +09:00
Dean Herbert
af30d1201f Fix slider path control point blueprint not working correctly 2020-05-22 18:57:28 +09:00
Dean Herbert
d18eb663b1 Add tweening seek support to EditorClock 2020-05-22 16:47:52 +09:00
Dean Herbert
8a47e2431b Move distance snap grid implementation to OsuHitObjectComposer 2020-05-21 17:13:22 +09:00
Dean Herbert
a9a1c00cf1 Move responsibility placement blueprint's StartTime set to within 2020-05-21 14:50:33 +09:00
Dean Herbert
82d6549161 Pass down snap result and remove local TimeAt usage 2020-05-20 21:01:29 +09:00
Dean Herbert
c46bfc2532 Create SnapResult class to hold various snapping results 2020-05-20 21:00:47 +09:00
Dean Herbert
3354d48a38 Change snapping to be screen space coordinate based 2020-05-20 21:00:29 +09:00
Huo Yaoyuan
c20902f249 Fix double in accuracy calculation in OsuPerformanceCalculator. 2020-05-18 18:22:03 +08:00
Huo Yaoyuan
373aae0610 Use int for total hits in OsuPerformanceCalculator. 2020-05-18 17:45:32 +08:00
smoogipoo
1865cd0762 Fix possible exceptions in performance calculators 2020-05-18 15:10:59 +09:00
smoogipoo
2bde4fc3ee Initial implementation of contracted score panel 2020-05-16 18:20:19 +09:00
smoogipoo
4719fcc291 Actually use the cancellation token 2020-05-15 18:17:39 +09:00
smoogipoo
98125102a7 Add cancellation token support to CreateNestedHitObjects() 2020-05-15 18:07:41 +09:00
Dean Herbert
de50b725d5 Fix mod failure checks executing actual game logic 2020-05-12 20:08:35 +09:00
smoogipoo
f195933844 Fix hardrock potentially taking a long time to load 2020-05-11 13:03:59 +09:00
smoogipoo
efff2bf15d Add HitObject to DefaultsApplied event 2020-05-08 18:49:19 +09:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
smoogipoo
ca692f30e6 Do full placement on mouse down 2020-04-24 12:27:56 +09:00
smoogipoo
8d5732aabd Make placements happen on mouse down 2020-04-23 12:17:11 +09:00
Dean Herbert
1f0b7465e2 Add back missing line 2020-04-21 16:06:40 +09:00
Dean Herbert
5e3fad86cf Fix relax replays playing back incorrectly 2020-04-21 15:28:25 +09:00
Dan Balasescu
eb7b04d8bc
Merge branch 'master' into fix-osu-hidden-mod-alt 2020-04-20 17:47:27 +09:00
smoogipoo
355e682e24 Fix typo in exception 2020-04-20 13:23:27 +09:00
Dean Herbert
8c85602ad0 Use foreach for conformity 2020-04-20 11:00:42 +09:00
Dean Herbert
e1acfd26a6 Simplify return logic 2020-04-20 10:59:44 +09:00
Dean Herbert
28318a0140 Add mention of notelock in xmldoc (potentially easier to find class) 2020-04-20 10:59:08 +09:00
smoogipoo
bbcbd7e3fb Simplify by removing custom enumerator 2020-04-17 14:48:12 +09:00
smoogipoo
2dee5e03e3 Dispose enumerators for safety 2020-04-17 14:40:29 +09:00
smoogipoo
4e4fe5cc90 Fix slider heads not being blocked when hit out of order 2020-04-17 14:33:29 +09:00
smoogipoo
a4a7823817 Add fail-safe to ensure hittability after a hit 2020-04-17 14:22:03 +09:00
smoogipoo
62f77a05be Optimise by removing state machine 2020-04-17 14:00:00 +09:00
smoogipoo
3daacbc2d2 Initial inefficient refactor of hitobject enumeration 2020-04-17 13:34:20 +09:00
Dean Herbert
9dda7da489 Fix spinners being considered the "first object" for increased visibility in hidden 2020-04-16 14:11:38 +09:00
Dean Herbert
2b2ab2bf19 Show new segments as red points even when hovered 2020-04-13 21:59:23 +09:00
smoogipoo
4cfc686683 Fix excption with 0 control points 2020-04-13 21:41:18 +09:00
Dean Herbert
63de493c85
Merge branch 'master' into fix-red-point-placement 2020-04-13 20:56:50 +09:00
Dean Herbert
64422fbf6d
Merge pull request #8697 from smoogipoo/more-change-state-support
Add change state support to more Editor components
2020-04-13 20:19:04 +09:00
Dean Herbert
d56b6900ad
Merge pull request #8737 from smoogipoo/fix-overlapping-controlpoints
Fix connections hidden due to overlapping controlpoints
2020-04-13 20:06:24 +09:00
Dean Herbert
ca5971578a
Merge branch 'master' into more-change-state-support 2020-04-13 19:13:07 +09:00
Dean Herbert
0e88c28060 Merge branch 'editor-undo-redo' into more-change-state-support 2020-04-13 18:07:00 +09:00
smoogipoo
9a65aa18d7 Fix connections hidden due to overlapping controlpoints 2020-04-13 16:13:14 +09:00
smoogipoo
2c20328a70 Rework control point placement for better progression 2020-04-13 15:31:46 +09:00
smoogipoo
e17d5bdbaf Improve red slider control point placement logic 2020-04-13 13:57:40 +09:00
Dean Herbert
65b96079a0 Move dampening to base implementation and change range to 0..1 2020-04-13 13:01:02 +09:00
Fire937
22d89dbff7 Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback 2020-04-12 01:46:32 +02:00
Fire937
f274ec297c Add positional sound support for all rulesets
The SamplePlaybackBalance is calculated in a way that the balance
remains between -0.4 and 0.4.
Positional sound is not supported in osu!taiko.
2020-04-12 01:33:25 +02:00
smoogipoo
6988df30bd Rename variable, add comment 2020-04-10 03:12:13 +09:00
smoogipoo
42b3ff805b Rename methods + fix incorrect method usage 2020-04-10 03:07:44 +09:00
smoogipoo
b54bbc5f6a Improve commenting + refactor 2020-04-10 02:41:48 +09:00
smoogipoo
10e849d196 Separate into separate class 2020-04-10 02:02:09 +09:00
smoogipoo
ea1bec85ae Simplify code/language 2020-04-10 01:41:00 +09:00
smoogipoo
b8d7b78b55 Remove unnecessary null set 2020-04-10 01:21:37 +09:00
smoogipoo
116b952dfe Change param to hitobject rather than result 2020-04-10 01:20:43 +09:00
smoogipoo
a2f5a469cf Merge branch 'master' into add-notelock 2020-04-10 01:18:54 +09:00
smoogipoo
575b061dd7 Add change state support to more editor components 2020-04-09 22:02:42 +09:00
smoogipoo
ee6ea08cf8 Cleanup handling of hitobject updates 2020-04-09 20:16:44 +09:00
Dean Herbert
87b29007c2
Merge pull request #8626 from LittleEndu/arrow-easing
Don't allow new transformations for reverse arrow after it's hit
2020-04-08 23:34:02 +09:00
Dean Herbert
067ec27859 Also fix slider repeat circles 2020-04-08 18:59:31 +09:00
Dean Herbert
f3e909539d Fix slider ball and follow circle blending for legacy skins 2020-04-08 18:39:18 +09:00
Endrik Tombak
0b70c20aa3 Merge branch 'master' of https://github.com/ppy/osu into arrow-easing 2020-04-07 17:16:56 +03:00
Endrik Tombak
16d906d769 Get rid of unnecessary removal 2020-04-07 17:16:06 +03:00
Dan Balasescu
bbbc13021b
Merge branch 'master' into fix-sliderball-acent-colour 2020-04-07 13:53:48 +09:00
Dean Herbert
a4b4b7df21 Fix follow points not starting at correct time 2020-04-06 13:04:46 +09:00
Dean Herbert
66b8a8ad2e Remove stray default value specification 2020-04-06 12:45:58 +09:00
Endrik Tombak
23c3be0969 Rename variable 2020-04-05 13:39:31 +03:00
Endrik Tombak
a3626333be Use DI instead 2020-04-05 13:36:52 +03:00
Endrik Tombak
1f6a4fa4b8 Remove transformations 2020-04-05 12:45:10 +03:00
Dean Herbert
bc6c6228ac Tidy up a touch 2020-04-05 14:13:06 +09:00
Endrik Tombak
36ad1cbd79 Format the code 2020-04-04 23:17:55 +03:00
Endrik
634a8f9ff4
Return inline 2020-04-04 23:05:10 +03:00
Dean Herbert
e340d2628b Fix sliderball accent colour not being set correctly 2020-04-05 03:17:11 +09:00
Endrik Tombak
e1a67bdb96 Move implementation to transformer 2020-04-04 11:13:25 +03:00
Endrik Tombak
d73c791a10 Support this typo for old skins 2020-04-03 20:56:52 +03:00
smoogipoo
1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
Dean Herbert
a3d4212462 Fix weird slider ball sizing 2020-04-02 19:56:33 +09:00
Dean Herbert
7a9d878a34
Merge branch 'master' into fix-follow-point-transforms 2020-03-31 20:03:42 +09:00
Dan Balasescu
7ff3a1d28d
Merge branch 'master' into fix-relax-mod-keypresses 2020-03-31 17:55:28 +09:00
Dean Herbert
8a998d600d Fix relax mod pressing too many keys 2020-03-31 15:17:27 +09:00
Andrei Zavatski
9890544b36 Move implementation to better place 2020-03-30 13:42:18 +03:00
Andrei Zavatski
f96229c572 Add support for HitCircleOverlayAboveNumber legacy skin property 2020-03-30 13:21:22 +03:00
Dean Herbert
6907522cd7
Merge pull request #8486 from LittleEndu/fix-snaking-arrow
Make reverse arrows not follow snaking when they are already hit
2020-03-30 18:35:17 +09:00
Dean Herbert
c4df49954f Reword comment 2020-03-30 18:35:01 +09:00
smoogipoo
796976db3c Completely ignore spinners from note lock 2020-03-30 17:00:53 +09:00
smoogipoo
744f6c3ca7 Rename method + adjust comments 2020-03-30 16:33:46 +09:00
smoogipoo
0d20292992 Fix ticks/spinners contributing to notelock 2020-03-30 16:14:56 +09:00
smoogipoo
3f8fbebbb4 Merge branch 'master' into add-notelock 2020-03-30 15:01:39 +09:00
Dan Balasescu
a0b8243f4c
Merge branch 'master' into slider-start-circle 2020-03-30 14:49:17 +09:00
Dan Balasescu
03cd9aa060
Merge branch 'master' into spun-out 2020-03-30 12:31:53 +09:00
Endrik Tombak
2ab8267f84 Add a comment 2020-03-29 10:50:43 +03:00
Dean Herbert
2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip 2020-03-29 14:35:04 +09:00
Dean Herbert
d1b01095ee Rewrite to reduce code changes and complexities in hit object implementation 2020-03-29 14:31:03 +09:00
Dean Herbert
b259708915
Merge branch 'master' into spun-out 2020-03-29 13:24:48 +09:00
Endrik Tombak
d3114ca858 Don't snake when hit 2020-03-28 23:12:13 +02:00
Dean Herbert
fb4b334ce2 Add support for legacy skin sliderstartcircle / sliderstartcircleoverlay 2020-03-28 14:10:26 +09:00
Dan Balasescu
3763457a1d
Merge pull request #8451 from peppy/fix-slider-end-sounds
Only play slider end sounds if tracking
2020-03-27 20:38:59 +09:00
Dean Herbert
d36f5fb96f Fix animated follow points not (re)animating after rewind 2020-03-27 18:03:02 +09:00
Dean Herbert
f80efd10c2 Avoid using a miss judgement 2020-03-26 19:54:17 +09:00
Dean Herbert
6555ab6ede Only play slider end sounds if tracking 2020-03-26 17:18:27 +09:00
Dean Herbert
8e4896fbbe Make slider judgements count towards base score / accuracy 2020-03-26 17:13:53 +09:00
Dean Herbert
8a2aac5f83 Rename conversion methods for clarity 2020-03-25 20:21:34 +09:00
Dean Herbert
388cf5c83a Fix catch positional data being incorrectly recorded 2020-03-24 15:38:54 +09:00
Dean Herbert
022465f546 Add encoding and import support 2020-03-24 14:51:52 +09:00
Dean Herbert
546772192c Add helper method to convert to legacy mods enums 2020-03-24 13:07:51 +09:00
Dean Herbert
14a85a84bf Add proper screen space - gamefield mapping 2020-03-23 20:06:18 +09:00
Dean Herbert
6d48068061 Move replay recorder to final location 2020-03-23 20:04:15 +09:00
杜Nate
9ea0137b01
Merge branch 'master' into spun-out 2020-03-23 18:13:53 +08:00
Dean Herbert
232c255986 Basic test scene setup 2020-03-23 17:33:02 +09:00
Dean Herbert
4f9ac7b81e Merge branch 'master' into show-mod-settings-tooltip 2020-03-23 14:57:54 +09:00
Liam DeVoe
1da590c63f use N1 format instead of 0.# 2020-03-22 22:54:21 -04:00
Liam DeVoe
afe7397d89 remove unnecessary using statements 2020-03-22 22:50:52 -04:00
Liam DeVoe
67667b3d22 enforce precision for ModDifficultyAdjust and derived classes 2020-03-22 21:22:46 -04:00
Liam DeVoe
63e9b2a299 use string.Empty, use base SettingDescription for [Osu/Catch]ModDifficultyAdjust 2020-03-22 18:50:09 -04:00
Dean Herbert
19b6e496ef Fix (very) long spinners degrading in performance due to high transform count 2020-03-22 04:18:03 +09:00
Liam DeVoe
a440d15620 simplify array initializationstatement 2020-03-20 16:58:02 -04:00
Liam DeVoe
e84b40f8ed remove unnecessary ToString calls 2020-03-20 16:53:40 -04:00
Liam DeVoe
cda1efef0b move overridability to SettingDescription method 2020-03-20 16:34:36 -04:00
Liam DeVoe
7bdbdd25f8 Revert "use SettingSource to define IconTooltip format"
This reverts commit 5a6d8f1932.
2020-03-20 16:05:12 -04:00
Liam DeVoe
52469fccbe
Merge branch 'master' into show-mod-settings-tooltip 2020-03-20 13:41:04 -04:00
Liam DeVoe
5a6d8f1932 use SettingSource to define IconTooltip format 2020-03-20 12:47:17 -04:00
Dean Herbert
d96f684077
Merge pull request #8358 from peppy/remove-slider-implicit-judgement
Remove slider implicit judgement
2020-03-20 01:13:58 +09:00
Dean Herbert
6b482c057a
Merge pull request #8362 from peppy/fix-slidertick-judgement-accuracy
Fix slider ticks/repeats contributing to accuracy
2020-03-20 01:13:49 +09:00
smoogipoo
12a48d2774 Cause all earlier hitobjects to get missed 2020-03-19 19:16:24 +09:00
Dean Herbert
0c1f385d5a Add OsuIgnoreJudgement to get correct result type 2020-03-19 18:19:10 +09:00
smoogipoo
f285b43a74 Allow simultaneous hitobjects 2020-03-19 17:45:08 +09:00
Dean Herbert
114b46c4f0 Change slider tail to give repeat judgement; slider itself to give none (managed by head already) 2020-03-19 15:01:14 +09:00
Dean Herbert
08b5ab8ec4 SliderRepeatPoint -> SliderRepeat 2020-03-19 14:42:02 +09:00
Dean Herbert
94c3ffb6e5 Fix slider ticks contributing to accuracy 2020-03-19 14:36:15 +09:00
Liam DeVoe
7a0a633ef9 don't use ToString, proper indent level 2020-03-19 00:06:55 -04:00
Liam DeVoe
18bf7c913b show mod settings in ModIcon tooltip 2020-03-18 23:43:26 -04:00
Dean Herbert
1c0c269852 Reduce allocations of followpoints by reusing existing 2020-03-19 00:34:24 +09:00
Dan Balasescu
1d680b7a00
Better english
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2020-03-18 19:13:25 +09:00
smoogipoo
210e5c672f Merge branch 'master' into add-notelock 2020-03-18 16:24:31 +09:00
BlauFx
405030da47 Resolving bdach's requested to change the enum member names and reduce the amount of selectable easing types 2020-03-16 20:34:53 +01:00
Dean Herbert
d6be8eec0c Merge branch 'master' into click-disabled-difficulty-icons 2020-03-16 11:30:57 +09:00
BlauFx
bc705616ab Fix bdach's suggestion 2020-03-15 20:46:12 +01:00
BlauFx
8892f2c3dd
Remove redundant check
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-15 20:41:28 +01:00
BlauFx
83a4fb6f37 Remove empty lines 2020-03-15 19:19:09 +01:00
BlauFx
d9aef6f813 Change label of attribute 2020-03-15 18:53:40 +01:00
BlauFx
b6aedb22d8 Add approachcircle mod 2020-03-15 01:25:02 +01:00
Andrei Zavatski
c271d17557 Remove useless field 2020-03-14 14:07:52 +03:00
Andrei Zavatski
74c9d5fc93 Use AccentColour 2020-03-14 13:45:55 +03:00
Andrei Zavatski
7e9d28b1b1 Fix slider ball colour affects follow circle 2020-03-13 13:42:33 +03:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
smoogipoo
742698acab Add notelock implementation 2020-03-10 15:30:24 +09:00
smoogipoo
9d5327b1ac Fix osu! shaking instead of missing for early hits 2020-03-10 15:00:23 +09:00
Bartłomiej Dach
77fd748035 Fix incorrect circle piece hitbox
Hitboxes of circle pieces in osu! have regressed with commit 8592335.
The reason for the regression was that hit detection was moved from
DrawableHitCircle itself to a newly-introduced private HitArea class
(now named HitReceptor).

As HitArea inherited from Drawable, it would return IsHovered == true
over its entire bounding box. This meant that the hit area could wrongly
pick up actions that are not within circle radius and make them into
hits.

To resolve, make HitReceptor a CompositeDrawable and set its corner
radius to match the circle piece. This fixes the invalid hitbox, as
IsHovered takes radius into account.
2020-03-06 21:21:20 +01:00
杜Nate
cf88e3ff19
Merge branch 'master' into spun-out 2020-03-04 17:38:35 +08:00
mcendu
e2ea92e21f Use framework method to convert rad to deg 2020-03-04 13:51:12 +08:00
smoogipoo
5e218697c5 Use stacked positions 2020-03-04 09:46:53 +09:00
Dean Herbert
900882610d
Merge branch 'master' into expand-number-piece-on-old-skins 2020-03-02 16:40:59 +09:00
smoogipoo
da89798765 Merge remote-tracking branch 'origin/master' into layout-rework 2020-02-26 15:06:40 +09:00
Dan Balasescu
ff063b229b
Merge pull request #7973 from peppy/fix-dho-lifetimes-via-judgements
Fix hitobjects with unknown lifetimes by enforcing non-null judgement
2020-02-25 20:38:29 +09:00
smoogipoo
f71c45cb1b Remove shallPropagate 2020-02-25 11:30:33 +09:00
smoogipoo
6c28fd21c7 osu-side changes 2020-02-24 20:52:15 +09:00
Dean Herbert
e6cfafffe9 Fix incorrect LifetimeStart and add todo regarding Expire usage 2020-02-24 12:24:15 +09:00
Dean Herbert
ffc7eaa3f2 Fix hitobjects with unknown lifetimes by enforcing non-null judgement
We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container
due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward
CreateJudgement() must be implemented and return a non-null judgement.

This fixes BananaShower and JuiceStreams in osu!catch.

This also makes HitObject abstract and cleans up convert HitObject implementations.
2020-02-23 13:49:06 +09:00
Dean Herbert
090d9d9350 Make FollowPointRenderer a LifetimeManagementContainer 2020-02-23 04:37:04 +09:00
Dean Herbert
cb9a7ee0bb Give FollowPointConnections a valid lifetime 2020-02-23 04:36:50 +09:00
Dean Herbert
00b4fc1e1f Add fill to default skin slider ball when tracking 2020-02-21 17:38:23 +09:00
smoogipoo
958c891d15 Update with framework-side bindable list changes 2020-02-17 15:06:14 +09:00
杜Nate
b6378c7ae2
fix speed
* Original /40 is due to documentation error.

Co-Authored-By: clayton <me@clayton.cc>
2020-02-16 17:50:52 +08:00
Dean Herbert
6cfa182fe4 Don't transform repeat points 2020-02-16 15:35:12 +09:00
Dean Herbert
cd4643593f Fix transform mod not being applied correctly 2020-02-16 11:58:41 +09:00
Dean Herbert
5e8df45c00
Merge branch 'master' into improve-relax-key-down-up 2020-02-15 11:07:19 +09:00
Dan Balasescu
6cd91de8f7
Merge branch 'master' into fix-2b-relax 2020-02-14 19:21:06 +09:00
Dean Herbert
61a7f04efb Add a sane key up delay to relax mod 2020-02-14 17:13:50 +09:00
Dean Herbert
4ce687d608 Move public methods up 2020-02-14 17:03:23 +09:00
Dean Herbert
cd2d1b0669 Fix 2B maps not playing correctly with relax mod enabled 2020-02-14 17:00:55 +09:00
Dean Herbert
9ea6912520 Improve overall readability of OsuModeRelax 2020-02-14 16:58:56 +09:00
Dean Herbert
9cbb37b682 Fix bindable being created far too late in construction 2020-02-14 15:59:59 +09:00
Dean Herbert
884a5fbad4 Fix osu! gameplay cursor not adjusting to mod/convert circle size changes 2020-02-14 14:30:15 +09:00
Dean Herbert
5b3f0bbb0a
Merge branch 'master' into fix-editor-time-change-display 2020-02-13 23:55:52 +09:00
Dan Balasescu
5a90e6f9b5
Merge branch 'master' into fix-blueprint-outside-container 2020-02-13 17:32:49 +09:00
Dean Herbert
53b62816f8 Add index constants for cross-class safety 2020-02-13 14:07:37 +09:00
Dean Herbert
0fe41fd50a Fix blueprint showing even when mouse outside of container 2020-02-13 09:03:48 +09:00
Dean Herbert
85a4437837 Fix editor custom FadeOut causing overlapping issues by removing existing FadeOut 2020-02-12 19:03:22 +09:00
voidedWarranties
3d1183eea0
Merge branch 'master' into difficultyadjust-order 2020-02-10 16:46:24 -08:00
voidedWarranties
ca237fd987 Simplify ordering by using only numbers, add xmldoc 2020-02-10 16:21:49 -08:00
Bartłomiej Dach
686040d8ad Extract auto-spin logic to method 2020-02-10 21:42:34 +01:00
mcendu
9aa5db88d4
move auto fade in to mod 2020-02-10 14:14:04 +08:00
voidedWarranties
ea521b466f Switch numerical consts to an enum 2020-02-09 21:37:40 -08:00
voidedWarranties
88a56d00bf Allow specifying order to SettingSource 2020-02-09 20:11:37 -08:00
mcendu
10a1948720
remove using directive 2020-02-09 16:19:21 +08:00
mcendu
e78d94d469
return to use if for casting 2020-02-09 14:56:47 +08:00
mcendu
596f4f7d2e
use spinner's clock to drive spinner 2020-02-09 14:54:46 +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
mcendu
c9520b299a
replace if check with variable decl 2020-02-09 13:35:36 +08:00
mcendu
83c67dc155
move spun out to automation 2020-02-09 13:34:35 +08:00
mcendu
8e20e641f4
move spun out to automation 2020-02-09 13:33:43 +08:00
杜Nate
8d480c794a
Merge branch 'master' into spun-out 2020-02-08 13:54:39 +08:00
mcendu
d821b6a15a make frameDelay a float 2020-02-08 11:16:48 +08:00
mcendu
fbdf07dc20 Correct speed of spun out 2020-02-08 11:06:37 +08:00
mcendu
efa95ecebb fix spinner unspinnable 2020-02-08 10:52:59 +08:00
mcendu
204c2f0bde add tests 2020-02-08 10:16:04 +08:00
mcendu
ca09ae6849 fix formatting 2020-02-08 09:53:20 +08:00
mcendu
4d9232a895 Move autospin logic to mods 2020-02-08 09:51:32 +08:00
mcendu
0dee6ceab7 Remove unnecessary using 2020-02-08 09:06:29 +08:00
mcendu
25a930c438 Implement OsuModSpunOut 2020-02-08 08:59:35 +08:00
Dean Herbert
91203c2b12
Merge branch 'master' into placement-display-in-timeline 2020-02-08 01:50:24 +09:00
Dean Herbert
51ae741fc7
Merge pull request #7755 from peppy/fix-spinner-placement
Fix spinner placement blueprint in multiple ways
2020-02-08 01:49:48 +09:00
smoogipoo
51edd88277 Add back fade 2020-02-08 00:28:52 +09:00
Dean Herbert
830afe5209 Make spinner blueprint update values more frequently. Also handle right-click 2020-02-07 19:09:47 +09:00
Dean Herbert
a6531bf73e Don't show distance snap grid for spinners (for now) 2020-02-07 19:09:23 +09:00
Dean Herbert
6297606baa Make sMake spinner's EndTime correct on construction 2020-02-07 19:08:37 +09:00
Dean Herbert
e31d69c749 Add commit status to EndPlacement; call BeginPlacement on initial movement 2020-02-07 18:02:48 +09:00
Dean Herbert
544685be48 Add support for reading skin frame rate from configuration file 2020-02-07 14:58:29 +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
811ddb02a4 General refactoring 2020-01-24 17:50:36 +09:00
smoogipoo
6fc6a376ee Fix incorrect slider selection point 2020-01-24 17:50:09 +09:00
Dean Herbert
289be7a17b Merge branch 'i-beat-snapping' into timeline-maybe 2020-01-23 15:45:33 +09:00
Dean Herbert
7c62cc3ac3 Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework 2020-01-22 22:57:52 +09:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
Dean Herbert
bd96cf94a6 Begin refactoring SelectionBlueprint to handle non-drawable HitObjects 2020-01-21 12:47:14 +09:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Dean Herbert
25aff5d96e Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-20 17:08:59 +09:00
Dean Herbert
9a2d85e7d9 Remove usage of snapchat icon 2020-01-18 15:12:31 +09:00
McEndu
6579aa144d
Merge branch 'master' into mod-text 2020-01-16 20:11:51 +08:00
smoogipoo
5f178b7755 General refactorings 2020-01-16 11:54:03 +09:00
Dean Herbert
d57f55f053 Apply remaining changes required to restore previous functionality 2020-01-15 19:09:49 +09:00
mcendu
5d160376c0
nullable-ize Mod.Icon 2020-01-14 21:22:00 +08: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
Albie Spriddell
3a903339d6 add playingverb and database migrations 2020-01-03 11:39:15 +00:00
Dan Balasescu
8a85875cbf
Merge branch 'master' into add-spinner-bonus-score 2020-01-03 18:08:26 +09:00
Dean Herbert
ee332e0d42 Split out BlueprintContainer functionality further 2020-01-02 18:21:16 +09:00
Dean Herbert
ca90f708f1 Merge remote-tracking branch 'upstream/master' into remove-editor-beatmap-generics 2020-01-01 21:03:31 +09:00
smoogipoo
6069d98ced Remove generic editor beatmap 2019-12-27 19:39:30 +09:00
Dean Herbert
2c8879f0fb Lock user adjusted difficulty settings when changing beatmap 2019-12-27 19:05:17 +09:00
smoogipoo
35cdd67c4a Remove instantiation of non-existing processor 2019-12-27 12:47:23 +09:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain 2019-12-26 23:51:12 +09:00
Dean Herbert
3d5561b02e
Separate health and score processing components (#7358)
Separate health and score processing components
2019-12-26 23:48:55 +09:00
smoogipoo
00a36c388c Fix tests 2019-12-26 19:18:39 +09:00
Huo Yaoyuan
9a013acb26 Fix name typo of OsuModObjectScaleTween 2019-12-26 14:25:41 +08:00
smoogipoo
3b07c3913d Add perfect and ok values, move to base Judgement 2019-12-26 15:00:59 +09:00
smoogipoo
90a0569660 Tweak drain values 2019-12-26 15:00:58 +09:00
smoogipoo
522847987b Implement break/gameplay start times 2019-12-26 15:00:58 +09:00
smoogipoo
90cb9d9162 Simplify scoreprocesor/healthprocessor implementations 2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Mania/ManiaRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id 2019-12-25 21:01:12 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion 2019-12-25 19:52:06 +09:00
Dean Herbert
911dc2d98d Fix code inspections 2019-12-25 15:20:10 +09:00
Dean Herbert
52ba0cd816 Rename method to be more appropriate
Also adds xmldoc.
2019-12-25 15:20:04 +09: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
0677f746aa Provide the ruleset to converter classes 2019-12-24 16:02:16 +09:00
Dean Herbert
a324bfbc2c Remove LegacyID from Ruleset 2019-12-24 13:48:27 +09:00
smoogipoo
6e7426a098 Simplify/improve beatmap conversion precheck 2019-12-23 17:44:18 +09:00
mcendu
4b3cfe3bae
temporarily remove kiai flash for legacy circles 2019-12-22 20:01:58 +08:00
unknown
fe73b9f8d3 make HP and OD generic and instantiate CS and AR to modes that need it 2019-12-22 16:45:32 +08:00
mcendu
76a895f348
improve code quality 2019-12-21 22:44:52 +08:00
mcendu
e4eccb86ba
Add property Intensity 2019-12-21 20:53:02 +08:00
mcendu
7bb984eb8d
Basic kiai flash implementation 2019-12-21 20:47:34 +08:00
Dean Herbert
419656cea4
Merge branch 'master' into add-spinner-bonus-score 2019-12-20 19:55:53 +09:00
unknown
0eef218945 add missing new line 2019-12-20 18:42:29 +08:00
unknown
08b477ed52 make ModDifficultyAdjust abstract 2019-12-20 18:30:23 +08:00
Salman Ahmed
121ce2c3df Fix checking for expand incorrectly 2019-12-19 14:44:52 +03:00
smoogipoo
76f2fb378f Separate score and health parts of ScoreProcessor 2019-12-19 20:03:14 +09:00
Dean Herbert
ea661fce21
Merge branch 'master' into adjustable-map-settings 2019-12-18 18:44:11 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
smoogipoo
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +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
Dean Herbert
826b271371 Use exact ratio of legacy to default object size 2019-12-18 15:39:36 +09:00
Dean Herbert
6e0802e50c Remove RulesetInfo parameter from Ruleset constructor 2019-12-18 14:49:09 +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
Salman Ahmed
41ca084fa5 Simplify expand number check 2019-12-17 22:00:21 +03:00
Dean Herbert
4443d2196b
Merge branch 'master' into legacy-slider-body 2019-12-17 23:42:31 +09:00
Dean Herbert
d219de7e27
Snap based on the end position/time of the previous object (#7240)
Snap based on the end position/time of the previous object
2019-12-17 23:41:20 +09:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset (#7244)
Move CreateScoreProcessor() to Ruleset
2019-12-17 22:15:42 +09:00
smoogipoo
35276c3739 Prevent test scene failures through casting softly 2019-12-17 21:26:23 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop 2019-12-17 20:14:45 +09:00
smoogipoo
49bf8d27d1 Move CreateScoreProcessor() to Ruleset 2019-12-17 20:08:13 +09:00
smoogipoo
2d85145eec Make legacy accent colour multiplicative 2019-12-17 19:52:33 +09:00
smoogipoo
527ab1a72f Fix traceable mod not working on skin change 2019-12-17 19:49:13 +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
smoogipoo
6da581f3fe Snap based on end position/time of the previous object 2019-12-17 16:35:40 +09:00
Dean Herbert
88ce4c12f0 Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score 2019-12-17 14:09:28 +09:00
Huo Yaoyuan
ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +08:00
Dean Herbert
b5db927d93 Merge branch 'master' into cinema-mod 2019-12-17 12:56:06 +09:00
Dean Herbert
a82b2a6c34
Merge pull request #7233 from smoogipoo/fix-cursortrail-texture
Fix cursortrail texture not being bound
2019-12-16 19:46:24 +09:00
Dean Herbert
eed2984bef
Update sdk and InspectCode version (#7208)
Update sdk and InspectCode version
2019-12-16 19:46:12 +09:00
smoogipoo
add04e98e1 Fix cursortrail texture not being bound 2019-12-16 18:10:44 +09:00
Dean Herbert
3f3ba603c1 Merge remote-tracking branch 'upstream/master' into nightcore-beats 2019-12-16 18:03:32 +09:00
Dean Herbert
520924a5ef
Don't reuse the same control point references for sliders (#7230)
Don't reuse the same control point references for sliders
2019-12-16 16:03:37 +09:00
smoogipoo
a554ca728b Don't reuse the same control point references 2019-12-16 15:27:54 +09:00
smoogipoo
db3dc4f375 Optimise cursortrail with custom vertex logic 2019-12-16 15:15:26 +09:00
Dean Herbert
5e98f65b52
Merge branch 'master' into separate-path-connection 2019-12-16 11:16:00 +09:00
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08:00
unknown
01c036b0b0 implement backing beats for nightcore mods 2019-12-15 16:56:02 +08:00
mcendu
489d9dc7b5 Switch Expandtarget and "cursormiddle" 2019-12-14 18:33:56 +08:00
unknown
7f659cd057 Merge branch 'update-beatmap-settings' into adjustable-map-settings 2019-12-13 09:45:10 +08:00
unknown
002a125b4a make ModDifficultyAdjust generic 2019-12-12 21:14:26 +08:00
Salman Ahmed
d6fb228338 Update version retrieval logic in-line with new implementation 2019-12-12 16:02:53 +03:00
Salman Ahmed
10e1e512fd Update the nested hitobject logic inline with new implementation 2019-12-12 15:15:16 +03:00
Dean Herbert
37a94988a3 Merge branch 'improve-hud-hiding' into cinema-mod 2019-12-12 16:12:19 +09:00
smoogipoo
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
Dean Herbert
d2ada90434
Merge branch 'master' into single-scoreprocessor 2019-12-12 11:36:45 +09:00
Albie
4a1c6db3ed
Merge branch 'master' into cinema-mod 2019-12-11 18:00:17 +00:00
unknown
b0cf44c3be fix appveyor issues 2019-12-11 20:12:29 +08:00
unknown
b795532aa5 add difficulty adjustment mods 2019-12-11 19:43:16 +08:00
Dean Herbert
42a01a10dd Merge remote-tracking branch 'upstream/master' into separate-path-connection 2019-12-11 20:14:29 +09:00
Dean Herbert
50377e7286 Add summary xmldoc 2019-12-11 20:14:16 +09:00
Dean Herbert
47b6b01739 Rename class to signify it is a drawable 2019-12-11 20:11:48 +09:00
Dean Herbert
06352a95be Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score 2019-12-11 20:02:51 +09:00
Dean Herbert
697e200856
Move control point removal to SliderSelectionBlueprint (#7154)
Move control point removal to SliderSelectionBlueprint
2019-12-11 19:27:53 +09:00
Dean Herbert
d027c982e4
Merge branch 'master' into separate-path-connection 2019-12-11 19:03:14 +09:00
Dean Herbert
a106e2a53f
Refactor distance snap grid to not require hitobjects (#7138)
Refactor distance snap grid to not require hitobjects
2019-12-11 19:02:29 +09:00
Dean Herbert
23959f3a3c Move control point removal to SliderSelectionBlueprint 2019-12-11 18:58:35 +09:00
Dean Herbert
d82ba3e7f7 Curve -> Curve type 2019-12-11 18:20:28 +09:00
Dean Herbert
03040d1750 Don't show inherit menu item when first control point is selected 2019-12-11 18:18:16 +09:00
Dean Herbert
97ca2e2753 Add missing bezier option to menu 2019-12-11 17:58:59 +09:00
smoogipoo
48f1dad4aa Remove abstract ScoreProcessor class 2019-12-11 17:25:06 +09:00
Dean Herbert
cda6757f52
Merge branch 'master' into path-type-menuitem 2019-12-11 16:43:55 +09:00
Dean Herbert
f515bdc599
Merge branch 'master' into separate-path-connection 2019-12-11 16:43:04 +09:00
Dean Herbert
632b1b9ee9
Merge branch 'master' into path-visualiser-refactor 2019-12-11 16:24:45 +09:00
Dean Herbert
d8cebd20ed Add xmldoc 2019-12-11 16:06:20 +09:00
Dean Herbert
86dac28dcb Merge remote-tracking branch 'upstream/master' into cursor-expand 2019-12-11 16:06:13 +09:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod 2019-12-10 17:06:53 +00:00
mcendu
dbe46c6cf7
conform to coding styles 2019-12-10 20:40:10 +08:00
mcendu
1afeaf31bc
make OsuCursorSprite abstract 2019-12-10 19:58:56 +08:00
mcendu
e37369304b property-ize expand target 2019-12-10 19:45:06 +08:00
mcendu
06cde2b0c2
remove unused using directive 2019-12-10 19:30:46 +08:00
Dean Herbert
f593caf0ea Remove unused class 2019-12-10 18:08:51 +09:00
Dan Balasescu
42a979b495
Merge branch 'master' into path-visualiser-refactor 2019-12-10 16:33:45 +09:00
smoogipoo
94a298a82d Refactor distance snap grid to not require hitobjects 2019-12-10 16:00:09 +09:00
Dean Herbert
5f3d163772
Merge branch 'master' into segmented-slider-paths-3 2019-12-10 14:28:20 +09:00
smoogipoo
e9ec6591a9 Separate path connections from control points 2019-12-10 11:20:08 +09:00
Dean Herbert
1db218f908 Don't show count when deleting only one control point
Reads better.
2019-12-10 03:29:25 +09:00
smoogipoo
1b14b0e5b6 Fix pieces blocking context menu 2019-12-10 00:08:38 +09:00
smoogipoo
9b318d2869 Add right-click menu item to change path type 2019-12-10 00:07:07 +09:00
smoogipoo
0ee303f7d6 Remove unused using 2019-12-09 22:45:44 +09:00
smoogipoo
2c4c190f15 Fix control points not adding to last segment 2019-12-09 22:44:47 +09:00
smoogipoo
bd2b0af269 Consider having only 1 control point as being deleted 2019-12-09 22:36:19 +09:00
smoogipoo
af90b45c40 Refactor path visualisers to use bindables 2019-12-09 20:49:59 +09:00
mcendu
22f2a4bed2
Fix LegacyCursor's cursormiddle expanding 2019-12-09 17:53:16 +08:00
mcendu
1e49078c52
Add OsuCursorSprite 2019-12-09 17:51:44 +08:00
smoogipoo
2dbf94f3ab Make placement blueprint add an initial segment 2019-12-09 18:10:40 +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
53f7c753fb General cleanups 2019-12-09 16:44:19 +09:00
smoogipoo
c18f2e6436 Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3 2019-12-09 15:34:49 +09:00
smoogipoo
aff1b93a07 Move config retrieval into LegacySliderBall 2019-12-09 14:43:23 +09:00
smoogipoo
4905709ea4 Remove unused usings 2019-12-09 13:19:21 +09:00
mcendu
76aabdd297 rename field rotate to spin 2019-12-09 12:11:04 +08:00
mcendu
eb065286ae fix ci 2019-12-09 08:49:44 +08:00
mcendu
1cf81c4906 rm unnecessary curlies 2019-12-09 08:37:32 +08:00
mcendu
b2b252a1cc Allow skin to disable spin 2019-12-09 08:36:07 +08:00
mcendu
4cd0dd7856 Move transformation to LoadComplete 2019-12-08 20:47:28 +08:00
mcendu
13b891f3f4 Crude legacy cursor rotation support 2019-12-08 20:05:02 +08:00
smoogipoo
b9d12e5fe4 Fix nested hitobjects not updating 2019-12-06 20:53:40 +09:00
smoogipoo
41437242a2 Add initial path type progression support 2019-12-06 19:39:25 +09:00
Dean Herbert
f958485be1 Add comment about size change 2019-12-06 18:54:54 +09:00
Dean Herbert
af2305bb77 Add null check 2019-12-06 18:53:30 +09:00
smoogipoo
52dd7bf716 Fix deleting the first control point not working 2019-12-06 18:49:14 +09:00
smoogipoo
16f8341a02 Handle control point positional updates within SliderPath 2019-12-06 18:49:01 +09:00
smoogipoo
2b5f9515de Fix multiple control point deletions 2019-12-06 17:03:54 +09:00
smoogipoo
d29ccdc25e Fix selection blueprint not re-snapping the path 2019-12-06 16:36:08 +09:00
smoogipoo
b4e1b5fa98 Explose + use the full calculated length of the path 2019-12-06 15:53:19 +09:00
Dean Herbert
21ceb7f85d Always display skins at native sizes for now 2019-12-06 14:40:45 +09:00
smoogipoo
a89a23fe08 Use linq to simplify some expressions 2019-12-06 13:08:35 +09:00
smoogipoo
247609388f Clean up unused/unnecessary properties 2019-12-06 12:31:22 +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
9ddfdab27a Remove meaningless Convert calls. 2019-12-03 20:47:00 +08:00
Dean Herbert
f181ee1843 Hide the menu cursor while inside the playfield by default 2019-11-29 17:35:11 +09:00
Albie
7864899249
Merge branch 'master' into cinema-mod 2019-11-28 16:42:01 +00:00
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen 2019-11-27 17:09:11 +09:00
Huo Yaoyuan
9425e80a5d Unify to use double in performance calculators. 2019-11-26 18:34:23 +08:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Albie
09158b6b08
Merge branch 'master' into cinema-mod 2019-11-26 06:57:47 +00:00
Dean Herbert
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +09:00
Albie
0a70ec0b11
Merge branch 'master' into cinema-mod 2019-11-25 07:25:30 +00: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
Albie Spriddell
3b9f59cb33 add cinema mod support 2019-11-23 17:34:53 +00:00
Albie Spriddell
20edaf4ba6 add cinema mod support 2019-11-23 17:32:16 +00:00
Dean Herbert
c2e85a2057 Apply CornerExponent fixes 2019-11-22 19:49:20 +09:00
Huo Yaoyuan
4cd7d67fe4 Use early return for if-pattern-matching. 2019-11-22 00:02:40 +08:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert
201f32859a
Merge branch 'master' into slider-control-point-removal 2019-11-21 22:10:52 +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
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Huo Yaoyuan
608785b99a Update .Net Standard projects to 2.1 2019-11-18 18:35:58 +08:00
smoogipoo
031b686ee9 Only accept input while hovered 2019-11-13 17:38:34 +09:00
smoogipoo
d835def4ab Add point count to the menu item text 2019-11-13 17:36:46 +09:00
smoogipoo
c56503ee88 Select single control point on right click 2019-11-13 17:29:00 +09:00
smoogipoo
9c52d239b4 Return null to allow passthrough 2019-11-13 16:56:48 +09:00
smoogipoo
4c0bca5c07 Add ability to delete control points via right-click option 2019-11-13 16:38:15 +09:00
Huo Yaoyuan
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00
Huo Yaoyuan
dcfa98414f Use ??=. 2019-11-12 19:56:51 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Huo Yaoyuan
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
smoogipoo
a0884fe9d4 Fix being able to add while not selected 2019-11-12 15:07:54 +09:00
smoogipoo
93d8cd38ca Implement addition via ctrl+click 2019-11-12 15:02:27 +09:00
smoogipoo
407ca41ba4 Simplify using existing tools 2019-11-12 15:02:27 +09:00
smoogipoo
316dcae614 Use squared distance 2019-11-12 15:02:27 +09:00
smoogipoo
13b11996e0 Improve closest segment algorithm 2019-11-12 15:02:27 +09:00
smoogipoo
10fd5ef5a7 Merge context menus 2019-11-12 15:02:27 +09:00
smoogipoo
461f76926f Add right-click menu to support control point addition 2019-11-12 15:02:01 +09:00
Dean Herbert
a43b0ee01b Apply naming and styling changes 2019-11-12 10:45:46 +09:00
Dean Herbert
b37bf4ea01 Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition 2019-11-12 10:44:53 +09:00
Dean Herbert
5da4db6889
Merge pull request #6802 from smoogipoo/edit-fadeout-time
Increase fade-out time of hitobjects in the editor
2019-11-12 10:30:50 +09:00
Dean Herbert
8402fb1490 Move to const and add some xmldoc for future visitors 2019-11-12 10:02:42 +09:00
Dean Herbert
662318a635 Merge remote-tracking branch 'upstream/master' into edit-fadeout-time 2019-11-12 09:53:16 +09:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
smoogipoo
3b13ad480a Increase fade-out time of hitobjects in the editor 2019-11-11 13:06:41 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure 2019-11-08 19:10:49 +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
smoogipoo
b1da81571f Implement slider head control point snapping 2019-11-07 14:00:12 +09:00
Dean Herbert
0df0260dd9
Disallow selections to be moved outside of the playfield (#6742)
Disallow selections to be moved outside of the playfield
2019-11-06 18:29:06 +09:00
Dean Herbert
41a8954b81
Refactor follow points to support dynamic updates (#6721)
Refactor follow points to support dynamic updates

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-06 17:43:58 +09:00
smoogipoo
2c1bfd62ef Disallow selections to be moved outside of the playfield 2019-11-06 17:28:04 +09:00
Dean Herbert
7b5b3ff15c Remove unused returns 2019-11-06 16:36:12 +09:00
Dean Herbert
7ebd5daf7d Merge remote-tracking branch 'upstream/master' into dynamic-followpoints 2019-11-06 16:33:47 +09:00
Dean Herbert
ee544e174a Group -> Connection 2019-11-06 16:33:42 +09:00
smoogipoo
2588534eda Skin entire selection, add xmldocs 2019-11-06 16:04:20 +09:00
smoogipoo
020b08b450 Initial implementation of limited distance snap 2019-11-06 15:27:48 +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
Dean Herbert
52dba69a64
Implement slider control point deletion (#6679)
Implement slider control point deletion

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-05 19:15:15 +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
d77882c21b Fix slider selection input handled outside path 2019-11-05 17:31:52 +09:00
smoogipoo
7c20a589f2 Remove unused usings 2019-11-05 13:56:21 +09:00
smoogipoo
c8beb5296f Use PlatformAction.Delete instead of Delete key 2019-11-05 13:26:44 +09:00
smoogipoo
08bd811326 Merge remote-tracking branch 'origin/master' into slider-controlpoint-deletion
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
2019-11-05 13:07:06 +09:00
Dean Herbert
66253a0bd4 Handle selection on mouse down instead of click
This is how other elements work, and feels better with drag preselection
2019-11-05 02:21:50 +09:00
Dean Herbert
bcf8a6d514 Fix slider creation regressing with path selection changes 2019-11-03 19:59:37 +09:00
Dean Herbert
f69a641d35
Merge branch 'master' into slider-controlpoint-deletion 2019-11-03 19:32:10 +09:00
Dean Herbert
1155aacd90
Update sliders when control points change (#6680)
Update sliders when control points change
2019-11-03 19:05:48 +09:00
Dean Herbert
f849926049
Merge branch 'master' into slider-controlpoint-deletion 2019-11-03 19:05:17 +09:00
Dean Herbert
4dbdfcdd3c Change control to toggle rather than always select 2019-11-03 18:41:29 +09:00
Dean Herbert
6bc62385b6
Merge branch 'master' into slider-controlpoint-selection 2019-11-03 15:28:50 +09:00
Dean Herbert
e23ea94383 Add one more level of null check 2019-11-01 15:33:38 +09:00
Dean Herbert
05002ea3e8 Move Show/Hide code to PopIn/PopOut 2019-11-01 14:50:38 +09:00
smoogipoo
41ae66d517 Update slider when control points change 2019-10-31 18:24:38 +09:00
smoogipoo
18f374eec6 Deselect deleted control points 2019-10-31 17:58:33 +09:00
smoogipoo
78194cfa6e Implement slider control point deletions 2019-10-31 17:54:09 +09:00
smoogipoo
43b2cbb865 Implement slider control point deletion 2019-10-31 17:39:57 +09:00
smoogipoo
20aeb7aaff Implement multiple selection 2019-10-31 17:25:30 +09:00
smoogipoo
8d50b155e8 Make selection happen on click only 2019-10-31 17:13:10 +09:00
smoogipoo
cfdf710676 Add test 2019-10-31 16:51:58 +09:00
smoogipoo
e23a75c64a Implement control point selection 2019-10-31 16:23:54 +09:00
smoogipoo
7a3ebcd0b1 Fix path changes not updating tail circle 2019-10-31 15:52:38 +09:00
Huo Yaoyuan
bcf8e3a9d4 Remove redundant properties from desktop projects.
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be Normalize .props 2019-10-30 21:54:14 +08: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
194e501f86
Merge branch 'master' into snapping-refactor 2019-10-26 14:20:08 +09:00
smoogipoo
da6ee05dd6 Fix not being able to drag non-snaked sliders 2019-10-25 18:37:44 +09:00
smoogipoo
607b4d874a Refactor flow of snapping through HitObjectComposer 2019-10-25 16:40:30 +09:00
smoogipoo
a6458fdeab Re-use slider type 2019-10-24 19:04:24 +09:00
smoogipoo
b7af4acdbf Allow not having a composer 2019-10-24 19:04:00 +09:00
smoogipoo
0af5706db6 Snap path during control point movement 2019-10-24 19:02:59 +09:00
smoogipoo
f45f17339c Implement slider path distance snapping 2019-10-24 18:17:30 +09:00
Dean Herbert
ef4dd3e028
Merge pull request #6580 from smoogipoo/remove-controlpoint-snap
Don't snap slider control point placement
2019-10-24 10:27:16 +09:00
smoogipoo
436941cda3 Add comment 2019-10-23 17:58:44 +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
b903edca45 Don't snap slider control point placement 2019-10-23 16:03:16 +09:00
smoogipoo
54f23cbd0d Update stacking test case values 2019-10-23 15:49:36 +09:00
Dean Herbert
e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration 2019-10-21 18:44:34 +09:00
smoogipoo
c34d3362df Fix hit circles selection area being too large 2019-10-21 17:14:08 +09:00
Dean Herbert
b157aaead1 Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration 2019-10-21 17:09:43 +09:00
smoogipoo
38c2c328ff Rename HitObject -> DrawableObject in selection blueprints 2019-10-21 17:04:56 +09:00
smoogipoo
5f8d46f666 Fix sliders not moving with stacking change 2019-10-21 16:24:06 +09:00
Dean Herbert
11e5e0decc
Merge branch 'master' into dho-apply 2019-10-21 16:05:11 +09:00
smoogipoo
96649e0a6a Fix selection blueprints not respecting stacking 2019-10-21 15:03:49 +09:00
smoogipoo
6afc27b1bd Merge remote-tracking branch 'origin/master' into dho-apply 2019-10-21 13:47:44 +09:00
Dan Balasescu
c1c803caf4
Merge branch 'master' into cursor-size-trail 2019-10-21 13:26:13 +09:00
HoLLy
68837d47df Use local bindable instead of using BindValueChanged of external one 2019-10-19 12:15:31 +02:00
HoLLy
ca957f0994 Hide gameplay cursor when resume overlay is shown 2019-10-19 11:52:07 +02:00
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply 2019-10-18 19:45:10 +09:00
smoogipoo
5dd5a070e0 Show placement grid from hitobjects at the current time 2019-10-18 19:03:19 +09:00
Dean Herbert
99ea45da41
Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid
Implement osu!'s beat snapping grid
2019-10-18 16:27:03 +09:00
smoogipoo
f1d7e7e7f6 Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration 2019-10-18 13:49:09 +09:00
smoogipoo
c4704f6a29 Add beat snap grid to the composer 2019-10-18 12:47:52 +09:00
smoogipoo
5ccdd2b203 Mask the osu! beatsnap grid 2019-10-18 12:38:43 +09:00
smoogipoo
c5ee533524 Merge branch 'dho-apply' into beatsnap-grid-integration 2019-10-18 12:38:29 +09:00
Dean Herbert
f3ed71d336 Move scoring distance constant to a central/shared location 2019-10-17 16:36:47 +09:00
Dean Herbert
f92331531c Rename grid to DistanceSnap to be more in line with its purpose 2019-10-17 15:32:02 +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
smoogipoo
79b2c7b480 Make BeginPlacement() set the hitobject start time 2019-10-16 20:04:15 +09:00
HoLLy
13e1199229 Move click to resume cursor scaling responsibility to container 2019-10-15 22:44:04 +02:00
iiSaLMaN
9dcbef49d3 Resolve DHO inside load() 2019-10-15 22:28:50 +03:00
iiSaLMaN
53b99811a2 Merge remote-tracking branch 'upstream/master' into expand-number-piece-on-old-skins 2019-10-15 21:59:28 +03:00
HoLLy
8c671d7fde Rename cursorScale and calculatedCursorScale 2019-10-15 20:12:08 +02:00
Dean Herbert
ae2fe62fd9 Use BindValueChanged 2019-10-14 17:13:36 +09:00
Dean Herbert
64a6ca28e6
Merge branch 'master' into cursor-size-trail 2019-10-14 16:35:37 +09: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
f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid 2019-10-13 18:38:57 +09:00
HoLLy-HaCKeR
7931510d7b Ensure OsuResumeCursor can change scale when it is being shown 2019-10-12 11:59:22 +02:00
HoLLy-HaCKeR
fdc17d2adb Scale OsuResumeCursor with gameplay cursor 2019-10-12 11:51:14 +02:00
HoLLy-HaCKeR
13924174c4 Fix PopIn and PopOut resetting cursor scale 2019-10-12 10:04:14 +02:00
Dean Herbert
00d4d976b7
Move editor selections relative to hitobject start positions (#6431)
Move editor selections relative to hitobject start positions
2019-10-11 19:35:11 +09:00
smoogipoo
45835f97a1 Split out grids into separate files 2019-10-11 18:41:17 +09:00
smoogipoo
2e2768870f Merge remote-tracking branch 'origin/master' into editor-selection-movement-params 2019-10-10 16:38:41 +09:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
HoLLy-HaCKeR
1c22fb485f Scale cursortrail along with cursor 2019-10-08 19:40:46 +02:00
HoLLy-HaCKeR
b6047e4613 Move OsuCursor resize logic to OsuCursorContainer 2019-10-08 19:39:54 +02:00
smoogipoo
8b661e624d Remove drag from class/method namings + refactor 2019-10-08 19:08:31 +09:00
smoogipoo
08d043f447 Move selection relative to the hitobject start positions 2019-10-08 18:57:03 +09:00
Dean Herbert
b09d9b7e1f Add todo in slider tail to avoid confusion 2019-10-08 17:56:56 +09:00
smoogipoo
a59e07948c Merge remote-tracking branch 'GSculerlor/master' into rework-selection-updates 2019-10-07 18:50:07 +09:00
smoogipoo
e265beb289 Fix merge error 2019-10-07 18:49:59 +09:00
Dean Herbert
0ebc5d0ffb
Fix cursor trail appearing regardless of the setting in replays (#6288)
Fix cursor trail appearing regardless of the setting in replays
2019-10-07 12:32:22 +08:00
Dean Herbert
179cde917b
Merge branch 'master' into rework-selection-updates 2019-10-06 15:00:56 +08:00
iiSaLMaN
2d7acef080 Fix CI issues 2019-10-03 11:06:38 +03:00
smoogipoo
652acac87f Move placement movement event to BlueprintContainer 2019-10-03 16:14:42 +09:00
iiSaLMaN
dabc224030 Fix hit circle positioning 2019-10-03 06:49:32 +03:00
iiSaLMaN
3fe5611700 Retrieve numeric version value from legacy configuration 2019-10-03 06:48:59 +03: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
smoogipoo
90ad1c5166 Add more tests for slider selection blueprint 2019-10-01 19:33:27 +09:00
smoogipoo
ba5c9547e1 Add more tests for hitcircle selection blueprint 2019-10-01 19:33:15 +09:00
iiSaLMaN
ef8f9aa276 Fix possible nullref exception 2019-10-01 08:43:03 +03:00
iiSaLMaN
5aa85968c2 Expand number piece for old skins in legacy circle pieces 2019-10-01 08:23:41 +03:00
iiSaLMaN
9e314cd664 Add expand number piece bindable to hit circle 2019-10-01 08:15:48 +03:00
iiSaLMaN
812d33f850 Add ExpandNumberPiece configuration with OsuLegacySkinTransformer 2019-10-01 08:09:01 +03:00
smoogipoo
bddaead72e Make hitobject pieces able to update dynamically 2019-09-27 18:45:22 +09:00
smoogipoo
4fc37d1137 Remove SliderPiece + HitObjectPiece 2019-09-27 18:01:55 +09:00
smoogipoo
f64fe22f36 Remove bindables from osu! selection blueprints 2019-09-27 18:00:24 +09:00
iiSaLMaN
67bed57cbd Bind value changed event of cursor trail appearence outside BDL
https://github.com/ppy/osu/pull/6270#discussion_r328899728
2019-09-27 08:46:49 +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
Salman Ahmed
0b2a025cb9
Merge branch 'master' into decrease-disc-rotation-on-rewind 2019-09-26 04:52:11 +03:00
smoogipoo
74b2e99247 Fix invalid cursor trail parts being drawn 2019-09-25 16:25:15 +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
iiSaLMaN
8fcfd82316 Add AllowSliderBallTint to skin configuration 2019-09-20 00:10:55 +03:00
iiSaLMaN
033ed2e1f5 Add setting to always tint slider ball 2019-09-20 00:10:28 +03:00
Dean Herbert
0640b2eb35
Fix judgement sizes not matching legacy skins (#6145)
Fix judgement sizes not matching legacy skins
2019-09-19 18:49:35 +09:00
Dean Herbert
3abcd898a6
Add hit lighting (#6144)
Add hit lighting

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:22 +09:00
Dan Balasescu
027d6194f2
Merge branch 'master' into add-hit-lighting 2019-09-19 18:07:29 +09:00
smoogipoo
db24cfbead Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
2019-09-19 17:57:04 +09:00
Dean Herbert
2cd7c769e1 Merge remote-tracking branch 'upstream/master' into fix-judgement-size 2019-09-19 16:32:37 +09:00
Dean Herbert
1150e9fdfb Bring other mods up-to-date 2019-09-19 01:45:42 +09:00
Dean Herbert
5901a915e7 Always update drawable hitobject state on skin change 2019-09-18 20:19:57 +09:00
Dean Herbert
aa1a625643 Add back incompatibility marker 2019-09-18 20:07:44 +09:00
Dean Herbert
cfdac956c2 Fix issues with colour and skin application 2019-09-18 20:04:49 +09:00
Dean Herbert
9c9cb8e217 Merge remote-tracking branch 'upstream/master' into traceable-mod 2019-09-18 19:36:07 +09:00
Dean Herbert
26eca5b1f4 Fix judgement sizes not matching skins stable 2019-09-18 02:56:03 +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
Bartłomiej Dach
a407e267a2 Fix PF/SD legacy mod conversion
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.

Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
Dean Herbert
624e5644a4 Change osu!catch key trigger to occur on frame before positional change 2019-09-13 23:06:35 +09:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames 2019-09-13 19:23:15 +09:00
smoogipoo
5c2c055614 Set lifetime on initial state update 2019-09-13 18:49:21 +09:00
Dean Herbert
9fc60aeefc Merge branch 'master' into reset-dho-lifetimes 2019-09-12 19:29:14 +09:00
Dean Herbert
f21e47d6d2 Move expire to DrawableHitObject 2019-09-12 19:29:08 +09:00
Dean Herbert
acdfeef1dc Improve how osu!catch stores and replays key actions 2019-09-12 18:33:46 +09:00
Dean Herbert
96efc91b51 Fix follow points not displaying on some skins 2019-09-11 14:57:42 +09:00
Dean Herbert
aea1ab7fee
Merge branch 'master' into skinned-cursortrail-2 2019-09-11 14:11:52 +09:00
Dean Herbert
6760e239a1 Fix osu! hitcircle font textures being incorrectly sized 2019-09-11 13:39:21 +09:00