1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 23:02:56 +08:00
Commit Graph

40588 Commits

Author SHA1 Message Date
Dean Herbert
d0e9f8ef90 Replace and obsolete Ranked flag with IsUserPlayable 2021-06-09 14:17:03 +09:00
Dean Herbert
7774344f0e Remove "Unranked" text from ModDisplay 2021-06-09 13:45:09 +09:00
Dean Herbert
249a8f259b Reword "unranked" to "not ranked" on beatmap overlay
This will be replaced anyway once we start to consume osu-web
translation strings.
2021-06-09 13:44:27 +09:00
Dean Herbert
2f6227e0f2
Merge pull request #13397 from ekrctb/fix-event-not-unregistered
Fix registered event not unregistered on dispose
2021-06-09 13:12:06 +09:00
ekrctb
555ab8fccd Fix event not unregistered on dispose 2021-06-09 12:35:14 +09:00
Dean Herbert
e914fbf449
Merge pull request #13396 from ekrctb/fix-circle-piece
Fix hit circle animation is removed when a replay is rewound
2021-06-09 11:39:38 +09:00
ekrctb
4707918c6a Fix hit circle animation when a replay is rewound 2021-06-09 10:53:52 +09:00
Dean Herbert
04cc788627
Merge pull request #13380 from smoogipoo/fix-multi-spec-dt-doubling-2
Fix DT being doubled in multiplayer spectator
2021-06-08 23:31:56 +09:00
smoogipoo
c3ea1b26e1 Fix DT being doubled in multiplayer spectator 2021-06-08 22:51:42 +09:00
Dean Herbert
475788041a
Merge pull request #13337 from Pasi4K5/fix-sliders-out-of-screen
Fix sliders sometimes being outside of the playfield with osu! random mod enabled
2021-06-08 21:18:21 +09:00
Dean Herbert
25af4dfa8a
Merge pull request #13375 from smoogipoo/fix-multi-nullref
Fix possible nullref when exiting song select too fast
2021-06-08 20:47:40 +09:00
Dan Balasescu
5a8cde7e6f
Merge pull request #13377 from peppy/fix-lazer-replays-getting-classic
Move legacy `ScoreInfo` to be completely based on presence of classic mod
2021-06-08 19:15:13 +09:00
Dan Balasescu
d9ac9f641a
Merge pull request #12970 from peppy/fix-skin-sample-lookup
Fix default skin sample fallback logic existing within `PoolableSkinnableSample`
2021-06-08 19:10:04 +09:00
smoogipoo
0b9916b266 Add parens to declare operator precedence 2021-06-08 18:39:52 +09:00
Dean Herbert
4ee7721c51 Extract first version out to constant 2021-06-08 18:38:47 +09:00
Dan Balasescu
d31e3e8f1c
Fix nullref 2021-06-08 18:23:03 +09:00
Dean Herbert
b287366c8b Remove forgotten classic mod addition 2021-06-08 18:09:57 +09:00
Dean Herbert
061e3d7f26 Move legacy ScoreInfo to be completely based on presence of classic mod 2021-06-08 18:00:09 +09:00
Dean Herbert
4d9fffc01b Update score encoder version to be higher than any existing stable version 2021-06-08 17:59:43 +09:00
smoogipoo
ab9290772b Fix a similar case with online play sub-screens 2021-06-08 17:54:54 +09:00
smoogipoo
860f1aebb3 Only call OnBackButton() if the screen has finished loading 2021-06-08 17:38:12 +09:00
Dean Herbert
6017ef3825
Merge branch 'master' into fix-skin-sample-lookup 2021-06-08 17:37:36 +09:00
Dan Balasescu
e5e3509c87
Merge pull request #13264 from peppy/legacy-skin-default-fallback
Allow fallback to legacy defaults from legacy skins
2021-06-08 17:30:27 +09:00
Dan Balasescu
c0fdbfba04
Merge pull request #13374 from peppy/update-framework
Update framework
2021-06-08 17:09:20 +09:00
smoogipoo
490ab9e96a Fix typo 2021-06-08 17:09:03 +09:00
smoogipoo
7fa0ac6ed7 Fix possible nullref when exiting song select too fast 2021-06-08 17:03:50 +09:00
Dan Balasescu
791855dfa0
Merge branch 'master' into legacy-skin-default-fallback 2021-06-08 16:54:26 +09:00
Dan Balasescu
e3cb6f45f5
Merge pull request #13371 from peppy/fix-poolable-sample-disposal-skin-change
Clean up previous sample immediately on skin source change to avoid `Play` after disposal
2021-06-08 16:52:59 +09:00
Dan Balasescu
751a5e7cf3
Merge pull request #13373 from peppy/catch-no-visibility-increase
Don't apply visibility increase to first object in osu!catch
2021-06-08 16:39:21 +09:00
Dean Herbert
89895f6ce4 Update framework 2021-06-08 16:24:00 +09:00
Dan Balasescu
67135ce3db
Add null check 2021-06-08 16:15:17 +09:00
Dean Herbert
e388a896e8 Don't apply visibility increase to first object in osu!catch
The goal of the visibility increase is to help in cases where timing is
an issue (by showing the approach circle etc.). This doesn't need to
apply to catch.

@smoogipoo interested as to whether you agree with this one. Visually it
looks better to me but it does change the behaviour for only osu!catch,
so I'm not 100% confident on it.

Closes #13367.
2021-06-08 16:02:26 +09:00
Dean Herbert
e0f568aa8f Merge branch 'legacy-skin-default-fallback' into fix-skin-sample-lookup 2021-06-08 15:19:52 +09:00
Dean Herbert
f3f634e969 Clean up previous sample immediately on skin source change to avoid Play after disposal
This seems to be the simplest way to avoid calls to `Play` after the
underlying sample may have been disposed. As per the issue thread, a
local workaround is acceptable here.

Closes #13223.
2021-06-08 15:05:18 +09:00
Dean Herbert
be53b521fc
Merge pull request #13370 from smoogipoo/beatmap-collections-safeguard
Attempt to safeguard against collections database corruptions
2021-06-08 15:01:26 +09:00
smoogipoo
7341e474f1 Attempt to safeguard against collections database corruptions 2021-06-08 14:25:39 +09:00
Dean Herbert
27e3de3ea3 Add TODO about beatmap skin fallback support 2021-06-08 12:12:14 +09:00
Dean Herbert
88b87b98a8 Fix slider ball layer sources 2021-06-08 12:10:14 +09:00
Dean Herbert
06840d78cc Remove now unused method 2021-06-08 12:06:42 +09:00
Dean Herbert
2c1f22d7ae Refactor animation lookup to properly handle skins providing non-animated resources 2021-06-08 01:17:20 +09:00
Dean Herbert
e7e9197f03 Fix FindProvider not correctly checking legacy default in SkinManager 2021-06-08 00:42:50 +09:00
Dean Herbert
273d66a0e0 Fix TaikoMascot texture animation lookups 2021-06-08 00:42:34 +09:00
Dean Herbert
6d56e02ddb Add back incorrectly reverted animation handling logic
This reverts commit b904fa6615.
2021-06-08 00:17:01 +09:00
Dean Herbert
c0305343bc Fix FindProvider incorrectly returning LegacySkinTransformer itself 2021-06-07 23:23:44 +09:00
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