1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 13:22:55 +08:00
Commit Graph

4857 Commits

Author SHA1 Message Date
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
Bartłomiej Dach
7676838cc0
Apply "reflect" vernacular in nested methods 2022-12-07 23:27:02 +01:00
apollo-dw
684b16cef5 Disambiguate object flipping and reflection methods 2022-12-07 21:09:53 +00:00
apollo-dw
1776485b93 Reflect nested objects vertically in the playfield correctly 2022-12-07 20:20:11 +00:00
OliBomby
d458c3a012 Fix variable which didnt get renamed 2022-12-07 10:13:40 +01:00
OliBomby
10b5900710 made PathControlPointVisualiser generic 2022-12-07 10:13:40 +01:00
Pasi4K5
8f3023ffd9 Update ReflectHorizontally() and ReflectVertically() to use FlipSliderHorizontally() and modifySlider(). 2022-12-07 01:05:15 +01:00
Pasi4K5
91e9c27507 Rename FlipSlider() to FlipSliderHorizontally 2022-12-07 00:48:25 +01:00
Pasi4K5
30952199b8 Allow random mod to flip sliders 2022-12-07 00:40:18 +01:00
Dean Herbert
5a69656764
Merge pull request #21496 from peppy/fix-zero-length-spinners
Fix being able to place zero-length spinners
2022-12-02 19:25:00 +09:00
Dan Balasescu
ee62f3c0d3 Fix test failure
Similar to SliderPlacementBlueprint.
2022-12-02 18:32:43 +09:00
Dean Herbert
45ea183cc3 Fix being able to place zero-length spinners
Also always snap a spinner's end time using beat snap (matches stable).
2022-12-02 17:57:15 +09:00
Dean Herbert
896f2d8f74 Fix multiple instances of last hitobject time being calculated incorrectly 2022-12-01 18:04:06 +09:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
Alden Wu
815cd56f13 Add support for nonsquare smoke textures 2022-11-20 16:50:15 -08:00
Dean Herbert
12606122e3 Fix sliders not correctly taking on full available length after changing curve type 2022-11-17 13:59:07 +09:00
Dario Headley
a8c95c39ad Exclude sliderticks from the " freeze " 2022-11-14 16:18:46 +01:00
Thomas Müller-Höhne
9ef43ebd83 Fix compilation after framework-side PR updates 2022-11-12 21:24:12 +09:00
Thomas Müller-Höhne
fa8e38d9d6 Target rounded fragment shader
Compatibility with osu-framework change https://github.com/ppy/osu-framework/pull/5512
2022-11-12 17:18:23 +09:00
Dan Balasescu
606d42c679
Merge pull request #21184 from peppy/skinnable-things-cleanup
Skinnable class naming pass
2022-11-10 12:52:08 +09:00
Dan Balasescu
051f7f4c68
Merge pull request #21173 from peppy/toggle-hit-markers
Add the ability to toggle off hit marker displays in the editor
2022-11-10 12:23:53 +09:00
Dean Herbert
e19ba65f91 Remove LookupName from base ISkinComponentLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
1aa0e40f2f Add "Component" prefix to lookup naming 2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b Rename ISkinComponent to ISkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
ab458320c4 Fix some lingering inspections 2022-11-09 17:46:24 +09:00
Dean Herbert
82ff142b1b Apply nullability to osu! skinning classes 2022-11-09 13:37:09 +09:00
Dean Herbert
5e7dc34d05 Move some non-default skin files to correct namespace 2022-11-09 13:31:52 +09:00
Dean Herbert
710c224de4 Remove unused IHasMainCirclePiece interface 2022-11-09 13:31:50 +09:00
Dean Herbert
ada039151b Add the ability to toggle off hit marker displays in the editor 2022-11-08 18:07:06 +09:00
Dean Herbert
e02c477008
Merge pull request #21017 from andy840119/remove-nullable-disable-in-the-checks
Remove nullable disable in the checks.
2022-11-06 18:39:03 +09:00
andy840119
b0673636ca Remove nullable disable annotation in the osu ruleset. 2022-11-05 16:49:55 +08:00
Bartłomiej Dach
23134aea61
Update outdated comment 2022-11-04 19:48:19 +01:00
Dean Herbert
36c08b69fe Fix failing tests 2022-11-04 20:47:49 +09:00
Dean Herbert
20021551bb Fix editor selection behaviour regressions due to new path visualiser optimisation 2022-11-04 19:36:59 +09:00
Dean Herbert
e89d3840fc Adjust completion animation 2022-11-03 15:12:30 +09:00
Dean Herbert
0868c00ee8 Fix spinner centre size being updated every frame using transforms 2022-11-03 14:36:16 +09:00
Dean Herbert
62660ec92f Reorganise drawables and transforms to make more sequential sense 2022-11-03 14:21:22 +09:00
Dean Herbert
304f6f0418
Merge branch 'master' into argon-spinner-sides 2022-11-03 13:21:22 +09:00
Dan Balasescu
e4fb9119b3
Merge pull request #21060 from peppy/rename-target-practice
Rename mod "Target" to "Target Practice"
2022-11-01 20:38:15 +09:00
Dan Balasescu
947e6d41c0
Merge pull request #21056 from peppy/fix-argon-explosion-size
Fix argon hit circle outer gradient getting smaller each state application
2022-11-01 20:03:22 +09:00
Dean Herbert
cd8dc9b17b Rename "Target" to "Target Practice" 2022-11-01 19:47:20 +09:00
Dean Herbert
ff60eebe21 Fix large transform retention when adjusting accent colour of hitobject during pause 2022-11-01 19:12:59 +09:00
Dean Herbert
c179f0bb52 Fix argon hit circle outer gradient getting smaller each state application 2022-11-01 18:31:30 +09:00
Dan Balasescu
37407293aa Adjust target and hold off mod multipliers 2022-11-01 17:57:20 +09:00
Dean Herbert
8c9250285f Revert incorrect removal default value (causing a new warning) 2022-10-29 18:09:27 +09:00
Dean Herbert
19e0b9085c Remove redundant parameters 2022-10-29 00:24:33 +09:00
Dan Balasescu
74f3b9b18d
Merge pull request #20965 from peppy/reduce-slider-blueprint-overhead
Only draw path visualiser when hovered or single slider is selected
2022-10-28 16:01:30 +09:00
Dean Herbert
300ffbb500 Don't bother checking for null editorBeatmap 2022-10-28 14:35:55 +09:00
Dean Herbert
10c658e440
Ensure updateVisualDefinition is called once on load
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-10-28 14:34:24 +09:00
Bartłomiej Dach
d657005ffa
Merge branch 'master' into avoid-unnecessary-path-updates 2022-10-27 20:07:46 +02:00
Dean Herbert
7faf5cd1f6 Fix one more null edge case 2022-10-28 01:20:17 +09:00
Dean Herbert
e582d9d5a8 Remove unused using statements 2022-10-28 01:17:09 +09:00
Dean Herbert
361153f598 Fix nullref in tests due to missing EditorBeatmap dependency 2022-10-27 19:05:50 +09:00
Dean Herbert
39e0362db1 Reduce size of spinner blueprint to better represent gameplay size 2022-10-27 16:15:22 +09:00
Dean Herbert
0c7672e124 Avoid unnecessarily refreshing SliderBodyPiece's path 2022-10-27 16:02:04 +09:00
Dean Herbert
2f172b66cf Block hover if a multi-selection is made to avoid overlapping path visualisers 2022-10-27 14:52:46 +09:00
Dean Herbert
097d310d74 Only draw path visualiser when hovered or single slider is selected 2022-10-27 14:40:14 +09:00
Dan Balasescu
2d829c3beb
Merge pull request #20945 from peppy/fix-misplaced-slider-head
Fix slider heads getting misplaced after flipping in editor
2022-10-27 12:51:27 +09:00
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