1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:33:01 +08:00
Commit Graph

4967 Commits

Author SHA1 Message Date
Dean Herbert
bd72c67d68 Increase the rate of slider ball fade on argon skins to match other implementations 2023-05-02 15:47:35 +09:00
Dean Herbert
67f83f246b Add more padding around playfield in editor to avoid overlap with tool areas
Closes #23130.
2023-05-02 15:37:02 +09:00
Dean Herbert
e3c384c6b5 Merge branch 'master' into sample-control-points 2023-05-02 14:38:39 +09:00
OliBomby
27cfadca16 add sample info to Banana and SpinnerBonusTick 2023-05-01 14:54:06 +02:00
Dean Herbert
0a70734331 Adjust ripple size with cursor scale (including CS) 2023-05-01 14:43:49 +09:00
Dean Herbert
5cbfefbcb4 Adjust metrics of default ripple to match stable default better 2023-05-01 13:29:50 +09:00
Dean Herbert
b8ae508639 Fix incorrect starting scale for ripples 2023-05-01 13:09:00 +09:00
OliBomby
41d4894aa3 add min and max value to SliderVelocity 2023-04-30 19:32:24 +02:00
OliBomby
4a0ff046ae pass new hitobject properties through beatmap converters 2023-04-30 19:20:42 +02:00
OliBomby
1eb2e35dff fix ticks not being generated by default 2023-04-30 16:03:58 +02:00
Dean Herbert
72b472a756 Change default scaling and add note about legacy cursor-ripple scale 2023-04-30 14:48:03 +09:00
Dean Herbert
6a62949fcd Fix positioning and rewinding support for ripples 2023-04-30 14:48:03 +09:00
Dean Herbert
c994adfc22 Add pooling support for ripples 2023-04-30 14:48:03 +09:00
Dean Herbert
a4ae9e409b Implement ripples (legacy and default) 2023-04-30 14:48:03 +09:00
Dean Herbert
b39a9d816e Add basic structural requirements for cursor ripples 2023-04-30 14:48:03 +09:00
OliBomby
c44f71a737 remove all regular usage of DifficultyControlPoint 2023-04-26 17:55:38 +02:00
OliBomby
9f8d7bccba fix usings 2023-04-26 17:34:02 +02:00
OliBomby
d97daee96b remove all non-test usage of SampleControlPoint 2023-04-26 13:55:39 +02:00
OliBomby
6c70948681 Remove IContext & add IHasGenerateTicks 2023-04-26 13:10:57 +02:00
OliBomby
e4b64bdc3e clean up code stuff 2023-04-25 19:06:29 +02:00
OliBomby
66eda40cdf fix implementations of IHasSliderVelocity 2023-04-25 18:22:22 +02:00
OliBomby
065464d90c Fixed DifficultyPointPiece 2023-04-25 18:12:53 +02:00
OliBomby
97910d6be6 remove unused directives 2023-04-25 13:06:37 +02:00
OliBomby
891b87a5ff remove ApplyLegacyInfo method 2023-04-25 12:52:21 +02:00
OliBomby
ea1e6e9798 Add LegacyContext 2023-04-25 12:12:46 +02:00
OliBomby
a4c6850ab2 made the SampleControlPoint and DifficultyControlPoint obsolete 2023-04-25 11:34:09 +02:00
Dan Balasescu
ad51f880e0 Remove overrides on DC/NC mods 2023-04-10 17:49:29 +09:00
Dan Balasescu
15f6bc155e Add progressive score multiplier for HT 2023-04-10 13:35:48 +09:00
Dan Balasescu
c923482976 Add progressive score multiplier for DT 2023-04-10 13:31:48 +09:00
Dean Herbert
45e3e3623b Fix spinners being selectable for too long after they fade in the editor
The actual visual extension is only applied to `HitCircle`s (which does include slider
start / end), and should not be applied to spinners in the first place.

