1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 05:37:31 +08:00
Commit Graph

4265 Commits

Author SHA1 Message Date
apollo-dw
add9b4a7a4 Merge branch 'master' into evaluators 2022-06-13 12:16:22 +01:00
apollo-dw
e7602563fb Fetch lastlast object from beatmap, not objects list 2022-06-10 10:28:14 +01:00
Gabe Livengood
2fe34f188f shamelessly copy osumodmagnetised 2022-06-09 18:52:10 -04:00
Gabe Livengood
569c39942a replace easement with easing 2022-06-09 18:26:18 -04:00
Gabe Livengood
4e01db03bb don't specify icon 2022-06-09 18:25:04 -04:00
Gabe Livengood
6e883a69d9 revert slider radius parameter addition 2022-06-09 18:07:37 -04:00
Dan Balasescu
6d2a2ba7d6 Rename Position -> Index 2022-06-09 18:49:11 +09:00
Dan Balasescu
f0ef2e610e Merge branch 'master' into dho 2022-06-09 18:29:14 +09:00
Gabe Livengood
f54a68f6ca
scale down repulsion strength 2022-06-08 01:00:47 -04:00
Gabe Livengood
f21c9fb520
add newline 2022-06-07 12:05:53 -04:00
Gabe Livengood
b7bdad4074
clamp sliders, expose slider bounds function 2022-06-07 09:36:44 -04:00
Henry Lin
de224e79c7 Limit slider rotation when the slider is too large 2022-06-07 10:32:51 +08:00
Salman Ahmed
b6e97e699a Remove unnecessary position specification 2022-06-07 00:34:18 +03:00
Salman Ahmed
4158146c71 Fix spinenr tick samples not positioned at centre
Causing samples to be played at left ear rather than centre.
2022-06-07 00:30:11 +03:00
Salman Ahmed
0eaf420fa1 Specify full size for spinner ticks container 2022-06-07 00:29:14 +03:00
Salman Ahmed
fe96e15b1b Update spinner approach circle to handle LegacySkinTransformer 2022-06-04 01:15:39 +03:00
apollo-dw
774ac13900 Add xmldocs 2022-05-28 14:09:08 +01:00
apollo-dw
b631cefc55 Move object difficulty calculation to evaluator methods 2022-05-28 13:29:09 +01:00
apollo-dw
777d9af0f5 Move object difficulty calculation to evaluator methods 2022-05-28 13:28:04 +01:00
Gabe Livengood
5d838628d7
add test, fix formatting, expose easing function 2022-05-27 23:15:19 -04:00
apollo-dw
66a6467403 Pass object position to the object 2022-05-26 19:26:14 +01:00
Henry Lin
e205aeff38
Merge branch 'master' into random-mod-slider-rotation 2022-05-26 22:51:34 +08:00
Gabe Livengood
10287e0150
initial implementation 2022-05-26 00:08:00 -04:00
apollo-dw
1ef711de41 Return null for out of range objects 2022-05-24 16:40:24 +01:00
apollo-dw
30b9e0e7ab Use object list size for object position 2022-05-24 16:30:25 +01:00
apollo-dw
5dbec92d9e Update comments 2022-05-23 22:17:29 +01:00
apollo-dw
903c4f7b3d Merge remote-tracking branch 'master/master' into dho 2022-05-23 13:39:04 +01:00
apollo-dw
26985ca8af Store hitobject history in the hitobject 2022-05-22 16:26:22 +01:00
Dean Herbert
2e21d75b10 Move metronome into own class and rename to avoid conflict with mod sounds 2022-05-20 17:30:04 +09: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
a443200d0d Make dependency nullable to allow for safer disposal unbinding 2022-05-19 13:49:52 +09:00
Dean Herbert
cf3ead8047 Remove unused local 2022-05-13 22:06:30 +09:00
Dean Herbert
d9782b5ef6 Remove redundant parenthesis 2022-05-13 21:31:49 +09:00
Dean Herbert
38b8baf095 Remove unused border colour 2022-05-13 21:28:50 +09:00
Dean Herbert
1529162318 Remove circle scaling (apparently the fixed scale is required for spacing) 2022-05-13 21:28:45 +09:00
Dean Herbert
0318944b80 Fix incorrect alive criteria causing clicking future objects to be too greedy 2022-05-12 23:37:29 +09:00
Dean Herbert
51744e428f Merge branch 'master' into editor-readability 2022-05-12 22:56:55 +09:00
Dean Herbert
0c335592b3 Tidy up interpolation and move const to new home 2022-05-12 19:44:07 +09:00
Dean Herbert
f22ff4e087 Remove editor animation toggling (replaced by overlap markers) 2022-05-12 19:28:56 +09:00
Dean Herbert
be3d4c9bf5 Add circle overlap marker, bringing back stable-like visibility of circles in the past 2022-05-12 19:27:32 +09:00
Dean Herbert
1b2c07e142 Extend lifetime of OsuSelectionBlueprint to allow for lingering display 2022-05-12 19:25:51 +09:00
Dan Balasescu
b71274265f
Merge pull request #15665 from MBmasher/fl-opacity
Consider opacity of hit objects in Flashlight skill
2022-05-12 19:00:21 +09:00
Dan Balasescu
c3d472310f
Merge pull request #18237 from peppy/editor-animation-toggle-refresh-immediately
Fix toggling hit animations on the editor not applying immediately
2022-05-12 18:51:04 +09:00
Dan Balasescu
4463a26f4e Refactor opacity computation algorithm 2022-05-12 18:31:10 +09:00
Dean Herbert
f5649b926a Use AliveObjects rather than tracking all hitobjects manually 2022-05-12 18:04:26 +09:00
Dean Herbert
c4854d4004 Fix slider ball rotation becoming undefined when time is not flowing smoothly 2022-05-12 17:55:12 +09:00
Dean Herbert
10e41d018a Fix toggling hit animations on the editor not applying immediately 2022-05-12 17:36:35 +09:00
Dean Herbert
c0abce918f Add enum to snap method as alternative to mutliple nested invocations 2022-05-12 16:19:07 +09:00
Dan Balasescu
2d33859e7a
Merge pull request #18094 from apollo-dw/sliderticks
Reimplement slider ticks in Strict Tracking mod sliders
2022-05-09 17:16:47 +09:00
Dean Herbert
c7e7aa5962 Don't draw distance snap grid on the start time of the next object 2022-05-06 17:05:52 +09:00
Bartłomiej Dach
8b4e4b48d1
Merge branch 'master' into sliderticks 2022-05-05 14:38:09 +02:00
Bartłomiej Dach
2039d3db6a
Use standard slider ticks in strict tracking mod 2022-05-05 14:37:57 +02:00
Dan Balasescu
39d10487b9
Merge branch 'master' into snapping-tidy-distance 2022-05-05 19:55:55 +09:00
Bartłomiej Dach
5e4d07760d
Merge branch 'master' into snapping-tidy 2022-05-05 10:17:48 +02:00
Dean Herbert
19cf9dc20b Merge branch 'snapping-tidy-distance' 2022-05-05 16:51:32 +09:00
Dean Herbert
225fc65068 Merge branch 'snapping-tidy' 2022-05-05 16:51:31 +09:00
Dean Herbert
977e6d8a80 Add xmldoc for IDistanceSnapProvider and related properties 2022-05-05 16:25:45 +09:00
Dean Herbert
f6fc926f1a Add xmldoc and rename methods in IPositionSnapProvider for legibility 2022-05-05 15:58:21 +09:00
Bartłomiej Dach
79ecf5dd5d
Merge branch 'master' into strict-tracking-description 2022-05-05 08:41:27 +02:00
Dean Herbert
cbc58c67bf Remove weird strict tracking icon and reword description to explain what the mod does 2022-05-05 15:16:01 +09:00
Supersonicboss1
81b4622620 fixed autoplay not showing compat, + relax compat 2022-05-04 22:25:34 +01:00
apollo-dw
81ce0e6565 Reimplement sliderticks 2022-05-04 12:55:22 +01:00
Dean Herbert
bb086800b1 Remove ugly playfield border 2022-05-04 13:41:30 +09:00
Dan Balasescu
637f817696 Ignore zero-sections on a per-case basis 2022-05-03 16:06:20 +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
Bartłomiej Dach
bba7722837
Merge branch 'master' into improve-alternate-after-break 2022-05-02 10:52:48 +02:00
Dean Herbert
b911981d80
Merge pull request #18002 from Pasi4K5/add-target-incompatibilities
Make some mods incompatible with `OsuModTarget`
2022-04-29 23:18:31 +09:00
Salman Ahmed
a4ca8bfe75 Improve "Alternate" to reset before first hitobject after break 2022-04-29 06:41:21 +03:00
Bartłomiej Dach
96f6c918a8
Merge branch 'master' into first-run-behaviour-screen 2022-04-29 00:55:30 +02:00
Pasi4K5
e31fdc28dd Make Classic and Target compatible again 2022-04-28 22:31:48 +02:00
Pasi4K5
d5702e2955 Append incompatible mods to base.IncompatibleMods 2022-04-28 18:29:37 +02:00
Salman Ahmed
835898dd30 Introduce DistancedHitObjectComposer and supersede OsuToolboxComposite 2022-04-28 06:44:50 +03:00
Pasi4K5
d6395b14be Add incompatibilities 2022-04-28 05:15:04 +02:00
Salman Ahmed
59cf3ff50f Move distancing methods from IPositionSnapProvider to IDistanceSnapProvider 2022-04-28 05:48:45 +03:00
Salman Ahmed
66c730c382 Change distance spacing keybind to Ctrl+Alt 2022-04-27 17:11:23 +03: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
Dan Balasescu
ce095d6af6 Merge branch 'master' into fl-opacity 2022-04-26 18:34:53 +09:00
Dean Herbert
942f4e8ac2 Merge branch 'first-run-show-get-started' into first-run-behaviour-screen 2022-04-26 16:10:16 +09:00
Dean Herbert
b41e273086 Convert function weirdness to property + bool 2022-04-26 15:06:27 +09:00
Salman Ahmed
0738cd028f Give snapping toolbox enough hover delay for interaction with expand button
With 0 delay, if the `SettingsToolboxGroup` has been contracted via
button, there's no chance to be able to expand it via button again.

