Bartłomiej Dach
4db01fc970
Merge branch 'master' into fix-time-snapping-when-nearby-objects
2022-10-26 23:31:17 +02:00
Bartłomiej Dach
8b8d0c2293
Fix typo in comment
2022-10-26 23:30:14 +02:00
Dean Herbert
674ae9e742
Refactor DrawableSliderHead to never update the drawable position
...
Slider heads are guaranteed to always be drawn at (0,0). This fixes
weird behaviour in the editor, but also simplifies things in the
process. Win-win.
Closes #20644 .
2022-10-26 15:26:22 +09:00
Dean Herbert
d03161ec01
Apply distance snap time component even when nearby object snap kicks in
2022-10-26 14:39:39 +09:00
Dean Herbert
7d59bc6e2f
Merge branch 'grid-momentary-shortcuts' into read-current-distance-snap
2022-10-26 13:28:04 +09:00
Dean Herbert
54ae16badc
Move distance snap toggle button implementation to DistancedHitObjectComposer
2022-10-26 13:27:23 +09:00
Bartłomiej Dach
48057412f5
Merge branch 'master' into grid-momentary-shortcuts
2022-10-25 22:17:08 +02:00
Dean Herbert
521fbd2ea3
Merge pull request #20345 from mk56-spn/Freeze_frame_implementation
...
Add "Freeze Frame" mod
2022-10-26 01:28:23 +09:00
D.Headley
f4aae9138b
Remove Incompatibility with HD
2022-10-25 08:48:45 +02:00
Dean Herbert
2f0283e4d4
Simplify logic with new multi-grid snap support
2022-10-25 14:22:30 +09:00
Dean Herbert
2b850694fa
Merge branch 'allow-distance-grid-snap' into grid-momentary-shortcuts
2022-10-25 14:10:45 +09:00
Dean Herbert
02a3f8c17f
Allow both distance snap and grid snap to be applied at the same time
2022-10-25 14:09:22 +09:00
Dean Herbert
279ef556e3
Fix typon in comment
2022-10-25 13:27:26 +09:00
Dean Herbert
588fc750cd
Change approach circles to all appear at the same time, but don't adjust AR
2022-10-25 13:26:32 +09:00
Dean Herbert
995216cced
Merge pull request #20819 from Joppe27/taiko-kiai-flashing
...
Implement taiko hitobject kiai flashing
2022-10-24 15:31:13 +09:00
Bartłomiej Dach
c0709a59f5
Merge branch 'master' into argon-spinner-sides
2022-10-23 18:44:04 +02:00
Dean Herbert
645a84b1d6
Display current distance snap and add button to update to use it
2022-10-21 22:58:36 +09:00
Dean Herbert
bcd65f3c3c
Merge pull request #20827 from goodtrailer/smoke-uncapped-v3
...
Remove smoke point maximum
2022-10-21 19:58:49 +09:00
Dean Herbert
ca91f9f716
Don't allow two momentary toggles at the same time to avoid edge cases
2022-10-21 17:16:55 +09:00
Dean Herbert
ef990c55ca
Handle distance/grid toggles based on key type, rathern than individual left/right
2022-10-21 16:11:19 +09:00
Alden Wu
23b7b9013e
Change smoke quadbatch growth factor to 2 from 1.5
2022-10-20 23:37:05 -07:00
Dean Herbert
7dbd6e2469
Merge branch 'master' into taiko-kiai-flashing
2022-10-21 12:48:35 +09:00
Dan Balasescu
e577a87618
Merge pull request #20825 from peppy/fix-argon-editor-combo-colour-change
...
Fix some argon circle layers not getting correct colour updates in editor
2022-10-20 12:56:34 +09:00
Salman Ahmed
7d31eaea54
Move ball tinting logic to overwrite SliderBall colour
2022-10-20 03:55:53 +03:00
Salman Ahmed
eb386d4bd5
Enable slider ball tint in default legacy skin
2022-10-20 03:29:25 +03:00
Salman Ahmed
ba37daa456
Bring back removed newline
2022-10-20 01:18:10 +03:00
Salman Ahmed
1852714d2d
Fix existing alpha transform cleared on accent colour change
...
Clearing it causes its start value to be lost.
2022-10-20 01:16:27 +03:00
Dean Herbert
966dd786ae
Don't consume keys when handling momentary snap toggles
2022-10-20 00:00:24 +09:00
Dean Herbert
830b92d3ae
Add momentary shortcuts to toggle grid/distance snap
...
Matching osu!stable. I use these quite a lot while mapping and I'm sure
others do as well.
Hold `Shift` = invert grid snap
Hold `Alt` = invert distance snap
2022-10-19 20:06:41 +09:00
Dean Herbert
aca0d04834
Forcefully remove transforms before reapplying to avoid old accent colour getting rewound
2022-10-19 15:52:25 +09:00
Dean Herbert
9356a40a39
Remove redundant flash layer colour logic
...
In a previous iteration, the flash layer was white on the initial hit,
but this seems to have been removed for the final implementation.
2022-10-19 15:13:22 +09:00
Alden Wu
50ab9bff8b
Rename for consistency
2022-10-18 23:05:09 -07:00
Alden Wu
a9b8ba94fa
Add necessary newlines
2022-10-18 22:59:58 -07:00
Alden Wu
343c560b1b
Remove smoke point maximum/cap
2022-10-18 22:54:17 -07:00
Dean Herbert
16c86b0744
Merge pull request #20815 from frenzibyte/remove-hitcircle-fade-easing
...
Remove fade easing from legacy hit circles to match stable
2022-10-19 12:08:45 +09:00
Dean Herbert
299131c985
Merge pull request #20816 from frenzibyte/adjust-slider-fade-parameters
...
Adjust slider fade out transition to match stable
2022-10-19 12:04:24 +09:00
Joppe27
59213fc00b
Update LegacyMainCirclePiece to use renamed version of KiaiFlashingDrawable
2022-10-18 23:53:12 +02:00
Joppe27
a76a039722
Rename KiaiFlashingDrawable and move to osu.Game
2022-10-18 23:40:43 +02:00
Salman Ahmed
13e2323791
Adjust fade out duration to match stable
2022-10-18 23:48:51 +03:00
Salman Ahmed
3b3f3dc159
Fix new-style spinners fading in later than usual
2022-10-18 23:48:40 +03:00
Salman Ahmed
03edfce822
Remove fade easing from sliders
2022-10-18 23:43:42 +03:00
Salman Ahmed
d46bc7f72a
Adjust fade out time to match stable
2022-10-18 23:43:31 +03:00
Salman Ahmed
2245456224
Remove fade easing from legacy hit circles on hit
2022-10-18 22:22:53 +03:00
D.Headley
764bc1948f
remove commented out Incompatible mod
2022-10-18 14:59:43 +02:00
D.Headley
acf3498f83
Code Quality
2022-10-18 13:49:10 +02:00
Dario Headley
e1a8bfa135
Fixed approachCircle preempt
2022-10-18 13:40:13 +02:00
Dean Herbert
6a7f6c76ff
Fix osu! editor padding being applied to toolboxes
...
The result of https://github.com/ppy/osu/pull/20739 and https://github.com/ppy/osu/pull/20738 having unintended side effects when applied together.
2022-10-18 14:32:00 +09:00
Dan Balasescu
09500882c2
Merge pull request #20767 from frenzibyte/no-scope-no-smoke
...
Hide cursor smoke in "No scope" mod
2022-10-17 19:06:08 +09:00
Salman Ahmed
2adbf4cc1a
Add arc-shaped progress bars to "argon" spinner
2022-10-17 08:58:47 +03:00
Bartłomiej Dach
148da4d423
Merge branch 'master' into argon-judgement-in-front
2022-10-15 22:42:41 +02:00
Salman Ahmed
7e9229a117
Merge branch 'master' into no-scope-no-smoke
2022-10-15 16:42:34 +03:00
Dean Herbert
b72c117333
Merge pull request #20756 from goodtrailer/smoke-rotation-fix
...
Fix smoke shaking when gameplay is paused
2022-10-15 19:14:04 +09:00
Alden Wu
46bcabea6c
Separate smoke rotation seed and index
2022-10-14 12:42:04 -07:00
Salman Ahmed
ba72f13f54
Merge branch 'master' into hide-mouse-on-keyboard-input
2022-10-14 22:26:30 +03:00
Salman Ahmed
b1b97505ac
Fix smoke displayed in "No scope" mod
2022-10-14 22:16:14 +03:00
Alden Wu
029f896db8
Use StatelessRNG for smoke rotation
2022-10-13 16:18:47 -07:00
Alden Wu
310588ad94
Renew smoke rng every draw
2022-10-13 13:01:05 -07:00
Dean Herbert
dd372c4d19
Move "argon" skin judgement text in front of hitobjects
2022-10-13 13:52:02 +09:00
Salman Ahmed
09cc89cfa0
Update existing usages of Cursor to handle null value
2022-10-13 00:17:08 +03:00
D.Headley
f67f6cc99c
Fix switch case
2022-10-12 19:45:08 +02:00
D.Headley
83aedb1930
Make mod use new Combo, remove pointless test
2022-10-12 12:42:26 +02:00
Dean Herbert
8bf4ca4b53
Add legacy skin fallback when beatmap skin is providing resources
2022-10-12 17:47:20 +09:00
Salman Ahmed
84fdd2e107
Improve flashlight display on break periods
2022-10-11 17:16:57 +03:00
Dan Balasescu
083a13f041
Merge pull request #20680 from peppy/fix-slider-ball-editor-rewind
...
Fix slider ball facing incorrect direction during rewinding in editor
2022-10-11 17:47:17 +09:00
Dean Herbert
f060e6a780
Implement hold "sliding" samples in osu!mania
2022-10-11 16:31:37 +09:00
Dean Herbert
5a5f3af27d
Rename property and add xmldoc
2022-10-10 15:42:08 +09:00
Dean Herbert
33620b7bd6
Fix slider ball facing incorrect direction during rewinding in editor
...
Closes https://github.com/ppy/osu/issues/20648 .
2022-10-10 15:24:18 +09:00
Salman Ahmed
2d4f390372
Remove non-smoke key bindings on "Relax" mod instead
2022-10-09 17:14:16 +03:00
Salman Ahmed
c89a55043e
Fix smoke being blocked with "Relax" mod enabled
2022-10-09 15:28:12 +03:00
OliBomby
b22e201289
Fixed stream convert float precision edge case
2022-10-08 23:43:23 +02:00
MK56
8fe89d5de2
Merge branch 'ppy:master' into Freeze_frame_implementation
2022-10-07 22:23:51 +02:00
Dean Herbert
e0c66dbdbc
Merge pull request #20566 from smoogipoo/adjust-flashlight
...
Adjust flashlight to more closely match classic scaling
2022-10-07 15:23:42 +09:00
Dan Balasescu
4e6047f23d
Merge pull request #20571 from peppy/argon-mania
...
Add "argon" key area for osu!mania
2022-10-07 15:19:18 +09:00
Dan Balasescu
bce20e0a59
Merge branch 'master' into adjust-flashlight
2022-10-07 14:45:30 +09:00
Dean Herbert
4980e53c9c
Merge pull request #20376 from goodtrailer/smoke
...
Add cursor "smoke" trails
2022-10-07 03:41:07 +09:00
Alden Wu
9d54467145
Make smoke skinnable lifetime more robust
2022-10-05 19:13:06 -07:00
Alden Wu
49e023f861
Rename OsuSkinComponents.SmokeTrail to CursorSmoke
2022-10-05 19:11:38 -07:00
Dean Herbert
590af4cb7c
Merge branch 'master' into argon-mania
2022-10-05 19:37:59 +09:00
Dan Balasescu
b6db36dcca
Merge pull request #20580 from peppy/approach-circle-fade-out
...
Hide approach circles immediate on successful hit
2022-10-05 19:17:57 +09:00
Dean Herbert
365a78d358
Merge branch 'master' into smoke
2022-10-05 18:58:18 +09:00
Dean Herbert
8f0ef99e10
Privatise some fields
2022-10-05 18:54:14 +09:00
Dean Herbert
bd82dfc333
Remove custom radius implementation
2022-10-05 18:53:07 +09:00
Dean Herbert
91d877e893
Set LifetimeEnd once rather than computing on every access
2022-10-05 18:52:01 +09:00
Dean Herbert
71edd314b1
Simplify SmokeContainer lifetime logic
2022-10-05 18:51:02 +09:00
Dean Herbert
6628ab5190
Refactor to avoid DI / event flow
...
There's always one active smoke segment and it's the direct child of
`SmokeContainer`. This can be simplified as such.
2022-10-05 18:37:14 +09:00
Dean Herbert
1e5ff2679b
Rename classes to better emphasise that Smoke is a single trail segment
2022-10-05 18:29:16 +09:00
Dean Herbert
04abb2ce8f
Update default cursor smoke implementation to use a texture
2022-10-05 18:26:17 +09:00
Dean Herbert
52002d91dd
Only apply dim at top level objects
2022-10-05 17:48:56 +09:00
Dean Herbert
56d424003d
Fix sliders not dimming correctly due to modified miss window
2022-10-05 14:25:04 +09:00
Dean Herbert
44b99444a7
Hide approach circles immediate on successful hit
2022-10-05 13:42:04 +09:00
Dean Herbert
c2956c6e1e
Add osu! hit object dim
...
Stable would dim objects when they can't be hit (ie. the "miss" window
is not active yet). This was never implemented in lazer, and causes
quite large visual differences.
No one has mentioned this yet, but it will definitely be one of those
missing pieces which makes lazer feel different to stable.
2022-10-04 17:28:17 +09:00
Alden Wu
33f33a6845
Remove things that should've been removed before push
2022-10-04 00:53:03 -07:00
Dean Herbert
395ab58892
Attempt to fix code style infractions
2022-10-04 16:17:38 +09:00
Alden Wu
b0a948df45
Move LegacySmoke animation implementation to Smoke
2022-10-04 00:17:00 -07:00
Dean Herbert
326a3e6583
Add TODO in osu! argon transformer regarding missing components
2022-10-04 14:56:46 +09:00
Alden Wu
eaab0deef3
Fix InspectCode issues
2022-10-03 19:20:51 -07:00
Alden Wu
ccef189b81
Add barebones test for smoke
2022-10-03 18:19:05 -07:00
Alden Wu
343bdaa98e
Remove unnecessary IsActive variable
2022-10-03 16:07:39 -07:00
Alden Wu
c1da3bc9cf
Remove skinnable parents at the same time as their smoke children
2022-10-03 16:03:37 -07:00
Alden Wu
929eb8559e
Fix LegacySmoke alpha calculations
2022-10-03 16:02:33 -07:00
Dean Herbert
0bac5ef465
Merge branch 'master' into smoke
2022-10-03 21:29:42 +09:00
Dan Balasescu
8598eb29f8
Adjust flashlight to closely match classic
2022-10-03 18:38:05 +09:00
Dan Balasescu
1890a66b28
Merge pull request #20509 from o-dasher/cleanup-setting-sources
...
Removes unnecessary setting sources specifications
2022-09-28 17:55:42 +09:00
Dan Balasescu
cbed268ac9
Merge pull request #20510 from sw1tchbl4d3r/high_bpm_judgements
...
Clamp `LifetimeStart` of `HitObject`s to their judgement windows
2022-09-28 17:49:35 +09:00
sw1tchbl4d3
0cffbb7562
Clamp LifetimeStart of HitObject's to their judgement windows
2022-09-27 16:54:24 +02:00
o-dasher
f3e25eacad
Removes unnecessary setting sources specifications
2022-09-27 09:25:58 -04:00
abstrakt
6e1edc4d8d
Use the StackedEndPosition to determine the jump distance in the FlashlightEvaluator.
...
Signed-off-by: abstrakt <abstrakt.osu@gmail.com>
2022-09-26 14:06:35 +02:00
Dean Herbert
a7449380cd
Fix osu! slider ticks appearing too late
2022-09-26 14:11:59 +09:00
o-dasher
537796c3a1
Cleanup mod bindings
2022-09-25 15:49:22 -04:00
Dean Herbert
965d0603ce
Fix slider tick colour not being applied properly
2022-09-23 21:11:25 +09:00
Dean Herbert
a94b4e402e
Merge branch 'master' into argon-spinner
2022-09-23 14:22:53 +09:00
Salman Ahmed
49af80e17b
Remove 1.3x scale and adjust metrics with it
2022-09-22 20:39:42 +03:00
Salman Ahmed
e9c3478f69
Add very basic "argon" spinner
2022-09-22 20:39:42 +03:00
Dean Herbert
3811ea113d
Adjust argon animations a bit
2022-09-23 00:54:24 +09:00
Dan Balasescu
9f92925ecd
Merge branch 'master' into argon-cursor
2022-09-22 21:46:37 +09:00
Dan Balasescu
44ae9a5048
Merge pull request #20403 from peppy/argon-follow-point
...
Add very basic follow point implementation for argon skin
2022-09-22 21:45:56 +09:00
Dean Herbert
e95758cfcd
Add basic "argon" cursor
2022-09-22 21:21:30 +09:00
Dean Herbert
8875f7ee43
Add very basic follow point implementation for argon skin
...
This is just something to look better than the glowing mess which
triangles fallback was providing. This element hasn't been designed yet,
so I'm just filling in with something amicable for the time being.
2022-09-22 20:24:29 +09:00
Dan Balasescu
5dbe73ad0e
Merge pull request #20398 from peppy/fix-missing-notelock-shake
...
Fix "note lock" shake not always animating
2022-09-22 20:07:38 +09:00
Dan Balasescu
a612fe70f9
Merge pull request #20401 from peppy/fix-argon-sprite-lookup
...
Fix "argon" skin not supporting user loaded sprites in gameplay
2022-09-22 19:40:31 +09:00
Dan Balasescu
68e274b92d
Merge pull request #20400 from peppy/fix-argon-reverse-arrow-colour
...
Fix argon reverse arrow becoming white after switching skins
2022-09-22 19:01:19 +09:00
Dean Herbert
74aefdc5bd
Move basic transformer behaviour to base abstract class
2022-09-22 18:53:43 +09:00
Dean Herbert
f8e9a960ba
Fix argon skin not forwarding resource lookups to user backing
2022-09-22 18:53:43 +09:00
Dean Herbert
ea7c5458fe
Fix sprite dropdown not showing resources from non-legacy skins during gameplay
2022-09-22 18:53:43 +09:00
Dean Herbert
68015ef10c
Fix argon reverse arrow becoming white after switching skins
2022-09-22 18:12:28 +09:00
Dean Herbert
0458305a23
Add argon judgement bubbles
2022-09-22 17:50:21 +09:00
Dean Herbert
c354e828af
Merge pull request #20385 from B3nn1/slider-controlpoint-snapping
...
Add snapping for slider control points in the editor
2022-09-22 15:06:47 +09:00
Dean Herbert
749053481a
Update osu! hitobject implementation to avoid triggering ClearInternal
2022-09-22 15:04:20 +09:00
Dean Herbert
b844d76311
Move Shake logic local to hitcircle/slider
2022-09-22 15:04:20 +09:00
Dan Balasescu
70bab81282
Merge pull request #20377 from peppy/argon-skin
...
Add new default "argon" skin
2022-09-22 14:50:43 +09:00
Dean Herbert
2bdc6417e9
Mark DrawableOsuHitObject abstract for clarity
2022-09-22 14:44:03 +09:00
Dean Herbert
9bbb53af40
Merge pull request #20370 from Pasi4K5/random-mod-customisation
...
Add mod settings `AngleSharpness` and `AngleVariety` to the random mod
2022-09-22 13:52:41 +09:00
B3nn1
112bbe2296
Always use Parent.ToScreenSpace() in PathControlPointVisualiser
2022-09-21 18:56:22 +02:00
B3nn1
5d54354588
Add missing ToScreenSpace() call
2022-09-21 18:53:25 +02:00
Dean Herbert
4492a26b59
Merge branch 'master' into argon-skin
2022-09-21 13:00:16 +09:00
Dan Balasescu
1e9b60f07f
Merge pull request #16524 from stanriders/move-td-reduction
...
Fix touch device difficulty reduction not affecting star rating
2022-09-21 12:51:14 +09:00
B3nn1
368229f324
Remove unnecessary brackets
2022-09-21 01:25:01 +02:00
B3nn1
fe9e8635fc
Fix snapping of already existing slider control points in the editor
2022-09-21 01:04:39 +02:00
Pasi4K5
b1ecac514a
Correct comments
2022-09-20 23:13:38 +02:00
Pasi4K5
b7c1e8cc5a
Remove setting AngleVariety
2022-09-20 23:11:38 +02:00
Alden Wu
092e6cfa1d
Lock smoke bounds to playfield
2022-09-20 12:03:07 -07:00
Alden Wu
ddbd69dc67
Replace LifetimeAfterSmokeEnd with abstract LifetimeEnd
2022-09-20 09:44:01 -07:00
Dan Balasescu
3ec16063bd
And another invalidate
2022-09-20 21:01:18 +09:00
Dan Balasescu
102c140967
Remove another invalidate
2022-09-20 20:59:58 +09:00
Dan Balasescu
c28ed477e1
Expose less stuff, clean up implementation
2022-09-20 20:54:49 +09:00
Dan Balasescu
ff6e4e3a96
Privatise setters
2022-09-20 20:42:12 +09:00
Dan Balasescu
9f23210e7e
Use British-English
2022-09-20 20:40:20 +09:00
Dan Balasescu
5d3c6efcc5
Dispose quad batch
2022-09-20 20:40:20 +09:00
Dan Balasescu
f7962c993d
Reduce the number of points
2022-09-20 20:40:20 +09:00
Dan Balasescu
5d73de9021
Perform matrix mults on the GPU
2022-09-20 20:40:20 +09:00
