1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-14 11:47:19 +08:00

40594 Commits

Author SHA1 Message Date
Dean Herbert
08701b5eab Ensure all lookups in LegacyHealthDisplay use the found provider
Not actually needed to fix the remaining issue but does feel better
2021-06-07 23:23:12 +09:00
Dan Balasescu
6ebac0b462
Merge pull request #13365 from bdach/catch-colour-error-meter
Fix colour hit error meter not working with empty hit windows
2021-06-07 21:13:30 +09:00
Bartłomiej Dach
1b4771655a Adjust test scene to avoid cross-test interference
* Move steps from ctor to a separate basic test.
* Wait for barrage to complete in basic test, as not doing so polluted
  state of other tests.
* Reset score processor after every test.
2021-06-07 13:16:07 +02:00
Bartłomiej Dach
0531c2dcd9 Move empty window check to bar error meter
It's not valid in the base `HitErrorMeter`, as the colour meter only
displays colour for a given judgement, so it is still valid to add new
items to it even if the hit window is 0, as misses are still possible.
2021-06-07 13:16:07 +02:00
Bartłomiej Dach
37d062c7cd Add failing assertions to hit error meter test 2021-06-07 13:16:07 +02:00
Bartłomiej Dach
122a624b7f Remove bogus CatchHitWindows
`CatchHitWindows` were a vestige from the past, and were not actually
used anywhere except for the hit error meter test, giving off an
appearance that the hit error meter was working properly.
`CatchHitObject` actually specifies empty hit windows.
2021-06-07 13:16:07 +02:00
Dan Balasescu
b32191f924
Merge pull request #13364 from Susko3/android-add-mime-type-x-osu-archive
Add `application/x-osu-archive` mime type to Android `IntentFilter`s
2021-06-07 19:30:15 +09:00
Bartłomiej Dach
8d7a250c6e
Merge pull request #13360 from peppy/fix-slider-repeat-arrow-rotation-editor 2021-06-07 12:22:41 +02:00
Dan Balasescu
3225bc2c71
Merge branch 'master' into fix-slider-repeat-arrow-rotation-editor 2021-06-07 18:46:25 +09:00
Dan Balasescu
ee256083e3
Merge pull request #13362 from peppy/fix-background-screen-reload
Stop `BackgroundScreenDefault` from reloading beatmap background when already correct
2021-06-07 18:44:47 +09:00
Susko3
a0fbf29b98 add application/x-osu-archive mime type to Android IntentFilters 2021-06-07 11:24:48 +02:00
Dean Herbert
824130355a
Merge pull request #13357 from ekrctb/fruit-representation
Move osu!catch "fruit visual representation" state from `DrawableFruit` to skin pieces
2021-06-07 17:49:00 +09:00
Dean Herbert
729e05241f Add more test coverage 2021-06-07 17:32:10 +09:00
Dean Herbert
59130be99c Fix switching storyboard mode not triggering a reload 2021-06-07 17:32:04 +09:00
Dean Herbert
f677f9b5f4 Stop BackgroundScreenDefault from reloading beatmap background when already correct 2021-06-07 17:22:36 +09:00
Dan Balasescu
d95f3841cc
Merge pull request #13359 from peppy/update-framework
Update framework
2021-06-07 16:56:23 +09:00
Dean Herbert
e8d4147773 Add missing null handling for never Markdig version 2021-06-07 16:08:44 +09:00
Dean Herbert
1b93234c76 Merge branch 'master' into fruit-representation 2021-06-07 16:05:00 +09:00
Dean Herbert
277eb9fa6e Fix slider repeat arrow not updating rotation immediately while paused in editor
A bit of a local solution, but not sure there's a better way to handle
this.

