1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 12:07:23 +08:00
Commit Graph

40658 Commits

Author SHA1 Message Date
Salman Ahmed
33a9cac398 Add special RulesetSkinProvidingContainer managing ruleset-compatible skin setup 2021-06-09 22:49:31 +03:00
Salman Ahmed
9e652715ce Expose the skin lookup layers of SkinManager to a property 2021-06-09 22:49:31 +03:00
Salman Ahmed
6538d44708 Make SkinProvidingContainer able to perform lookup on multiple skins
Currently `protected` functionality for use in custom `SkinProvidingContainer`s, can be exposed to public constructors if it need to later on, but I'm not sure about doing that opposed to just nesting multiple `SkinProvidingContainer`.
2021-06-09 22:49:31 +03:00
Salman Ahmed
cf40282f1f Convert LegacySkinTransformers to accept raw ISkins rather than a full ISkinSource 2021-06-09 22:49:31 +03:00
Bartłomiej Dach
aed490803f
Merge pull request #13407 from peppy/fix-results-exit-transition 2021-06-09 20:16:09 +02:00
Bartłomiej Dach
89cdea8123
Merge branch 'master' into fix-results-exit-transition 2021-06-09 19:40:56 +02:00
Dean Herbert
58e00e9e43
Merge pull request #13412 from peppy/update-framework
Update framework
2021-06-10 01:41:49 +09:00
Bartłomiej Dach
222ae40a04
Merge branch 'master' into update-framework 2021-06-09 17:36:17 +02:00
Bartłomiej Dach
988e97bbc3
Merge pull request #13335 from gagahpangeran/wiki-article 2021-06-09 17:00:19 +02:00
Bartłomiej Dach
7fe878299f
Merge branch 'master' into wiki-article 2021-06-09 16:24:45 +02:00
Dean Herbert
f113c095ce Update framework 2021-06-09 20:29:06 +09:00
Dean Herbert
ca02e8e5d3
Merge pull request #13405 from ekrctb/fix-circle-piece-2
Fix circle piece animation sometimes not playing when a replay is rewound (again)
2021-06-09 19:48:59 +09:00
Dean Herbert
b02b8ae2bc
Merge pull request #13381 from smoogipoo/improve-hit-error-judgements
Improve hit error judgement displays
2021-06-09 19:40:17 +09:00
Dean Herbert
a65b76bdbf Add a simple fade to the results screen
Stops it from immediately disappearing.
2021-06-09 17:19:37 +09:00
Dean Herbert
7b0c5e9d32 Fix results screen changing applied colour to background on exit
The general rule is that screens should only apply colours and the likes
on enter / resume, and leave the outwards transition to whatever screen
is coming next.
2021-06-09 17:18:55 +09:00
Dean Herbert
258d05d1e0 Ensure PlayerLoader restores the background colour to its own value on resume 2021-06-09 17:17:39 +09:00
Dean Herbert
a7ef0173e9 Add safety to ensure background is correct tint when entering gameplay 2021-06-09 17:07:28 +09:00
ekrctb
5418e895ae Remove useless ClearTransforms
The transforms are cleared by DHO before `ApplyCustomUpdateState` is invoked.
2021-06-09 16:50:13 +09:00
Dan Balasescu
50eb58ecd3
Merge pull request #13402 from peppy/mania-key-lookup-fix
Use candidate skin for mania skin key lookup rather than `this`
2021-06-09 16:35:55 +09:00
Dean Herbert
17ad214e0e
Merge pull request #13393 from bdach/fix-skin-background-regression
Bring back skin background source
2021-06-09 16:34:57 +09:00
ekrctb
610cdaea98 Fix circle piece animation is sometimes not playing when a replay is rewound 2021-06-09 16:14:55 +09:00
Bartłomiej Dach
023015f9a6 Merge branch 'master' into fix-skin-background-regression 2021-06-09 08:09:21 +02:00
Dan Balasescu
8a221f501d
Merge pull request #13400 from peppy/remove-obsoleted-drawable-judgement-methods
Remove some obsoleted members
2021-06-09 15:01:25 +09:00
Dean Herbert
d248bbd4c8 Use candidate skin for mania skin key lookup rather than this 2021-06-09 15:00:55 +09:00
Bartłomiej Dach
a801a9a14d Ensure background rotation on default skins 2021-06-09 07:59:47 +02:00
Bartłomiej Dach
5487012060 Add test coverage for default skin background cycling 2021-06-09 07:48:16 +02:00
Dean Herbert
b8df3fff9e
Fix incorrect method referenced in xmldco
Co-authored-by: ekrctb <32995012+ekrctb@users.noreply.github.com>
2021-06-09 14:20:01 +09:00
Dean Herbert
62199a38a8 Add one missing obsoletion removal date 2021-06-09 14:11:50 +09:00
Dean Herbert
f41e34ae2c Remove more obsoleted members 2021-06-09 14:10:48 +09:00
Dean Herbert
a87226ab10 Remove obsoleted DrawableJudgement methods
Undated, but change was made on 2020-11-18.
2021-06-09 14:09:23 +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
Bartłomiej Dach
97204b6f27 Reduce unnecessary background changes via IEquatable implementation 2021-06-08 22:37:18 +02:00
Bartłomiej Dach
f628ec25ef Add test coverage for keeping same background instance 2021-06-08 22:31:09 +02:00
Bartłomiej Dach
a98c302211 Bring back skin background source 2021-06-08 22:04:59 +02:00
Bartłomiej Dach
d86ace4d11 Add test coverage for skin background source 2021-06-08 22:03:59 +02:00
Bartłomiej Dach
5bf4dd6358 Move skin background to separate file 2021-06-08 21:57:08 +02: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
00efed2c39 Add colours for tick judgements 2021-06-08 23:10:21 +09:00
smoogipoo
c8e14d7710 Ignore non-scorable and bonus judgements 2021-06-08 23:09:23 +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