This is temporary at best just to keep things working somewhat, not sure
if the expansion logic will still be required in editor redesign, so
deciding to roll with it for now.
2022-04-24 08:53:11 +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
e0b9ab022d Add classic default values against setting controls 2022-04-22 18:05:24 +09:00
Dean Herbert
d43c66a3dd Merge branch 'master' into sample-positional-playback-screen-space 2022-04-21 16:57:20 +09:00
Joseph Madamba
5e5c8e78a6 Use existing web localisation for most hardcoded strings 2022-04-20 16:31:11 -07:00
Salman Ahmed
fd20c2bdcd Change circle/overlay sprite fields to protected for better test assertion 2022-04-20 00:24:28 +03:00
Salman Ahmed
a96664295b Fix nullability preprocessor placed over the copyright header 2022-04-19 19:48:44 +03:00
Salman Ahmed
033b556be5 Simplify texture lookup further 2022-04-19 19:44:35 +03:00
Dean Herbert
75a6e9fd7f Convert to use nullable and rearrange fields 2022-04-19 18:10:10 +09:00
Salman Ahmed
b067924ada Avoid applying state transforms when no object is present 2022-04-19 08:08:02 +03:00
Salman Ahmed
fd113953ac Rename prioritiyLookup and add xmldoc 2022-04-19 08:06:39 +03:00
Salman Ahmed
ec7bb876b5 Improve legacy circle texture lookup to match 1:1 with stable 2022-04-19 07:12:07 +03:00
Salman Ahmed
8d0dd3961e Add failing test cases 2022-04-19 07:12:07 +03:00
Salman Ahmed
3a00931e38 Update slider sliding samples balance calculation to use screen-space as well 2022-04-18 09:18:56 +03:00
Salman Ahmed
fcb48c69cf Calculate sample playback position using screen-space drawable rectangles 2022-04-18 07:57:31 +03:00
Henry Lin
e5e1960975 Add inline comments 2022-04-18 09:38:51 +08:00
Henry Lin
1d79266d42 Clarify in the xmldoc that angles are measured in radians 2022-04-17 10:40:43 +08:00
Henry Lin
610d2dc1a3 Use a bigger sample step to calculate slider center of mass 2022-04-17 10:34:48 +08:00
Henry Lin
72cb3d6ad6 USe MathF in all applicable places 2022-04-11 14:15:08 +08:00
Dan Balasescu
c48f8d7b9b
Merge pull request #17714 from bdach/mod-overlay/multimod-incompatibility
Ensure that mods grouped into multi mods are pairwise incompatible
2022-04-08 16:43:06 +09:00
Dean Herbert
879267862c Fix typo in DrawableOsuHitObject 2022-04-08 15:20:22 +09: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
ee8451c8ca
Merge branch 'master' into osu-diff-calc-max-combo 2022-04-04 14:20:44 +09:00
Dean Herbert
de625125d6 Rename magnetised mod attraction strength property to match new naming 2022-04-01 13:03:48 +09:00
Henry Lin
3bebc88306 Consider spinners when calculating jump angles
Spinners are considered in `GeneratePositionInfos`, so they should also be considered in `RepositionHitObjects`
2022-04-01 11:59:24 +08: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
Henry Lin
031a977009 Calculate slider rotation using end point of path instead of EndPosition 2022-04-01 11:50:30 +08:00
Henry Lin
0015f627b0 Add xmldoc 2022-04-01 11:49:27 +08:00
Henry Lin
c0a78924aa Fix generation for zero-length sliders 2022-04-01 11:47:21 +08:00
Henry Lin
af3835083c Fix slider relative rotation calculation 2022-04-01 11:41:45 +08:00
Henry Lin
998df5a4fe Fix large slider clamping 2022-04-01 11:37:10 +08:00
Henry Lin
cabbc486e9 Rotate sliders in random mod 2022-04-01 11:36:20 +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
32e55e7d78 Merge branch 'master' into osu-diff-calc-max-combo 2022-03-31 15:08:08 +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
Dean Herbert
e4b2242719 Fix follow point animations not looping
Because they do in stable. I don't know why but let's go with it.