Addresses https://github.com/ppy/osu/discussions/22949.
2023-03-28 18:49:59 +09:00
Dean Herbert
ad5bdf6511 Merge branch 'master' into fix-ubo-not-bound 2023-03-22 16:46:39 +09:00
Dean Herbert
c056d5a6fb Reduce distance requirement for lock-in behaviour 2023-03-20 15:36:58 +09:00
Dean Herbert
13a32b5246 Move lock-in variable to const and document better 2023-03-20 15:36:27 +09:00
Salman Ahmed
678e8ed736 Update UBO usages inline with framework changes 2023-03-16 14:06:35 +03:00
Dean Herbert
7b34607676 Merge branch 'master' into bubble_mod_implementation_clean 2023-03-16 13:45:22 +09:00
Dean Herbert
42359a9754 Fix previous touch action not being released when it's not a direct touch 2023-03-15 16:43:20 +09:00
Dean Herbert
6c4f596a9a Make osu! touch input aware of the distance travelled of a non-direct touch 2023-03-15 16:43:20 +09:00
Dean Herbert
969c0e9c9d Merge branch 'master' into veldrid-renderer 2023-03-14 17:35:38 +09:00
Dan Balasescu
069b77dd23 Update language version 2023-02-25 02:15:56 +09:00
Dan Balasescu
dd9748a25c Adjust DrawNodes to use UBOs 2023-02-25 01:42:55 +09:00
Dean Herbert
a8c692a215
Merge pull request #22635 from peppy/use-overlays-container-more
Use `Overlays` container rather than `KeyBindingInputManager` for flashlight
2023-02-22 18:30:21 +09:00
Dean Herbert
ee87a29376
Merge pull request #22543 from Cwazywierdo/hitcircle-late-miss-fade
Fix hit circle late-miss fading differences compared to stable
2023-02-21 13:56:57 +09:00
MK56
b74c1c8334
Merge branch 'master' into bubble_mod_implementation_clean 2023-02-19 21:36:59 +01:00
Bartłomiej Dach
8a488ebccc
Actually simplify condition 2023-02-19 16:39:35 +01:00
Adam
58d64cdbd0 Clarify usingHiddenFading logic 2023-02-18 17:33:33 -06:00
Bartłomiej Dach
6b9472c367
Merge branch 'master' into skin-per-ruleset-layouts 2023-02-17 22:58:38 +01:00
Dean Herbert
675e5b81f3 Fix SkinnableLighting showing up as a user placeable component 2023-02-17 18:24:05 +09:00
Adam
e06502085e Enable fading when hidden only hides appreach circles 2023-02-16 16:31:42 -06:00
mk56-spn
d5bc8e2941 Code cleanup pass:
Make bubble transform logic more sane.

Extract bubble `getPosition()` method.