Closes #13342.
2021-06-07 15:58:43 +09:00
Dean Herbert
aa700702fe Update framework 2021-06-07 15:48:45 +09:00
Dean Herbert
a17bbe8393
Merge pull request #13358 from ekrctb/move-files
Move all osu!catch legacy skin piece files to the correct location
2021-06-07 15:47:58 +09:00
ekrctb
bb02c35f2d Move all osu!catch legacy skin piece files to the correct location 2021-06-07 15:10:47 +09:00
ekrctb
ac5c55bd2c Remove "fruit visual representation" state from DrawableFruit
Instead, skin pieces compute visual representation from `IndexInBeatmap`.
2021-06-07 14:49:37 +09:00
ekrctb
166e4565be Move FruitVisualRepresentation namespace 2021-06-07 13:59:17 +09:00
Dean Herbert
d26c9a66c2 Merge branch 'legacy-skin-default-fallback' into fix-skin-sample-lookup 2021-06-07 12:01:19 +09:00
Dean Herbert
e10dfab2e8 Ensure scorebar marker lookup is performed on the source the background is retrieved from 2021-06-06 23:23:35 +09:00
Dean Herbert
b5f145cfa9 Use null propagation for animation lookups 2021-06-06 23:01:37 +09:00
Dean Herbert
9ebafb1ec0 Fix cursor trail logic 2021-06-06 22:26:27 +09:00
Dean Herbert
b904fa6615 Revert "Ensure all frames in an animation are retrieved from the same skin"
This reverts commit 37c8c63fc566c115aa3f974b6d23bb12f62caa05.
2021-06-06 12:37:42 +09:00
Dean Herbert
b87a5956dd Add fallback logic to SkinManager 2021-06-06 12:17:55 +09:00
Dean Herbert
39f99bf785 Move FindProvider to ISkinSource 2021-06-06 12:17:32 +09:00
Pasi4K5
b214f2ae0e Remove repeat and simplify getMinSliderMargin 2021-06-05 17:13:08 +02:00
Pasi4K5
f59263932a Use SliderPath.GetPathToProgress for getting the SliderPath's positions 2021-06-05 17:04:58 +02:00
Dean Herbert
cce0220060
Merge pull request #13338 from Craftplacer/fix-osutestscene-content
Add `DummyAPIAccess` to `OsuTestScene` one parent up
2021-06-05 15:32:55 +09:00
Dean Herbert
9f6e3996b1
Merge branch 'master' into fix-osutestscene-content 2021-06-05 14:49:19 +09:00
Craftplacer
1084906d40
Add DummyAPIAccess one parent up 2021-06-05 03:30:21 +02:00
Dean Herbert
10acad6524
Merge pull request #13261 from smoogipoo/fix-spectator-frame-conversion
Fix spectator crashing when converting mania replay frames
2021-06-05 00:38:15 +09:00
Pasi4K5
b4f190c6ff Rename iteration variable 2021-06-04 17:22:36 +02:00
Pasi4K5
32e41048ff Fix System.ArgumentException caused by sliders bigger than the playfield 2021-06-04 16:50:27 +02:00
Pasi4K5
6357d1363c Add comment for slider_path_checking_rate 2021-06-04 16:26:40 +02:00
Pasi4K5
a0a6f3ef81 Replace Vector2 methods with math operators 2021-06-04 16:23:03 +02:00
Pasi4K5
9f2a9608f2 Rework slider positioning 2021-06-04 16:17:54 +02:00
Dan Balasescu
bde0071de8
Merge pull request #13336 from ekrctb/pdwl-catch-explosion
Fix catch hit lighting not always showing when a replay is rewound
2021-06-04 22:19:34 +09:00
smoogipoo
009aa994d0 Fix potential race incorrectly pausing the source clock 2021-06-04 21:58:51 +09:00
Dan Balasescu
57a38374db
Merge branch 'master' into fix-spectator-frame-conversion 2021-06-04 21:17:40 +09:00
Dan Balasescu
fa7611f1e2
Merge pull request #13331 from ekrctb/pdwl-follow-point
Use general lifetime container for follow point container
2021-06-04 20:39:39 +09:00
Dan Balasescu
a3bec49b3b
Merge branch 'master' into pdwl-follow-point 2021-06-04 20:04:02 +09:00
ekrctb
8e20f90ed5 Use seeded RNG for catch explosion animation
The animation is always the same when a replay is rewound or a beatmap is played multiple times.
2021-06-04 19:54:46 +09:00
ekrctb
5512231bf4 Add NextSingle of version taking output range to StatelessRNG 2021-06-04 19:52:12 +09:00
Dean Herbert
840f084dc4
Merge pull request #13303 from LeNitrous/mainmenu-storyboard-backgrounds
Add storyboards as a main menu background source
2021-06-04 19:50:40 +09:00