1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 22:02:54 +08:00
Commit Graph

1748 Commits

Author SHA1 Message Date
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
f9ebdadfe8 Move right-side editor toolbox to base HitObjectComposer
Move right-side editor toolbox to base `HitObjectComposer`
2023-04-04 19:00:56 +09:00
Dean Herbert
a394036279
Merge pull request #23020 from rrex971/fix-ar-cs-catch-less-than-1
Allow AR and CS values below 1.0 for osu!catch Difficulty Adjust mod
2023-04-03 15:30:05 +09:00
Dean Herbert
836c884aae Fix circle-size based scale being applied twice to caught fruit
Closes #22968.
2023-03-29 18:03:22 +09:00
rrex971
9426633a05 Allow AR and CS values below 1.0 for Catch the Beat Difficulty Adjustment mod 2023-03-27 20:39:13 +05:30
Bartłomiej Dach
3183f5cee2
Merge branch 'master' into revert-result-in-playfield 2023-02-19 16:33:10 +01:00
Bartłomiej Dach
3ee046000e
Merge branch 'master' into revert-result-in-playfield 2023-02-16 21:54:29 +01:00
Dean Herbert
76f7accd13 Standardise all local SkinComponentsContainerLookup variables to containerLookup 2023-02-16 15:33:56 +09:00
Dean Herbert
a92e42bb84 Rename SkinnableTargetContainer to SkinComponentsContainer
Also use full `SkinComponentsContainerLookup` instead of the sub-type.
This will potentially be useful once we bring in per-ruleset targets.
2023-02-15 18:37:41 +09:00
Dean Herbert
8bbd00822c Simplify and rename SkinnableTargetComponentsContainer 2023-02-15 17:30:21 +09:00
Dean Herbert
f0406c34fd Merge branch 'master' into revert-result-in-playfield 2023-01-25 17:35:33 +09:00
ekrctb
812a4b412a Move judgement result revert logic to Playfield
Previously, some judgement results were not reverted
when the source DHO is not alive (e.g. frames skipped in editor).
Now, all results are reverted in the exact reverse order.
2023-01-19 19:57:13 +09:00
Dean Herbert
70cb23bbc9
Merge branch 'master' into mod-accuracy-challenge 2023-01-17 16:46:54 +09:00
ekrctb
1f8b7b8f03 Remove #nullable disable from CaughtObject 2023-01-15 23:21:38 +09:00
ekrctb
d664a66a37 Remove redundant canBeNull: true 2023-01-15 23:11:59 +09:00
ekrctb
086604cd14 Remove #nullable disable from Catch.Objects.Drawables
Except DrawableCatchHitObject, it complains in base(hitObject) call.
2023-01-15 17:29:35 +09:00
ekrctb
b88091262d Remove #nullable disable from Catch.UI 2023-01-15 17:29:35 +09:00
ekrctb
b08a1e3a0b Remove #nullable disable from misc Catch files 2023-01-15 17:29:35 +09:00
ekrctb
56fb315f32 Remove #nullable disable from Catch.Objects 2023-01-15 17:29:35 +09:00
ekrctb
2468911f4b Remove #nullable disable from Catch.Judgements 2023-01-15 17:29:32 +09:00
ekrctb
3ab3f556ae Remove #nullable disable from Catch.Difficulty 2023-01-15 17:29:32 +09:00
ekrctb
b049244b75 Remove #nullable disable from Catch.Beatmaps 2023-01-15 17:29:32 +09:00
ekrctb
a75fc5108a Remove #nullable disable from Catch.Edit namespace 2023-01-15 17:29:32 +09:00
Dylan Nantz
6028abff39 Code Quality 2023-01-13 10:16:52 -05:00
Dylan Nantz
5dd0aaccef Merge branch 'master' of https://github.com/ppy/osu into 18469 2023-01-13 09:54:29 -05:00
Dylan Nantz
e38075c4ef Use PlacementState to check juice stream placement 2023-01-13 09:37:23 -05:00
Dean Herbert
98483d2a1b
Merge pull request #21638 from Mogiiii/touchscreen-control-disable-mouse
Disable touchscreen controls responding to mouse in scrolling gamemodes
2023-01-06 20:39:09 +08:00
Salman Ahmed
efbd9ba4b9 Fix catcher not moving when fully hidden in "No Scope" mod 2023-01-03 15:28:05 +03:00
Berkan Diler
335cb0205f Remove now unnecessary using 2022-12-26 22:50:36 +01:00
Berkan Diler
c7ca4bbba5 Use generic Enum methods 2022-12-26 20:36:39 +01:00
Dean Herbert
e8a0f8996c Remove unused osu!catch ArgonJudgementPiece 2022-12-24 03:35:27 +08:00
Dean Herbert
727ac00f6d Combine base class for JudgementPiece 2022-12-24 03:32:13 +08:00
Dean Herbert
4a7d7c6ed9 Use MaxBy in all locations that can and update inspection level to match dotnet-build 2022-12-19 16:47:10 +09:00
Dean Herbert
d6cae991da Update netstandard2.1 references to net6.0 2022-12-16 17:16:13 +09:00
Dylan Nantz
f5cc2f6ed5 remove unnecessary using 2022-12-14 11:19:16 -05:00
Dylan Nantz
ee945c9b58 disable mouse input to touchscreen controls 2022-12-14 10:34:21 -05:00
Dean Herbert
775952380f Remove unused using statements 2022-12-13 18:57:17 +09:00
Dylan Nantz
0dd4e0cf94 hide cursor in catch 2022-12-12 21:18:01 -05:00
Dylan Nantz
4ab7ef9af9 Show distance snap for first juice stream object. Fixes #18469 2022-12-05 15:12:50 -05:00
Bartłomiej Dach
7f68fe429f
Remove unused using directive 2022-11-30 20:01:59 +01:00
Bartłomiej Dach
285248d554
Fix potential null dereference in CatchPlayfield 2022-11-30 20:01:11 +01:00
Dean Herbert
5ce2d6f54a Hide the game mouse cursor when playing osu!catch with relax mod 2022-11-30 18:13:53 +09:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
Hồ Nguyên Minh
3f8c4a5dff Stack Catch dash/normal touch input vertically 2022-11-13 17:09:43 +07:00
Dean Herbert
1aa0e40f2f Add "Component" prefix to lookup naming 2022-11-09 17:46:43 +09:00
Dean Herbert
e75c3b3f94 Rename SkinnableTarget to GlobalSkinLookup 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
2952dbc8fb Apply nullability to osu!catch skinning classes 2022-11-09 13:58:58 +09:00
andy840119
4d4d7cf863 Remove nullable disable annotation in the cache ruleset. 2022-11-05 16:49:55 +08:00
Dean Herbert
a985151e31 Fix incorrect constant 2022-10-29 18:07:17 +09:00
Dean Herbert
40efa1603b Adjust metrics to make banana lens flares look better 2022-10-28 19:35:50 +09:00
Dean Herbert
e87b541c58 Add fade to banana's lighting as it approaches the catcher
This also avoids using the `UprightScalingContainer` (and allows for
scale adjust in the process).
2022-10-28 18:29:59 +09:00
Dan Balasescu
eeee928f73
Merge pull request #20946 from peppy/argon-catch
Add first pass osu!catch "argon" skin
2022-10-28 15:45:46 +09:00
Dean Herbert
9969c00ead
Apply two minor fixes from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-10-28 10:19:53 +09:00
Dean Herbert
d48f95cf7c Use shader based implementation instead of sprites 2022-10-27 19:01:10 +09:00
Dean Herbert
8a80cb55bd Remove unused catcher animation state for now 2022-10-26 18:55:47 +09:00
Dean Herbert
44f55ed152 Add argon osu!catch hit explosion 2022-10-26 18:55:47 +09:00
Dean Herbert
8a513003ce Add argon droplet 2022-10-26 18:55:47 +09:00
Dean Herbert
14a4fad6f1 Remove unused VisualRepresentation 2022-10-26 18:55:47 +09:00
Dean Herbert
2deaae270c Fix catcher not consdiering allowable catch range 2022-10-26 18:55:47 +09:00
Dean Herbert
0a8a13f529 Add argon banana piece 2022-10-26 18:55:47 +09:00
Dean Herbert
a475ca848d Add rotation to fruit pieces 2022-10-26 18:55:47 +09:00
Dean Herbert
4ff4de00b3 Add argon fruit design 2022-10-26 18:55:47 +09:00
Dean Herbert
81bb00c258 Add argon transformer for osu!catch (and basic new catcher design) 2022-10-26 18:55:47 +09:00
Dean Herbert
f8a4af5e0e Add osu!catch read-distance-spacing implementation 2022-10-26 13:45:06 +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
Dean Herbert
2f0283e4d4 Simplify logic with new multi-grid snap support 2022-10-25 14:22:30 +09: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
1e09a21279 Remove unused using statement 2022-10-21 19:55:58 +09:00
Dean Herbert
16f5c2a7c6 Apply same fix to osu!catch composer 2022-10-21 17:15:36 +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
ccbac08985
Merge pull request #20593 from ekrctb/catch-editor-height
Allow arbitrary height catch editor
2022-10-18 12:10:49 +09:00
Dean Herbert
1778120f3e Add inline comment mentioning binding issues 2022-10-18 12:10:30 +09:00
Salman Ahmed
ba72f13f54 Merge branch 'master' into hide-mouse-on-keyboard-input 2022-10-14 22:26:30 +03:00
Salman Ahmed
09cc89cfa0 Update existing usages of Cursor to handle null value 2022-10-13 00:17:08 +03:00
Dean Herbert
8bf4ca4b53 Add legacy skin fallback when beatmap skin is providing resources 2022-10-12 17:47:20 +09:00
Dean Herbert
f3e85d2302 Fix initial state being wrong due to BindValueChanged call in BDL load 2022-10-12 15:26:26 +09:00
Dean Herbert
ea3d08d5a0 Fix collision of external hide with internal logic in LegacyCatchComboCounter 2022-10-12 15:26:26 +09:00
Dean Herbert
2e3e4ac5be Update CatchComboDisplay to use NRT 2022-10-12 15:26:26 +09:00
Dean Herbert
652bc4ac61 Update CatchComboDisplay implementation to use newly exposed bindable 2022-10-12 15:14:33 +09:00
Dean Herbert
d2d589a156 Expose HUD state via Player 2022-10-12 15:11:52 +09:00
Dean Herbert
a10fda2843
Merge branch 'master' into catch-combo-hide 2022-10-12 15:00:35 +09:00
Dean Herbert
b444f0fd0b
Merge pull request #20714 from frenzibyte/improve-flashlight-on-break
Improve flashlight display on break periods
2022-10-12 13:10:12 +09:00
Salman Ahmed
84fdd2e107 Improve flashlight display on break periods 2022-10-11 17:16:57 +03:00
Dean Herbert
f41b79688f Avoid casting by accepting all Playfields but throwing on a bad choice 2022-10-11 16:54:41 +09:00
ekrctb
6ab29a62d0 Anchor drag box on time (catch, mania)
Not done for taiko because I cannot figure out how it should work with the overlapping scroll algorithm.
2022-10-11 14:23:17 +09:00
Dan Balasescu
bce20e0a59 Merge branch 'master' into adjust-flashlight 2022-10-07 14:45:30 +09:00
Dan Balasescu
c6b5fdc7d0 Adjust catch flashlight to closely match classic 2022-10-07 14:34:48 +09:00
Dean Herbert
994db55b6d Simplify check conditionals 2022-10-07 02:22:13 +09:00
NullifiedJosh
c73195fa77
Merge branch 'ppy:master' into catch-hide-in-relax 2022-10-06 18:52:59 +08:00
NullifiedJosh
6543171169
Fix formating. 2022-10-06 18:30:49 +08:00
NullifiedJosh
0f6a6287f2
Fix bugs and add test 2022-10-06 18:17:33 +08:00
ekrctb
9247ff3e0a Allow changing scrolling speed in catch editor
Scroll speed is not saved and doesn't affect gameplay.
It is purely a feature for a better visualization.
It is currently bind to scroll speed increase/decrease.
Default F3/F4 crashes with editor shortcuts so it has to be changed.
2022-10-06 18:06:16 +09:00
ekrctb
e8cd9a5d11 Allow arbitrary height catch editor
Useful because can see more notes at once.
2022-10-06 17:26:03 +09:00
o-dasher
f3e25eacad Removes unnecessary setting sources specifications 2022-09-27 09:25:58 -04:00
o-dasher
578f1e1e6c Fixes SizeMultiplier binding 2022-09-25 16:28:03 -04:00
o-dasher
537796c3a1 Cleanup mod bindings 2022-09-25 15:49:22 -04:00