1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 15:33:05 +08:00
Commit Graph

25897 Commits

Author SHA1 Message Date
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
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
Bartłomiej Dach
023015f9a6 Merge branch 'master' into fix-skin-background-regression 2021-06-09 08:09:21 +02:00
Bartłomiej Dach
a801a9a14d Ensure background rotation on default skins 2021-06-09 07:59:47 +02: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
Bartłomiej Dach
97204b6f27 Reduce unnecessary background changes via IEquatable implementation 2021-06-08 22:37:18 +02:00
Bartłomiej Dach
a98c302211 Bring back skin background source 2021-06-08 22:04:59 +02:00
Bartłomiej Dach
5bf4dd6358 Move skin background to separate file 2021-06-08 21:57:08 +02:00
Bartłomiej Dach
410cb16340 Apply fixed label width to setup screen items 2021-06-08 17:18:00 +02:00
Bartłomiej Dach
88266eac63 Add option to fix label width of a LabelledDrawable 2021-06-08 16:57:32 +02: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
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
Samuel Cattini-Schultz
f1bef989b7 Refactor DifficultyAttributes to use auto properties over public fields 2021-06-08 19:43:59 +10: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
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
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
e2fdc23d98 Merge branch 'fix-skin-sample-lookup' into results-screen-sfx 2021-06-08 15:20:11 +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
95852ccdf8 Merge branch 'master' into results-screen-sfx 2021-06-08 15:14:31 +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
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
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
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
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
b192c46316 Merge branch 'master' into wiki-article 2021-06-07 11:19:20 +02:00
Bartłomiej Dach
a0bda9ad59 Hoist scroll cache declaration to original place of definition 2021-06-07 11:18:18 +02:00
Bartłomiej Dach
e606bf249a Move dependency specification to BDL
As it is not used anywhere else.
2021-06-07 11:05:30 +02: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
Dean Herbert
e8d4147773 Add missing null handling for never Markdig version 2021-06-07 16:08:44 +09:00
Dean Herbert
aa700702fe Update framework 2021-06-07 15:48:45 +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
Gagah Pangeran Rosfatiputra
ed733ee648
directly using table of content entry in wiki table of contents 2021-06-06 20:19:39 +07:00
Dean Herbert
b904fa6615 Revert "Ensure all frames in an animation are retrieved from the same skin"
This reverts commit 37c8c63fc5.
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
Gagah Pangeran Rosfatiputra
525c16419a
use container for main title and sub title table of contents 2021-06-06 08:37:03 +07:00
Craftplacer
b97f31f314
Revert deletion of xmldoc summary line 2021-06-05 19:03:11 +02:00
Craftplacer
4925a7d59e
Minor code quality changes 2021-06-05 15:57:14 +02:00
Gagah Pangeran Rosfatiputra
9f45a28623
use WikiTableOfContents in WikiSidebar 2021-06-05 19:47:00 +07:00
Gagah Pangeran Rosfatiputra
55f3a328a4
add WikiTableOfContents 2021-06-05 19:46:46 +07:00
Craftplacer
5e44329e0b
Add DummyAPIAccess request handler
Make CreateChannelRequest.channel public
2021-06-05 14:43:26 +02:00
Craftplacer
ce4bcda803
Use separate method for fetching channel objects
Resolves a pull request review
2021-06-05 14:02:48 +02:00
Gagah Pangeran Rosfatiputra
958bddc8cb
remove onclick in toc entry 2021-06-05 18:30:28 +07:00
Gagah Pangeran Rosfatiputra
c099751ad1
use plain if check in switch case 2021-06-05 18:26:03 +07:00
Craftplacer
39c3b08fc7
Merge remote-tracking branch 'upstream/master' into chat-mention 2021-06-05 11:18:06 +02:00
Craftplacer
b746fe7c03
Fix binding order 2021-06-05 11:03:49 +02: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
Gagah Pangeran Rosfatiputra
4cf3381d0b
use wiki article page when failed fetch 2021-06-04 23:59:11 +07:00
Gagah Pangeran Rosfatiputra
5ee77925e4
change WikiArticlePage to extends CompositeDrawable 2021-06-04 23:54:50 +07:00
Gagah Pangeran Rosfatiputra
f07d4532d9
move scroll to into action 2021-06-04 23:51:18 +07:00
Gagah Pangeran Rosfatiputra
a431ef6c48
keep colour change when entry is clicked 2021-06-04 23:43:00 +07:00
Gagah Pangeran Rosfatiputra
5febbe4530
rename method add entry 2021-06-04 23:32:42 +07:00
Gagah Pangeran Rosfatiputra
70c64af25e
rename toc entry 2021-06-04 23:31:51 +07: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
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
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
Gagah Pangeran Rosfatiputra
8883d5e2d1
use heading block to get title string 2021-06-04 15:28:54 +07:00
Gagah Pangeran Rosfatiputra
6d6c03eafe
use linq to find first literal inline 2021-06-04 14:45:06 +07:00
Dean Herbert
ae2165b3be Fix incorrect xmldoc 2021-06-04 16:44:04 +09:00
Jamie Taylor
50819ef91f
use a dictionary for sample lookups instead 2021-06-04 16:41:52 +09:00
Dean Herbert
5fa9366152 Update resources 2021-06-04 16:22:16 +09:00
Dean Herbert
37c8c63fc5 Ensure all frames in an animation are retrieved from the same skin 2021-06-04 16:18:04 +09:00
Dan Balasescu
2069a5bd28
Merge pull request #13313 from ekrctb/factor-out-hoc
Factor out entry management logic of `HitObjectContainer` to the new base class
2021-06-04 16:06:48 +09:00
Dean Herbert
06275a6a7d Merge branch 'master' into legacy-skin-default-fallback 2021-06-04 16:00:30 +09:00
Dan Balasescu
b283c48abb
Merge branch 'master' into factor-out-hoc 2021-06-04 15:31:35 +09:00
Dean Herbert
19a44d65c5 Tidy up code 2021-06-04 15:18:16 +09:00
Dean Herbert
23096c58bb
Merge branch 'master' into fix-spectator-frame-conversion 2021-06-04 15:06:15 +09:00
Dean Herbert
071c07586a Increase music volume back to 80% for the time being 2021-06-04 15:00:53 +09:00
Nathan Alo
996c156106 apply suggestions
- apply 0 alpha to beatmap background if storyboard replaces it
- use an AudioContainer to mute all samples coming from the storyboard
2021-06-04 13:56:10 +08:00
Gagah Pangeran Rosfatiputra
a706ff63ed
change sprite text to text flow 2021-06-04 12:50:03 +07:00
Gagah Pangeran Rosfatiputra
91e77ee4de
add onclick in toc title 2021-06-04 11:43:49 +07:00
Gagah Pangeran Rosfatiputra
37ff6299c9
add target in toc title 2021-06-04 11:43:32 +07:00
Gagah Pangeran Rosfatiputra
e28b38653b
cache scroll container 2021-06-04 11:43:00 +07:00
Gagah Pangeran Rosfatiputra
4e73d02540
move sidebar into local variable 2021-06-04 11:35:23 +07:00
Gagah Pangeran Rosfatiputra
424d1b4025
add margin padding spacing in toc title 2021-06-04 11:18:08 +07:00
Gagah Pangeran Rosfatiputra
41ec531bab
add subtitle toc 2021-06-04 11:12:42 +07:00
Gagah Pangeran Rosfatiputra
d8d4bf66b3
create TocTitle in WikiSidebar 2021-06-04 11:09:20 +07:00
Gagah Pangeran Rosfatiputra
59dbed6418
create ArticleMarkdownContainer in WikiArticlePage 2021-06-04 11:08:51 +07:00
Gagah Pangeran Rosfatiputra
abb522f084
add missing using 2021-06-04 10:53:48 +07:00
Dan Balasescu
0ba493d598
Merge pull request #13318 from gagahpangeran/error-page-placeholder
Add error page placeholder for wiki overlay
2021-06-04 12:20:21 +09:00
Gagah Pangeran Rosfatiputra
b1b305c150
add method AddToc 2021-06-04 10:17:38 +07:00
Gagah Pangeran Rosfatiputra
7e78150144
add basic content wiki sidebar 2021-06-04 10:16:49 +07:00
Dean Herbert
eebd5745a8 Move full stop out of link and reword slightly 2021-06-04 11:44:43 +09:00
Dan Balasescu
233551fc08
Merge pull request #13323 from gagahpangeran/extract-sidebar
Create abstract class `OverlaySidebar`
2021-06-04 11:38:36 +09:00
Gagah Pangeran Rosfatiputra
458910b744
use WikiArticlePage in WikiOverlay 2021-06-04 09:29:36 +07:00
Gagah Pangeran Rosfatiputra
791a9dd33a
add WikiArticlePage 2021-06-04 09:29:10 +07:00
Gagah Pangeran Rosfatiputra
beb0119dd5
initial wiki sidebar 2021-06-04 09:28:31 +07:00
Dan Balasescu
50c60c791f
Merge pull request #13322 from Pasi4K5/seed-for-all-random-mods
Add seed option for all random mods
2021-06-04 11:26:13 +09:00
Gagah Pangeran Rosfatiputra
905472a20b
make NewsSidebar extends OverlaySidebar 2021-06-04 00:12:29 +07:00
Gagah Pangeran Rosfatiputra
076e498a63
create abstract class OverlaySidebar 2021-06-04 00:12:13 +07:00
Dean Herbert
d444fed46f Detach gameplay score from replay recorder before importing
Closes #13320.
2021-06-04 02:00:02 +09:00
Pasi4K5
7a4fc9ffc8 Move seed to base class 2021-06-03 18:16:11 +02:00
Gagah Pangeran Rosfatiputra
c5fc155cc0
Change text wording
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-03 20:37:27 +07:00
Gagah Pangeran Rosfatiputra
490ce0bbc5
load placeholder page when failed 2021-06-03 19:40:54 +07:00
Bartłomiej Dach
5f5f3a8c5c General comment cleanups 2021-06-03 14:20:52 +02:00
Bartłomiej Dach
b2cc2a51ec Rename method to be less misleading
Would rather avoid variations of Equals/Equal/IsEqual. There's not
really much equality involved as the types are different.
2021-06-03 14:13:01 +02:00
Bartłomiej Dach
e8c2483f19 Use standard list instead of bindable list
No reason to use a bindable list there, as `CollectionChanged` was never
subscribed to.
2021-06-03 14:09:52 +02:00
Bartłomiej Dach
8193691cbc Invert condition to reduce nesting 2021-06-03 14:09:52 +02:00
Bartłomiej Dach
acb4873157 Merge branch 'master' into keyboard_shortcuts 2021-06-03 14:09:48 +02:00
Dean Herbert
33ab411e39 Merge branch 'master' into drawavatar-use-avatar-url 2021-06-03 19:36:32 +09:00
Jamie Taylor
054de675ff
allow skinned 'applause' sample to override results screen sfx 2021-06-03 18:35:55 +09:00
Jamie Taylor
582360d0c8
only load the required impact/applause samples 2021-06-03 18:35:51 +09:00
Jamie Taylor
ed012a724b
refactor from using public variables 2021-06-03 18:35:46 +09:00
Jamie Taylor
8dc595d201
move result screen samples to DefaultSkin 2021-06-03 18:35:27 +09:00
Jamie Taylor
63e5bc4543
update sample names and timings 2021-06-03 18:34:33 +09:00
Jamie Taylor
30eff8cc2a
remove overlapping/legacy applause 2021-06-03 18:34:28 +09:00
Jamie Taylor
9ad87ee5dc
add sfx for results screen + sound design tool 2021-06-03 18:34:22 +09:00
smoogipoo
e887807ae7 Apply review fixes 2021-06-03 18:32:05 +09:00
smoogipoo
be03a2d7d2 Fix multiple calls to seek method potentially not working 2021-06-03 17:47:22 +09:00
smoogipoo
c3280083a2 Merge branch 'master' into fix-spectator-frame-conversion 2021-06-03 17:42:01 +09:00