1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 02:42:54 +08:00
Commit Graph

41441 Commits

Author SHA1 Message Date
Bartłomiej Dach
89cdea8123
Merge branch 'master' into fix-results-exit-transition 2021-06-09 19:40:56 +02:00
Bartłomiej Dach
266c1e2e25
Merge branch 'master' into fix-beatmap-skin-disables 2021-06-09 18:43:15 +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
31b46afa71 Fix wrong naming scheme for applause samples 2021-06-09 19:35:05 +09:00
Dean Herbert
7d86dafd4f Simplify tick calculation/playback method 2021-06-09 19:31:53 +09:00
Dean Herbert
c8947daee3 Add back another missing space... 2021-06-09 19:27:43 +09:00
Dean Herbert
57bc34f224 Move consts closer to usage 2021-06-09 19:24:35 +09:00
Dean Herbert
cb4f366651 Move forgotten private function down more 2021-06-09 19:15:55 +09:00
Dean Herbert
81cecac90b Move tick rate initialisation to earlier 2021-06-09 19:09:00 +09:00
Dean Herbert
499aba95c0 Simplify sample construction logic and move private functions down 2021-06-09 19:06:37 +09:00
Dean Herbert
489a5a3c1d Add back missing space in csproj 2021-06-09 19:01:05 +09:00
Dean Herbert
21a63efd78 Rename variable back to withFlair to match parent class 2021-06-09 18:55:29 +09:00
Dean Herbert
330bb7cb45 Remove unnecessary skin lookup logic 2021-06-09 18:55:29 +09:00
Dean Herbert
0cf7c56e7e Add fallback lookup support for DefaultSkin 2021-06-09 18:51:42 +09:00
Dean Herbert
8fda04c2d9 Merge branch 'master' into results-screen-sfx 2021-06-09 18:00:11 +09:00
Dean Herbert
2438c20d63 Fix SourceChanged not being correctly forwarded through LegacySkinTransformer 2021-06-09 17:56:07 +09:00
Dean Herbert
47eeab34e1 Remove redundant string interpolation 2021-06-09 17:34:47 +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
Bartłomiej Dach
020c63017e Fix inspectcode issues 2021-06-09 09:21:02 +02:00
Dean Herbert
448e4e7ee5 Fix FindProvider calls on SkinProvidingContainer not considering disable flags
Closes #13394.
2021-06-09 16:19:04 +09:00
Dean Herbert
38fc9347be Add failing test coverage for beatmap skin disable 2021-06-09 16:19:04 +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
ekrctb
e5deecf459 Check skin version for legacy catcher sprite 2021-06-09 15:47:23 +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
85abee5fc7 Remove difficulty calculator exceptions
I don't think there's any reason difficulty calculators shouldn't be
able to calculate for autoplays.
2021-06-09 14:33:35 +09:00
Dean Herbert
b754c52392 Update ModAutoplay matching to use new UserPlayable flag instead 2021-06-09 14:32:48 +09: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
d0e9f8ef90 Replace and obsolete Ranked flag with IsUserPlayable 2021-06-09 14:17:03 +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
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