Resolves issue reported in https://github.com/ppy/osu/discussions/17072.
2022-03-21 18:29:13 +09:00
apollo-dw
d3742a91a8 Nest specific object classes within the mod 2022-03-20 15:56:41 +00:00
apollo-dw
35e2e6a4e7 Remove slider tick judgement flag 2022-03-20 15:41:46 +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
Dean Herbert
6fb06d69cc
Merge branch 'master' into pp-counter-alloc-reduction 2022-03-15 13:31:57 +09:00
Dean Herbert
deb4aeb4b2
Merge pull request #17242 from smoogipoo/performance-calculator-cleanup
Restructure PerformanceCalculator to not require ScoreInfo argument
2022-03-15 13:31:34 +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
Henry Lin
76021c7627 Remove extra parameters 2022-03-14 20:23:35 +08:00
Henry Lin
6657d93b29 Separate the two nested classes 2022-03-14 20:18:30 +08:00
Dean Herbert
1b8c632b87 Add TailSamples to auxiliary samples list 2022-03-14 17:19:48 +09:00
Dean Herbert
6d6f73e016 Add overrides in DrawableSliderTail to explain/warn that this class never plays its own samples 2022-03-14 17:19:48 +09:00
Dean Herbert
be99202188 Move spinner spin samples to auxiliary specification 2022-03-14 17:19:48 +09:00
Dean Herbert
90e34d7686 Move slider slide samples to auxiliary specification 2022-03-14 17:19:48 +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
Dean Herbert
f82687a2c6
Merge pull request #17150 from SiimPender/master
Fix crash during kiai section on specific map due to negative transform duration
2022-03-10 18:09:41 +09:00
Dean Herbert
a1b7bf3986
Use a minimum fade length for clamping rather than zero
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-03-10 16:47:02 +09:00
Henry Lin
5e36383258 Convert IObjectPositionInfo to a class 2022-03-10 12:02:25 +08:00
Henry Lin
3a71d81775 Convert the position modifier to stateless methods 2022-03-10 11:53:03 +08:00
Henry Lin
ede838c4b3 Use ObjectPositionInfo.HitObject 2022-03-10 11:23:52 +08:00
Dan Balasescu
c36badab4b Add per-ruleset score multipliers for classic scoring 2022-03-10 10:26:09 +09:00
Henry Lin
e8dbed738e Move OsuHitObjectPositionModifier to Utils/ 2022-03-09 21:52:15 +08:00