1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 17:23:05 +08:00
Commit Graph

824 Commits

Author SHA1 Message Date
Pasi4K5
d5702e2955 Append incompatible mods to base.IncompatibleMods 2022-04-28 18:29:37 +02:00
Pasi4K5
d6395b14be Add incompatibilities 2022-04-28 05:15:04 +02:00
Salman Ahmed
fb6a112708 Mark OsuModTarget and OsuModSuddenDeath as mutually exclusive
`OsuModTarget` already fails on miss, so "Sudden Death" doesn't make
sense to be enabled and may only cause issues.
2022-04-26 23:27:03 +03:00
Bartłomiej Dach
e99d0f9fae
Make all OsuModObjectScaleTween implementations incompatible with each other 2022-04-07 22:38:47 +02:00
Bartłomiej Dach
5e02ba353b
Make OsuMod{Blinds,Flashlight} incompatible 2022-04-07 22:38:46 +02:00
Dean Herbert
de625125d6 Rename magnetised mod attraction strength property to match new naming 2022-04-01 13:03:48 +09:00
Henry Lin
ee65677884 Use height of playfield instead of width when randomizing the first object
This is the change discussed in #17194. The effect of this change is barely noticeable, but it makes more sense to generate the object within playfield from the start.
2022-04-01 11:57:45 +08:00
Dean Herbert
a987cda30d Rename "Aim Assist" to "Magnetised" to better suit the mod's behaviour
As proposed in https://github.com/ppy/osu/discussions/17375.
2022-04-01 12:15:52 +09:00
Dan Balasescu
ff4745be59
Merge branch 'master' into extract-random-mod-logic-2 2022-03-31 13:42:47 +09: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
Henry Lin
e44db4e726 Revert unintentional behavior change of random mod
Actually, using OsuPlayfield.BASE_SIZE.Y makes a touch more sense since it is the short side of the playfield, but I guess it is better to preserve replays than to introduce pointless breaking changes.
2022-03-25 15:13:25 +08:00
Dan Balasescu
cd5907f8da Merge branch 'master' into extract-random-mod-logic-2 2022-03-25 14:25:43 +09:00
Dan Balasescu
36772ec652
Merge pull request #17356 from apollo-dw/strict-tracking
Implement "Strict Tracking" mod in osu!
2022-03-22 07:32:36 +09:00
apollo-dw
d3742a91a8 Nest specific object classes within the mod 2022-03-20 15:56:41 +00:00
apollo-dw
52d6f083dc Only miss slider tail on untrack 2022-03-19 23:42:12 +00:00
apollo-dw
149cfd338d Use new mod-related object types for Strict Tracking 2022-03-19 18:29:44 +00:00
Noah M
78869c462a
Use .Concat() instead of chained Append
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-03-18 14:24:36 -05:00
Noah M
b4a8defe1a Make Relax and Aim assist mods incompatible 2022-03-18 14:12:36 -05:00
Henry Lin
3a71d81775 Convert the position modifier to stateless methods 2022-03-10 11:53:03 +08:00
Henry Lin
e8dbed738e Move OsuHitObjectPositionModifier to Utils/ 2022-03-09 21:52:15 +08:00
Henry Lin
8e12a067df Remove an unused property 2022-03-09 21:04:35 +08:00
Henry Lin
6a507ca11b Rename identifiers to remove references to random mod 2022-03-09 20:52:11 +08:00
Henry Lin
37328f8d24 Extract hit object positioning logic to a separate class
It is intentional to not rename the identifiers at this point to produce a cleaner diff.
2022-03-09 20:36:31 +08:00
Dan Balasescu
353b251d38 Attempt to merge conditional expression
Hoping to fix CI error, caused by older R# version.
2022-03-09 17:46:42 +09:00
Dean Herbert
75c6a676b4 Apply nullable to OsuModRandom rather than using jetbrains annotations 2022-03-09 16:58:36 +09:00
Henry Lin
e3cf2c6acd Merge getAbsoluteAngle into computeRandomisedPosition 2022-03-09 13:27:33 +08:00
Henry Lin
3ced5e7904 Rename Distance to DistanceFromPrevious 2022-03-09 13:09:33 +08:00
apollo-dw
e2001148d5 Implement strict tracking mod 2022-03-08 21:47:54 +00:00
Henry Lin
ae1c65c38d Add xmldoc 2022-03-08 12:07:10 +08:00
Henry Lin
8cfeffc085 Extract a major part of ApplyToBeatmap to a new method 2022-03-08 11:50:30 +08:00
Henry Lin
ded84cab3f Separate randomisation and object positioning logic 2022-03-08 11:45:16 +08:00
Dean Herbert
692ddd5f52 Merge branch 'master' into issues/16839-spun-out-rate 2022-02-22 14:04:45 +09:00
Kaleb
df9535d195
Update RPM calculation for readability
Multiply the 1.01 factor to the resulting RPM, not to the duration.
2022-02-13 14:28:40 -05:00
Kaleb
585bd541f3
Add missing parentheses to RPM calculation 2022-02-13 02:38:49 -05:00
Kaleb
f1535b74be
Give Spun Out mod dynamic spin rate 2022-02-13 02:16:06 -05:00
PercyDan
639d813d06
Don't override previous value
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2022-02-12 11:15:03 +08:00
PercyDan54
053f41d755
Simplify code 2022-02-12 10:06:43 +08:00
PercyDan54
2ed3d58531
Ignore short spinners for relax mod 2022-02-12 09:28:50 +08:00
mk-56
dd8fc710fa removed wiggle duration 2022-02-04 15:48:46 +01:00
Dean Herbert
2731d8e3c2
Merge pull request #16701 from LeNitrous/mod-alternate-osu
Add "Alternate" mod for osu! ruleset
2022-02-03 10:41:23 +09:00
Dean Herbert
be9df2ca11
Merge pull request #5774 from MaxOhn/aimassist-mod
Add "Aim Assist" mod
2022-02-03 10:40:43 +09:00
Bartłomiej Dach
82f9ad63f5
Fix flashlight size multiplier printing with too many decimal digits 2022-02-02 20:41:25 +01:00
Bartłomiej Dach
7463744407
Fix osu! autoplay-like mods not declaring incompatibility with AimAssist 2022-02-02 19:17:33 +01:00
Dean Herbert
6e41a6e704 Tidy up code into a presentable state 2022-02-02 16:27:16 +09:00
Dean Herbert
2e46404fe5 Remove spinner support for now 2022-02-02 16:26:00 +09:00
Dean Herbert
f07502ac5f Use simple damp easing rather than transforms 2022-02-02 16:15:06 +09:00
Dean Herbert
334ed2c9c4 Fix sliders moving before they are actually hit 2022-02-02 15:36:09 +09:00
Dean Herbert
6b31e7e9db Merge branch 'master' into aimassist-mod 2022-02-02 15:18:48 +09:00
Dean Herbert
e7d72f1823 Revert recent changes 2022-02-02 15:18:44 +09:00
Dean Herbert
a2affefb0a Avoid checking gameplay clock time in Update method 2022-02-02 14:33:17 +09:00
Dean Herbert
c7a192cc5f Only handle LeftButton and RightButton actions
There are definitely going to be other actions used in the future, which
would immediately cause this mod to fail. Limiting handling to
left/right buttons only is the correct way forward.
2022-02-02 14:04:12 +09:00
Dean Herbert
fed63abd83 Sanitise interceptor logic to now require two separate check paths 2022-02-02 14:02:48 +09:00
Dean Herbert
0036d0e26d Move alternate mod to "conversion" category 2022-02-02 13:58:13 +09:00
Bartłomiej Dach
9227211a44
Privatise shouldAlternate 2022-01-31 22:56:27 +01:00
Nitrous
40f43344f1
remove unused using 2022-01-29 23:31:26 +08:00
Nitrous
535216a0d3
rename CanIntercept to ShouldAlternate 2022-01-29 23:20:31 +08:00
Nitrous
24f9ef4005
make xmldoc more verbose 2022-01-29 22:31:04 +08:00
Nitrous
98d8b26a9c
move ModAlternate to OsuModAlternate and check if intro has ended 2022-01-29 21:49:40 +08:00
Nitrous
2326c36836
remove unused method and fix description 2022-01-29 21:09:36 +08:00
Nitrous
aa582fb0e1
add Alternate Mod 2022-01-29 20:38:12 +08:00
mk-56
35be0f24d0 fixed leading "0"s not being present infront of decimal floats 2022-01-27 00:10:15 +01:00
MK56
c17ff49427
Merge branch 'ppy:master' into Wiggle-strength-duration 2022-01-25 19:57:14 +01:00
Bartłomiej Dach
a227af75ed
Simplify flashlight parameter passing flow 2022-01-24 21:03:02 +01:00
Bartłomiej Dach
5874475dff
Extract DefaultFlashlightSize to base flashlight class 2022-01-24 21:03:02 +01:00
Bartłomiej Dach
a7c0d507ce
Rename flashlight settings to be more accurate 2022-01-24 21:03:02 +01:00
mk-56
836cb1ee32 Suggested boundary change 2022-01-24 12:16:29 +01:00
mk-56
948867898c ModeMultiplier rename 2022-01-24 11:38:52 +01:00
mk-56
a427e20090 Fixes 2022-01-24 10:38:11 +01:00
mk-56
e3ba7d9ba5 Wiggle mod expansion
Free dlc!
2022-01-24 10:24:40 +01:00
mk-56
161a2a321e Remove bindable from ModeMultiplier 2022-01-24 09:07:07 +01:00
mk-56
ed84ae0ac0 Adjust values to Bdach's refined taste 2022-01-24 00:42:43 +01:00
mk-56
955bab926f Separate the settings for each modes radiuses 2022-01-22 19:38:56 +01:00
mk-56
bd308ca38c Cleanup 2022-01-17 15:15:25 +01:00
mk-56
ee4331dda4 Merge remote-tracking branch 'origin/Liswiera-FL-changes' into Liswiera-FL-changes 2022-01-15 21:44:03 +01:00
mk-56
2a59735525 Initial commit 2022-01-15 21:43:28 +01:00
MaxOhn
b3230868cc use playfield clock 2022-01-06 16:31:30 +01:00
MaxOhn
197ada1a8c naive 10hz update 2022-01-06 16:04:38 +01:00
MaxOhn
b9d2a10530 adjustable assist strength + dont update spinner & running slider 2022-01-06 16:00:49 +01:00
MaxOhn
04d060aba3 update general playfield only once 2022-01-06 10:38:30 +01:00
MaxOhn
5a62760fe4 hold spinners & minor adjustments 2022-01-05 13:05:22 +01:00
MaxOhn
27a8bfa496 handle spinners and follow points 2022-01-04 22:17:50 +01:00
MaxOhn
612f69782b use Playfield.HitObjectContainer.AliveObjects 2022-01-04 14:29:44 +01:00
MaxOhn
168a105ed8 merged upstream 2022-01-04 09:34:02 +01:00
Joseph Madamba
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
Bartłomiej Dach
5001412a0d
Reorder easing mapping to match enum order and throw on unknown animation style 2021-11-28 15:19:12 +01:00
Bartłomiej Dach
aba9ed624a
Remove unnecessary whitespace 2021-11-28 15:16:33 +01:00
mk-56
1ae41118cd Added gravity as a default. 2021-11-27 22:59:09 +01:00
mk-56
0df97744ad Moved linear to a better place.
i decided to go with leaving it under gravity, its plenty visible and fine there, since the public enum list self orders I wasn't sure about how i could set a default that wasn't the topmost option
2021-11-27 13:34:09 +01:00
MK-56
5e56122d65 Linear approach type moved per peppys request 2021-11-26 09:48:38 +01:00
MK56
5e0763ae33 Expand the functionality of Approach different 2021-11-25 10:24:00 +01:00
ekrctb
116b857cea
Merge branch 'master' into no-scope-catch 2021-11-10 20:50:31 +09:00
Bartłomiej Dach
6d04823b05
Remove unnecessary virtual specs 2021-11-10 12:00:36 +01:00
Semyon Rozhkov
41f4f0ab5e Different setting slider description in each mod 2021-11-10 03:57:22 +03:00
Semyon Rozhkov
64bc8da14c Add "No Scope" mod implementation for Catch 2021-11-09 17:11:19 +03:00
Dean Herbert
0ecf5f201c Rename User to APIUser and move to correct namespace 2021-11-07 11:26:01 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Dean Herbert
838481bf3a
Merge pull request #15252 from jaswon/no-scope-breaks
Show cursor during breaks and spinners in no scope mod
2021-10-27 12:55:02 +09:00
Dean Herbert
d80a73b63d Use explicit primitive types 2021-10-27 12:53:02 +09:00
Bartłomiej Dach
670fcea68d
Rename some variables 2021-10-26 18:56:34 +02:00
smoogipoo
1147c6cbfc Remove unnecessary default value 2021-10-26 19:56:54 +09:00
Roxie Wattz
8b85c78b0d Add processing of Spinner approach circles 2021-10-25 20:16:45 -07:00
Dean Herbert
0757044b15 Refactor logic to work 2021-10-26 11:42:15 +09:00
Dean Herbert
e7b19cb724 Rename test and fix incorrect layout 2021-10-26 11:30:36 +09:00
Roxie Wattz
c9a2c6c031 Reworking the Ouendan 2 Hidden code AGAIN
Not finished. Will be finished in a later commit.
2021-10-25 14:09:22 -07:00
Roxie Wattz
7a92c7ab7e Move condition to separate switch statement
No clue if this is how peppy wanted me to do it but it still works
2021-10-25 00:25:32 -07:00
Roxie Wattz
cb36a23cdc
Update osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
Suggested by peppy. Changes name and description of setting

Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-10-24 22:52:10 -07:00
Roxie Wattz
d1b720af16 Add Ouendan 2 reference 2021-10-24 21:51:12 -07:00
Roxie Wattz
6b9e8dbd2e Added the ouendan 2 style hidden
Added as an option for nostalgia nerds like me
2021-10-24 21:34:40 -07:00
Jason Won
9fcb3d9dd1 NoScopeMod: show cursor during breaks + spinners 2021-10-22 18:14:32 -04:00
Dean Herbert
3a7eb7dd25 Make const private 2021-10-15 14:27:20 +09:00
Dean Herbert
6a80a417bd Use Interpolation.Lerp instead of transforms
Better handles cases where the combo may be changing faster than the
transition length.
2021-10-15 14:25:51 +09:00
Jason Won
538d980072 Rename Mod 2021-10-15 00:22:57 -04:00
Jason Won
2dfc42dd53 revert interpolation changes + fix cursor trail 2021-10-14 23:34:43 -04:00
Jason Won
23b50a054b address comments 2021-10-14 20:50:47 -04:00
Jason Won
6b1534f5a6 Add "ghost" mod for osu 2021-10-14 18:30:55 -04:00
Dean Herbert
b339c149d8 Copy BaseDifficulty to Beatmap<T> and move all write operations across 2021-10-06 15:10:45 +09:00
Dean Herbert
a92d499d7a Convert usages of BeatmapDifficulty to IBeatmapDifficultyInfo 2021-10-01 16:55:50 +09:00
smoogipoo
55ddc2c6e3 Merge branch 'master' into fix-blinds-barrel-roll-compatibility 2021-08-13 12:45:04 +09:00
Henry Lin
7251c28c4a Merge branch 'master' into mod-muted 2021-07-29 21:14:03 +08:00
Henry Lin
935984d200 Rename MetronomeBeatContainer to Metronome 2021-07-29 15:17:21 +08:00
Henry Lin
0196141335 Remove unused constants 2021-07-29 14:52:40 +08:00
Henry Lin
18e760ee91 Extract metronome from OsuModTarget 2021-07-29 14:52:18 +08:00
Henry Lin
58bbe9db7e Added muted mod 2021-07-28 18:21:08 +08:00
Dean Herbert
4a4d9b0dc6 Update description to match mania mirror implementation 2021-07-28 19:20:40 +09:00
Gabe Livengood
712bc578dc
update setting name and description 2021-07-27 17:45:52 -04:00
Salman Ahmed
ed903c60ea Fix code style issues and remove unused using directives 2021-07-27 18:24:17 +03:00
Gabe Livengood
c741366c72
review modifications: change xmldocs, change reflection method name, remove reflection method returns, simplify incompat. mod list 2021-07-27 09:01:01 -04:00
Gabe Livengood
c7c261ba03
review modifications: change xmldoc wording, configure with enum instead of bool, declare incompatibility with hr 2021-07-26 17:48:03 -04:00
Gabe Livengood
49160e4482
review modifications: maniamodmirror inheritance, reflection utilities, vertical flip option 2021-07-26 10:46:41 -04:00
Gabe Livengood
eb585a6120
Add "Mirror" mod 2021-07-25 20:40:50 -04:00
aitani9
715f3e3f7c Make blinds move correctly whenever the playfield is rotated 2021-07-22 14:07:41 -07:00
aitani9
80cb7c77b9 Calculate the diagonal length using Vector2.LengthFast instead of manually 2021-07-22 14:04:01 -07:00
aitani9
e6b28e1386 Rename origin to center for clarity 2021-07-22 14:01:31 -07:00
aitani9
283d953c4f Fix blinds moving when barrel roll mod is active 2021-07-21 14:07:00 -07:00
Henry Lin
1c6a13fca7 Disallow mistimed event firing 2021-07-20 10:31:19 +08:00
Henry Lin
a387d8df74 Use BeatSyncClock 2021-07-20 10:30:40 +08:00
Henry Lin
fdebe4b94a Code formatting fixes 2021-07-18 22:01:26 +08:00
Dean Herbert
49f0c707f6 Move approach circle hiding within BeginAbsoluteSequence 2021-07-18 22:34:28 +09:00
Dean Herbert
304eac26d3 Merge branch 'master' into osu-target-mod 2021-07-15 16:51:02 +09:00
Dean Herbert
ea87869753 Fix metronome playing during intro time 2021-07-15 16:50:55 +09:00
Dean Herbert
c38590f1ff Use a slightly more appropriate metronome sound 2021-07-15 16:43:24 +09:00
Dean Herbert
e7b78b1ea5 Adjust transform logic to hopefully be a bit easier to parse 2021-07-13 20:26:05 +09:00
Dean Herbert
4314946e10 Reorganise functions to order more logically (hitcircle before slider methods) 2021-07-13 19:37:17 +09:00
Dean Herbert
6b663037e4 Use switch for pattern matching 2021-07-13 19:37:02 +09:00
Dean Herbert
db8ffc6316
Merge branch 'master' into osu-random-mod-improvements 2021-07-13 19:31:37 +09:00
Bartłomiej Dach
63dedb36de Rename variable 2021-07-11 16:49:23 +02:00
Bartłomiej Dach
7aecafeecb Rename constant to reflect its purpose 2021-07-11 16:46:30 +02:00
Henry Lin
c181a724c6 Refactor hit object clamping 2021-07-11 22:01:28 +08:00