Address poorly named variables.
2023-02-16 11:12:30 +01:00
Dean Herbert
7afdcb9383 Merge branch 'master' into hide-resume-overlay 2023-02-16 15:42:14 +09:00
mk56-spn
8fc35b159f Remove dysfunctional slider colouring 2023-02-15 10:04:50 +01:00
mk56-spn
297963b461 Remove BubbleInfo struct and consume DrawableOsuHitObjects directly 2023-02-15 10:00:46 +01:00
mk56-spn
1d1c794ccf Invert pointless nested if statement 2023-02-15 09:37:47 +01:00
mk56-spn
e9a7d90273 make transform duration for bubble a method instead of a variable 2023-02-15 09:33:18 +01:00
mk56-spn
82292d6162 Make colouring for bubble more intuitive and remove unnecessary alpha assignment 2023-02-15 09:30:56 +01:00
Adam
5e774a28d8 Correct timings to match stable exactly + don't fade with hidden 2023-02-15 01:02:54 -06:00
Dean Herbert
da8ab7143b
Merge branch 'master' into maximum-judgement-offset-in-hit-object 2023-02-15 14:48:15 +09:00
mk56-spn
5db624159b Change bubble rewind removal to be in ApplyToDrawableHitObject method. 2023-02-14 18:06:43 +01:00
mk56-spn
92c61c7339 move logic for bubble invoking to ApplyToDrawableHitobject()` method 2023-02-14 16:31:34 +01:00
mk56-spn
2d49b5f9d6 Move bubbles to ruleset overlays container 2023-02-14 14:03:48 +01:00
mk56-spn
d100a4a491 Make lastJudgedHitObject nullable, and fix typo in name. 2023-02-14 10:12:37 +01:00
Dean Herbert
c540d78fbc Expose the actual KeyBindingInputManager
Turns out that `CreateInputManager` is called more than once, and some
mods (ie. `InputBlockingMod`) rely on consuming the "main" one. So let's
go back to accessing and exposing in `DrawableOsuRuleset` rather than
storing out own reference.
2023-02-14 18:10:26 +09:00
Dean Herbert
5ec5222d8a Expose and consume OsuInputManager explicitly 2023-02-14 17:36:07 +09:00
Pasi4K5
e4b84ebd0b Add UseResumeOverlay and use it for hiding the ResumeOverlay 2023-02-13 23:51:39 +01:00
mk56-spn
6ff6e06a69 Simplify bubble container structure, modify some comments 2023-02-12 11:37:07 +01:00
mk56-spn
5e0c4aa904 Refactor pooling for bubbles, tweak the animations a tad, add some clarifying comments 2023-02-12 00:59:46 +01:00
Adam
7bad0113cd Move early fade effect to classic mod setting 2023-02-09 16:20:11 -06:00
Adam
d027d69913 Make hit circle fade out into late miss judgement 2023-02-06 19:22:47 -06:00
mk56-spn
f0d4b9f0ca Add inline comment for colour border override 2023-02-06 17:00:47 +01:00
Dean Herbert
abcb564a74 Code quality pass of OsuModBubbles 2023-02-06 17:35:43 +09:00
Dean Herbert
a67d5d2a14 Merge branch 'master' into bubble_mod_implementation_clean 2023-02-06 17:24:20 +09:00
Bartłomiej Dach
49443f0b55
Inline temporary variable 2023-02-04 14:36:30 +01:00
Bartłomiej Dach
a1343dacc1
Merge branch 'master' into SnapToReverseSlider 2023-02-04 14:14:37 +01:00
Wleter
60f6484073 fix spaces 2023-02-03 16:13:37 +01:00
Wleter
f7f13cb9d9 fix formatting 2023-02-03 16:13:04 +01:00
Wleter
20e220df56 prioritize closest snap position 2023-02-03 16:05:16 +01:00
Wleter
23e9bdd554 check every snap position in blueprint 2023-02-02 14:22:30 +01:00
Dean Herbert
10df64467a
Merge pull request #22430 from peppy/skin-editor-nrt
Apply NRT to all skin editor classes
2023-02-02 13:57:57 +09:00
Bartłomiej Dach
a14481acca
Merge pull request #22440 from peppy/argon-hit-lighting-v2
Adjust argon hit lighting further
2023-01-30 19:34:58 +01:00
mk56-spn
3bdf83bf44 Redo the drawable structure of bubbledrawable to run and look better 2023-01-29 00:48:14 +01:00
mk56-spn
66da4c0288 Add colouration to the sliders to better match the vibrancy of the mod 2023-01-28 17:38:24 +01:00
mk56-spn
c3090dea5f Simplify animations 2023-01-28 00:30:30 +01:00
mk56-spn
7c81f1e75b Remove unnecessary BDL from bubble drawable
Improve animation duration formula
2023-01-27 12:53:19 +01:00
MK56
c50604f701
Merge branch 'master' into bubble_mod_implementation_clean 2023-01-27 11:58:56 +01:00
Dean Herbert
98c9ba5b6f
Merge branch 'master' into skin-editor-nrt 2023-01-27 19:35:43 +09:00
Dean Herbert
74ab036f3e Refactor SkinnableSound.Samples to be non-nullable 2023-01-27 19:32:30 +09:00
Dean Herbert
2b55e05b10 Adjust argon hit lighting further 2023-01-27 13:31:21 +09:00
Bartłomiej Dach
c4dce30de5
Merge pull request #22412 from peppy/argon-kiai
Add very basic kiai flash to argon hit circles
2023-01-26 19:13:58 +01:00
Dean Herbert
7344d34d5b Move where class specs to next line 2023-01-26 17:12:41 +09:00
Dean Herbert
13937cf555
Merge branch 'master' into stream-tool-2 2023-01-26 16:08:20 +09:00
Dean Herbert
de1d473d29 Fix kiai flash being visible and incorrectly sized during hit animation 2023-01-26 15:24:10 +09:00
Dan Balasescu
9ed0b8ccfa
Merge pull request #22375 from peppy/osu-ruleset-touch-support
Add empty space tap-streaming support for osu! ruleset on touchscreen devices
2023-01-26 08:12:12 +09:00
Bartłomiej Dach
73f53328cf
Merge branch 'master' into argon-kiai 2023-01-25 22:21:26 +01:00
Bartłomiej Dach
3daa9e6295
Merge branch 'master' into argon-hit-lighting-peppy-take 2023-01-25 21:44:43 +01:00
Dean Herbert
48d68b0f4f Add very basic kiai flash to argon hit circles 2023-01-25 18:59:26 +09:00
Dean Herbert
9499d3a20a Add support for disabling "hit lighting" with osu! argon skin 2023-01-25 15:50:49 +09:00
Dean Herbert
1cde90d55d Add note about CheckScreenSpaceActionPresJudgeable being naive 2023-01-25 15:03:47 +09:00
Dean Herbert
5bfd4e47a1 Refactor position tracking touch handling (and comments) to read better 2023-01-25 14:59:54 +09:00
Dean Herbert
d8365f4fca Reverse order of application to match DrawableHitObject 2023-01-25 11:47:15 +09:00
Dean Herbert
3a47be6e00 Fix argon hit circles occasionally going missing during editor seeking 2023-01-24 17:43:14 +09:00
Dean Herbert
a966d6c330
Merge pull request #18402 from ggliv/mod-accuracy-challenge
Add accuracy challenge mod
2023-01-24 16:00:55 +09:00
Dean Herbert
3cd810f332
Merge pull request #22265 from Wleter/SliderEnd-Snap
Add snapping sliderends with nearby objects
2023-01-24 13:43:43 +09:00
Dean Herbert
72cfe2ba5a Move private field up with others 2023-01-24 12:30:11 +09:00
Dean Herbert
949610c8a4 Add commentary as to why ReceivePositionalInputAt override is required 2023-01-24 11:06:54 +09:00
Pasi4K5
8b47af6503 Remove HidesResumeOverlay and set ResumeOverlay to null in OsuModAutopilot 2023-01-24 00:49:09 +01:00
Susko3
a992682276 Fix OsuTouchInputMapper not handling all touches when using screen scaling 2023-01-23 21:46:01 +01:00
Bartłomiej Dach
7483967157
Merge branch 'master' into SliderEnd-Snap 2023-01-23 21:33:16 +01:00
Dean Herbert
c4d5957ac3 Add empty space tap-streaming support for osu! ruleset on touchscreen devices 2023-01-23 17:07:27 +09:00
Dean Herbert
73f083a316 Refactor how additional points are provided to avoid confusion 2023-01-23 14:13:46 +09:00
Pasi4K5
75a1a2ec2f Hide ResumeOverlay when OsuModAutopilot is enabled 2023-01-22 03:44:59 +01:00
ekrctb
7e466e1eba Fix SPM calculation division by zero 2023-01-20 21:00:01 +09:00
ekrctb
11e1b22bf5 Move MaximumJudgementOffset to HitObject
We want to access this property for computing lifetime
2023-01-19 21:23:55 +09:00
Wleter
f8d8a627b8 change property name 2023-01-18 22:00:39 +01:00
Wleter
ab78dd0436 add collection of selection points. 2023-01-18 21:34:23 +01:00
Dean Herbert
ecb4727aec Fix formatting issues 2023-01-18 17:33:14 +09:00
Dean Herbert
3630b41a5b Remove unused usings 2023-01-18 13:13:20 +09:00
Wleter
00f15d19f9 fix double newlines 2023-01-17 21:11:21 +01:00
Gabe Livengood
dfbbc4002c address test failure 2023-01-17 10:22:58 -05:00
Dean Herbert
00996c9f47 Remove unnecessary touch interception from OsuInputManager 2023-01-17 19:11:22 +09:00
Dean Herbert
70cb23bbc9
Merge branch 'master' into mod-accuracy-challenge 2023-01-17 16:46:54 +09:00
Dean Herbert
24a626a9cd Fix incorrect touch handling in autopilot and relax mods 2023-01-17 15:07:05 +09:00
Dean Herbert
3b95691d53 Add note about mouse button disable tracking 2023-01-17 14:54:52 +09:00
Dean Herbert
45b34f5306 Remove pointless xmldoc 2023-01-17 14:53:24 +09:00
Dean Herbert
34120b6131 Use linq Single instead of First for guaranteed singular match 2023-01-17 14:52:45 +09:00
Dean Herbert
9b5d6b391b Remove nullability allowance from BackgroundDependencyLoader 2023-01-17 14:52:15 +09:00
Dean Herbert
c6d33df147 Only track TouchSource for now 2023-01-17 14:51:46 +09:00
Dean Herbert
b3860c6d52 Only use positional input from most recent touch 2023-01-16 21:21:00 +09:00
Dean Herbert
606e374d94 Don't handle touch down events if "mouse" buttons are disabled
Maintains compatibility with existing logic.
2023-01-16 21:21:00 +09:00
Dean Herbert
355bec2058 Handle movement locally as we are blocking events from touch->mouse mapping 2023-01-16 21:21:00 +09:00
Dean Herbert
b265888f18 Add bare minimum touch support to osu! ruleset 2023-01-16 21:21:00 +09:00
ansel
9ce7c51b14 Localise osu! settings 2023-01-15 23:29:58 +03:00
mk56-spn
ca84b885dc Add more detail to bubbles 2023-01-11 17:51:41 +01:00
MK56
f9b42161e3
Merge branch 'master' into bubble_mod_implementation_clean 2023-01-11 14:56:21 +01:00
Dean Herbert
e9571be4ab Fix incorrect application layer causing completely discoloured circles 2023-01-11 19:29:17 +09:00
Dean Herbert
0d1046ed83 Add full colour application to kiai sprites 2023-01-11 19:29:17 +09:00
Wleter
98ffcd33c7
Merge branch 'ppy:master' into SliderEnd-Snap 2023-01-10 21:22:13 +01:00
Wleter
e5863fbaf1 add ScreenSpaceEndPoint field 2023-01-10 21:20:09 +01:00
Wleter
38bb7ac0c7 add fields for path's end location 2023-01-10 21:16:34 +01:00
Salman Ahmed
760b2d98df Tint "argon" slider follow circle with combo colour 2023-01-04 16:19:30 +03:00
Salman Ahmed
d70df08f45 Tint "argon" slider ball with combo colour 2023-01-04 16:19:16 +03:00
Berkan Diler
c7ca4bbba5 Use generic Enum methods 2022-12-26 20:36:39 +01:00
mk56-spn
8a108b143e Address mod incompatibilities 2022-12-25 23:11:15 +01:00
mk56-spn
bbb22479a8 Add "ModBubbles" for the osu ruleset. 2022-12-25 23:09:52 +01:00
Dean Herbert
5e9fb1063a Move judgement text creation to base class and tidy things up 2022-12-24 12:22:36 +08:00
Dean Herbert
03603f8b54 Don't show great or higher judgements when using argon "pro" skin 2022-12-24 03:35:44 +08:00
Dean Herbert
727ac00f6d Combine base class for JudgementPiece 2022-12-24 03:32:13 +08:00
Berkan Diler
08d2fbeb8e Use new ArgumentNullException.ThrowIfNull throw-helper API 2022-12-22 21:27:59 +01:00
Dean Herbert
192536643c Fix some more inspections 2022-12-16 20:21:19 +09:00
Dean Herbert
27c497145f Fix the MOTHERLOAD of undetected issues that are now visible thanks to net6.0 2022-12-16 18:16:26 +09:00
Dean Herbert
d6cae991da Update netstandard2.1 references to net6.0 2022-12-16 17:16:13 +09:00