h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 16:57:48 +08:00
Code Issues Releases Wiki Activity
61,855 Commits 3 Branches 657 Tags 371 MiB
a938b810b4
Commit Graph

1749 Commits

Author SHA1 Message Date
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
NullifiedJosh
0e38ff07c7
Check if relax is one of the mods, if so hide. 2022-09-23 20:19:56 +08:00
Drison64
86a09ad2cf Rename ClampToPlayField 2022-09-21 17:14:02 +02:00
Ondřej Vajďák
cc21e42e35
Merge branch 'master' into fix-catch-clamp 2022-09-21 11:35:58 +02:00
Drison64
a4fae37013 Fixed tests failing 2022-09-20 19:45:39 +02:00
Drison64
6b1cd1bce3 Clamped JuiceStream to Playfield, but broke few tests 2022-09-20 19:13:40 +02:00
Drison64
4958421303 Moved X clamping from X to EffectiveX 2022-09-19 17:26:04 +02:00
Drison64
6d7d80a4fb Made X position value of CatchHitObject clamp to CatchPlayfield's width 2022-09-18 17:29:08 +02:00
Dean Herbert
d0b8409de5 Apply more renames 2022-09-18 18:19:00 +09:00
Dean Herbert
c7f8f948b9 Rename CreateLegacySkinProvider to CreateSkinTransformer and apply to all skins 2022-09-15 20:18:10 +09:00
cdwcgt
857e943b8d
hide catchcombo when Hud hide 2022-09-12 19:14:08 +09:00
andy840119
3d7367a842 Move the CreateConvertibleReplayFrame() into the base ruleset class for avoid api breaking change in the customized ruleset. 2022-09-10 11:07:23 +08:00
andy840119
e62999fb16 Merge branch 'master' of https://github.com/ppy/osu into remove-the-nullable-disable-in-the-ruleset 
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Osu/OsuRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
#	osu.Game/Rulesets/Ruleset.cs
 2022-09-10 10:40:12 +08:00
Dean Herbert
8cfeaa28a0
Merge pull request #19774 from josh-codes/master 
Add basic touch support for osu!catch
 2022-09-09 17:15:46 +09:00
