1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 09:02:55 +08:00
Commit Graph

41284 Commits

Author SHA1 Message Date
Dan Balasescu
479d6d3fc5
Merge branch 'master' into fix-beatmap-skin-disables 2021-06-10 16:37:58 +09:00
Dan Balasescu
4eab717a80
Merge pull request #13408 from peppy/default-skin-fallback
Add fallback lookup support for `DefaultSkin`
2021-06-10 16:37:48 +09:00
Dean Herbert
62b400fea5
Merge pull request #13427 from Joehuu/fix-stats-forever-dimming
Fix background being dimmed forever after toggling statistics in results screen
2021-06-10 16:09:14 +09:00
Dean Herbert
865c5c0676 Use [Resolved] to simplify bindable resolution 2021-06-10 15:47:03 +09:00
Dean Herbert
6995945360 Use With to simplify drawable construction 2021-06-10 15:45:49 +09:00
Joseph Madamba
cc38556f61 Fix background being dimmed forever after toggling statistics in results screen 2021-06-09 23:26:57 -07:00
Dean Herbert
9a3ca09501
Merge pull request #13384 from bdach/fixed-label-width
Align label widths of editor setup screen controls
2021-06-10 14:55:49 +09:00
Dean Herbert
b55a4053cf
Merge pull request #13426 from gagahpangeran/wiki-image-title
Fix wiki image tooltips not showing inside table views
2021-06-10 14:28:49 +09:00
Dean Herbert
9044a20120 Merge branch 'master' into realm-key-binding-store 2021-06-10 13:58:08 +09:00
Dean Herbert
209d217024 Remove unused using statement 2021-06-10 12:37:56 +09:00
Gagah Pangeran Rosfatiputra
05cb935a94
change WikiMarkdownImage to extend OsuMarkdownImage 2021-06-10 09:38:48 +07:00
Dean Herbert
2b4649a3ea
Merge pull request #13425 from Joehuu/score-panel-kb-navigation 2021-06-10 11:38:17 +09:00
Gagah Pangeran Rosfatiputra
28d7b06908
create OsuMarkdownImage 2021-06-10 09:38:07 +07:00
Gagah Pangeran Rosfatiputra
39e1f77d53
add image table with image content test 2021-06-10 09:37:33 +07:00
Dean Herbert
3d508f9266 Merge branch 'master' into results-screen-sfx 2021-06-10 11:28:35 +09:00
Joseph Madamba
e3f3c37953 Add ability to navigate score panels with left/right arrows 2021-06-09 17:03:46 -07:00
Bartłomiej Dach
209f658d05
Merge branch 'master' into fix-beatmap-skin-disables 2021-06-09 20:22:00 +02: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
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