Dean Herbert
bffc9555bf Adjust visuals slightly further (and remove double-gray application) 2022-09-09 16:12:54 +09:00
Dean Herbert
f3fc8af6ee Adjust visuals 2022-09-09 16:04:37 +09:00
Dean Herbert
64eaf461ac Simplify input handling even further 2022-09-09 16:04:37 +09:00
Dean Herbert
ba951b76f7 Unify and simplify input handling code 2022-09-09 15:28:40 +09:00
Dean Herbert
e6ba95ee16 Don't bother calculating active keys if input source was not handled 2022-09-09 15:22:12 +09:00
Dean Herbert
a42c1af09e Tidy up highlighting code and ensure read-only access to dictionary by highlight areas 2022-09-09 15:21:20 +09:00
Dean Herbert
715e9018da Tidy up code and naming 2022-09-09 15:11:26 +09:00
Dean Herbert
2709a4d398 Ensure overlay is always shown when movement is detected on mouse or keyboard 2022-09-09 15:04:25 +09:00
Josh
888d8b2817
Removed redudent code & converted use of OnDrag to OnMouseMove` 2022-09-08 20:39:53 +08:00
Dean Herbert
b9afe6f4cf Tidy up code quality 2022-09-08 19:44:29 +09:00
Dean Herbert
4f22616860 Rename class to match osu! version 2022-09-08 19:44:24 +09:00
Josh
161c54df1c
Refactor UI and add drag support 2022-09-03 14:14:34 +08:00
Josh
40ff2d50dd
Refactor UI and add drag support 2022-09-03 02:31:58 +08:00
Josh
7168cb27c5
Merge branch 'master' into master 2022-09-03 00:52:58 +08:00
Dean Herbert
6a35b233e5 Merge branch 'master' into remove-dispose-updates 2022-09-01 23:03:19 +09:00
Dean Herbert
105aa01e7d Update usages of RemoveInternal 2022-08-29 15:57:40 +09:00
Dean Herbert
a215d009fe Update Remove/RemoveRange/RemoveAll calls in line with framework changes 2022-08-29 15:57:40 +09:00
Dean Herbert
90b9c02ac6 Remove "internal" identifier as unnecessary 2022-08-29 14:01:15 +09:00
Dean Herbert
f5710d8000 Add ruleset API versioning 2022-08-22 16:35:08 +09:00
Josh
be7367b90e Invert the dash and normal hits. 2022-08-15 17:52:26 +08:00
Josh
ff497c452f Fix formatting + Add tests + fix touch UI 2022-08-15 17:23:29 +08:00
naoei
45e9eda9e7 Localise hit result name 2022-08-14 14:57:02 -04:00
Josh
09e45f39b2 Add the touchinputfield file because it was untracked 2022-08-13 19:55:47 +08:00
Josh
757d236e14 Add the UI file 2022-08-13 18:55:31 +08:00
Josh
fa2ebe1d5f add basic touch functionality 2022-08-13 18:02:29 +08:00
naoei
3e38baca3c Change ruleset mod description types 2022-08-10 16:09:11 -04:00
andy840119
1fe7e4d19a Use non-nullable instead in the catch ruleset. 2022-08-02 00:45:47 +08:00
Nitrous
9088caa377
move LegacyComboCounter to osu.Game.Skinning 2022-07-28 08:36:26 +08:00
andy
88db835e76
Merge branch 'master' into remove-nullable-disable-in-the-mods-for-catch-ruleset 2022-07-26 15:37:30 +08:00
andy840119
9c2f6103c5 Following the suggestion to mark the property as nullable. 2022-07-21 19:30:04 +08:00
Dean Herbert
aca19a005e Add versioning to difficulty calculators 2022-07-21 18:15:25 +09:00
為什麼
91bc7b9381 Mark the class as non-nullable. 
Not the safe way but got no better idea.
 2022-07-20 20:24:51 +08:00
andy840119
53e61c5041 Remove the nullable annotation in the catch ruleset. 2022-07-20 20:24:51 +08:00
Salman Ahmed
4210ec6502 Merge branch 'master' into remove-score-multiplier-on-custom-mod-settings 2022-07-19 19:21:26 +03:00
Salman Ahmed
8f80a22ef9 Fix osu! and catch hitobjects no longer scaled to 1 by default 2022-07-19 07:00:13 +03:00
Salman Ahmed
1051009827 Change bindable properties in all HitObjects to be lazily initialised 2022-07-19 05:39:10 +03:00
Salman Ahmed
32ba58109b Remove score multiplier on difficulty-increasing mods with customised settings 2022-07-18 07:29:03 +03:00
為什麼
1725a76fa0 Remove the nullable disable annotation for all rulesets. 2022-07-10 10:15:27 +08:00
為什麼
857377e145 Move CreateConvertibleReplayFrame() into legacy ruleset interface because technically only legacy ruleset use it to convert the legacy frame. 
But seems some of the customized ruleset use it for save the replay frame.
 2022-07-10 10:15:27 +08:00
Dean Herbert
c95eb2d2c1 Fix incorrect case in CatcherArea parameter 2022-07-06 14:28:50 +09:00
andy840119
19721a9bbb Remove the nullable disable annotation and fix the breaking api. 2022-07-02 13:33:05 +08:00
Dan Balasescu
0fd2c010e5 Remove NRT disables from attributes classes 2022-06-27 16:07:15 +09:00
Dan Balasescu
0579780bb8 Add IBeatmapOnlineInfo parameter and use to extract more data 2022-06-27 16:07:15 +09:00
Dean Herbert
31a447fda0 Update parameter discards 2022-06-24 21:26:19 +09:00
Bartłomiej Dach
26c5b59f6d
Replace usages of string.To{Lower,Upper}() 2022-06-24 11:57:45 +02:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Dan Balasescu
6d2a2ba7d6 Rename Position -> Index 2022-06-09 18:49:11 +09:00
apollo-dw
66a6467403 Pass object position to the object 2022-05-26 19:26:14 +01:00
apollo-dw
30b9e0e7ab Use object list size for object position 2022-05-24 16:30:25 +01:00
Gabe Livengood
252bacc8d4 revert more testing leftovers... 2022-05-24 10:56:31 -04:00
Gabe Livengood
dde0756bed add accuracy challenge mod 2022-05-24 10:23:44 -04:00
apollo-dw
26985ca8af Store hitobject history in the hitobject 2022-05-22 16:26:22 +01:00
Dan Balasescu
64a371638e
Merge pull request #18236 from peppy/snap-unification 
Add `enum` to snap method as alternative to multiple nested invocations
 2022-05-20 11:35:05 +09:00
Dean Herbert
c0abce918f Add enum to snap method as alternative to mutliple nested invocations 2022-05-12 16:19:07 +09:00
Dean Herbert
c7e9bd7751
Merge branch 'master' into catch-editor-per-object-sv 2022-05-09 19:18:01 +09:00
Dan Balasescu
45c6f5edef
Merge pull request #18158 from ekrctb/fix-banana-shower-placement-negative-duration 
Fix duration is negative while placing banana shower in catch editor
 2022-05-09 11:26:06 +09:00
ekrctb
158f134260 Fix duration is negative while placing banana shower in catch editor. 
Timeline blueprint is glitched when the hit object has negative duration.
Negative duration is unwanted anyways so placement implementation is fixed instead of supporting it in timline blueprint.
 2022-05-09 00:01:05 +09:00
ekrctb
483a611c41 Fix BeginPlacement location. 2022-05-08 23:10:51 +09:00
ekrctb
7daa3d8eb7 Remove now-redundant velocity calculation 
Velocity is computed from the up-to-date SV now.
 2022-05-08 22:36:33 +09:00
ekrctb
37c9aac49f Make ScrollingPath use time instead of distance. 
This is consistent as other components now use time instead of distance.
 2022-05-08 22:36:33 +09:00
ekrctb
670922c8e5 Use latest slider velocity for juice stream velocity computation. 
This fixes one-frame glitch in editor when slider velocity is changed.
 2022-05-08 22:36:33 +09:00
ekrctb
0e98bb28bd Fix wrong resampling times are used for juice stream path 2022-05-08 22:36:33 +09:00
ekrctb
9ffa90602b Automatically set slider velocity from juice stream path 2022-05-08 22:36:33 +09:00
ekrctb
4e0155fa4b Make JuiceStreamPath time based instead of distance based. 
And remove the "slope limit" feature.
TODO: for a juice stream with a large slope, the slider velocity of the hit object should be changed.
 2022-05-08 22:36:33 +09:00
ekrctb
125628dd20 Fix hit object not shown in timline while placement is waiting 2022-05-08 15:52:14 +09:00
Dean Herbert
f6fc926f1a Add xmldoc and rename methods in IPositionSnapProvider for legibility 2022-05-05 15:58:21 +09:00
Dean Herbert
faeefc5e18
Merge pull request #16576 from frenzibyte/osu-distance-spacing 
Add "distance spacing" support in editor for osu! ruleset
 2022-05-03 12:15:18 +09:00
Dean Herbert
93db6c6bb0 Move FastRandom to LegacyRandom in osu.Game project 2022-04-28 17:47:32 +09:00
Salman Ahmed
b6d2ca7709 Clarify TODO comment 2022-04-28 10:57:14 +03:00
Salman Ahmed
bfc6bfc91b Let CatchHitObjectComposer inherit from DistancedHitObjectComposer and hide control 2022-04-28 06:44:50 +03:00
Salman Ahmed
8ed39009fd Encapsulate distance spacing control handling to a "distance toolbox composite" 
Encapsulated in a way which can allow further extensibility for the
right-side area of toolboxes.
 2022-04-24 08:33:03 +03:00
Salman Ahmed
4f8f27a58b Merge branch 'master' into osu-distance-spacing 2022-04-24 05:23:30 +03:00
Salman Ahmed
61078910a6 Handle all skin component types explicitly 2022-04-23 03:34:05 +03:00
Dean Herbert
0cac935939 Shorten class name of ModCreatedReplayUser 2022-03-31 11:34:23 +09:00
Dean Herbert
4b2c01a8c1 Bring all mod implementations up-to-date 2022-03-29 16:59:03 +09:00
Dean Herbert
d2d88015e3 Update all cinema/autoplay mods to specify the system user ID 2022-03-28 22:22:56 +09:00
Dean Herbert
6fb06d69cc
Merge branch 'master' into pp-counter-alloc-reduction 2022-03-15 13:31:57 +09:00
Dan Balasescu
523f668c8c Remove unnecessary ctor argument 2022-03-15 12:37:39 +09:00
Dan Balasescu
daac933498 Remove unnecessary ctor arguments 2022-03-15 12:34:58 +09:00
Dan Balasescu
59d57a44d4 Prevent incorrect usages by hard-typing ctor type 2022-03-15 09:11:59 +09:00
Dan Balasescu
3fff7f4b7e Require ScoreProcessor to receive ruleset 2022-03-14 15:51:10 +09:00
Dan Balasescu
4a3e3aba65 Restructure PerformanceCalculator to not require ScoreInfo argument 2022-03-14 14:25:28 +09:00
Dan Balasescu
c36badab4b Add per-ruleset score multipliers for classic scoring 2022-03-10 10:26:09 +09:00
Dan Balasescu
84e82ef5e4 Add XMLDocs to difficulty attribute properties 2022-02-16 14:09:19 +09:00
Salman Ahmed
19ee05c232 Add "distance spacing" multiplier for osu! ruleset 
While osu!catch also implements a distance snap grid, it doesn't rely on
`GetBeatSnapDistanceAt` (unlike osu!), therefore it can't have the
"distance spacing" multiplier yet.
 2022-02-15 02:21:53 +03:00
Bartłomiej Dach
82f9ad63f5
Fix flashlight size multiplier printing with too many decimal digits 2022-02-02 20:41:25 +01:00