1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 20:45:46 +08:00
Commit Graph

26159 Commits

Author SHA1 Message Date
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
Robin Avery
10b6b72909
Add guard clause to applyOrigins and rename parameter 2021-06-08 10:29:45 -04:00
Robin Avery
d212918d67
Rename applyCustomAnchors to applyFixedAnchors for consistency with UsesFixedAnchor 2021-06-08 10:14:07 -04:00
smoogipoo
00efed2c39 Add colours for tick judgements 2021-06-08 23:10:21 +09:00
Robin Avery
2c88e6df8d
Simplify applyClosestAnchor to one line by moving another guard clause 2021-06-08 10:09:48 -04: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
Robin Avery
f22cc981d1
Move guard clause from checkAndApplyClosestAnchor to applyAnchor 2021-06-08 09:51:39 -04:00
Robin Avery
529a80871b
Rename some methods for clarity
Methods which operate on a collection of `ISkinnableDrawable`s are now
plural; ones which take a single item are singular.

This also allows cutting down the name of `getClosestAnchorForDrawable`
to just `getClosestAnchor`.
2021-06-08 09:44:42 -04:00
Robin Avery
01da73daf2
Refactor updateDrawableAnchorIfUsingClosest 2021-06-08 09:25:49 -04:00
Robin Avery
6b127f50f2
Inline updateDrawableAnchorIfUsingClosest 2021-06-08 09:14:04 -04:00
Robin Avery
dc50ae40b9
Rename OverridesClosestAnchor to UsesFixedAnchor 2021-06-08 08:28:42 -04: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
Robin Avery
65f594f860
Rename applyAnchor to applyCustomAnchor 2021-06-07 05:08:18 -04: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
Robin Avery
6c9594ee35
Simplify and rearrange SkinSelectionHandler
The file has been restructured and reworded such that there are as few
differences as possible from b36b40cb34.
2021-06-07 02:40:15 -04:00
Robin Avery
29fa4fdf57
Refactor unacceptable syntax 2021-06-07 01:08:39 -04:00
Robin Avery
133d72a8c0
Rename UsingClosestAnchor
It is now "OverridesClosestAnchor". The logic is inverted accordingly.
2021-06-07 00:14:36 -04:00
Robin Avery
f28916e30f
Remove all UsingClosestAnchor() extension logic
It is replaced with ISkinnableDrawable.UsingClosestAnchor.
2021-06-07 00:04:53 -04:00
Robin Avery
ce635af83e
Add UsingClosestAnchor to ISkinnableDrawable
Also implement it as an auto property in its inheritors.
The auto properties default to true.
2021-06-06 23:47:47 -04:00
Dean Herbert
d26c9a66c2 Merge branch 'legacy-skin-default-fallback' into fix-skin-sample-lookup 2021-06-07 12:01:19 +09:00
Robin Avery
6a456e53f4
Rename overly long method 2021-06-06 13:28:17 -04:00
Robin Avery
888882ac63
Remove first-person comment 2021-06-06 13:27:13 -04: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
Robin Avery
da1c38d5a9
Uninvert logic of SkinnableInfo.UsingClosestAnchor
Also rename "IsUsingClosestAnchor" to simply "UsingClosestAnchor".
2021-06-06 10:13:35 -04:00
Dean Herbert
b5f145cfa9 Use null propagation for animation lookups 2021-06-06 23:01:37 +09:00
Robin Avery
63346f6b75
Refactor getTieredComponent 2021-06-06 09:40:58 -04:00
Gagah Pangeran Rosfatiputra
ed733ee648
directly using table of content entry in wiki table of contents 2021-06-06 20:19:39 +07:00
Robin Avery
11b1b8c633
Add serialization support via SkinnableInfo 2021-06-06 07:18:08 -04:00
Robin Avery
c9f5808bf2
Move lookup logic to DrawableExtensions
This is now a global lookup to be shared by serialization and editor.
2021-06-06 06:58:21 -04:00
Robin Avery
4aee76456f
Replace localised strings with static English 2021-06-06 05:34:32 -04:00
Robin Avery
c452715bf1 Allow skin elements to find closest anchor
- Resolves ppy/osu#13252
- Add localisation strings for the context menu instead of using enum
2021-06-06 01:32:04 -04: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
smoogipoo
662bbed5d1 Fix seeking to gameplay too soon 2021-06-03 17:38:51 +09:00
Dan Balasescu
15b43beef1
Merge pull request #11857 from Syriiin/diffcalc/refactor/catch-clockrate-effects
Refactor catch Movement skill to not require explicit clockrate usage
2021-06-03 17:29:27 +09:00
smoogipoo
420df124b5 Add framestable-bypassing seek for spectator 2021-06-03 17:27:21 +09:00
Dan Balasescu
69009a36b7
Merge branch 'master' into autoplay-pause-support 2021-06-03 16:37:41 +09:00
Dean Herbert
48687028a3 Merge branch 'test-platform-actions' into keyboard_shortcuts 2021-06-03 15:35:57 +09:00
Dean Herbert
be91203c92 Add nested PlatformActionContainer to allow testing of platform actions in visual tests 2021-06-03 15:35:32 +09:00
Samuel Cattini-Schultz
f51413ead9 Refactor to pass clockrate in constructor rather than deriving from mods 2021-06-03 16:09:42 +10:00
Dean Herbert
e74fe68c96 Use new platform actions instead of hardcoded keys 2021-06-03 15:04:07 +09:00
ekrctb
b321b20e9d Remove OnAdd/OnRemove of HitObjectContainer
Instead, override `AddDrawable`/`RemoveDrawable`.
2021-06-03 15:00:16 +09:00
ekrctb
0ce7baa3f3 Make HitObjectContainer.Clear non-virtual
It just call `Remove` for all entries.
2021-06-03 15:00:16 +09:00
ekrctb
2c9e5b6c7e Replace EntryCrossedBoundary with more useful RemoveRewoundEntry property
It can be used for dynamically added entries.
2021-06-03 15:00:16 +09:00
ekrctb
fe2934db1d Factor out lifetime management logic of HitObjectContainer 2021-06-03 14:57:28 +09:00
Dean Herbert
a91015302e Replace second usage of new function 2021-06-03 14:56:29 +09:00
Dean Herbert
a6cc37eb3b Mark fields readonly 2021-06-03 14:56:21 +09:00
Nathan Alo
d7d0dde5d2 use created storyboard to check for drawables instead 2021-06-03 13:56:14 +08:00
Dean Herbert
4a5d8215f3
Merge branch 'master' into keyboard_shortcuts 2021-06-03 14:47:40 +09:00
Nathan Alo
62b07fb9ce apply suggestions
- Replace the sprite with a solid black box when a storyboard requests it.
- Create a new storyboard instance and exclude the fail layer as well as strip all samples from it
- Do not attempt in creating the storyboard when it isn't needed
2021-06-03 13:27:00 +08:00
Nathan Alo
d00fb21188 prevent scaling container from creating a storyboard background 2021-06-03 13:24:21 +08:00
Dan Balasescu
44b1102241
Merge branch 'master' into autoplay-pause-support 2021-06-03 13:26:00 +09:00
Dean Herbert
a62dd7cca0 Revert "refactor BeatmapBackgroundWithStoryboard to reduce overhead"
This reverts commit 277545bb06.
2021-06-03 12:33:16 +09:00
Dean Herbert
d6656047e3 Fix beatmap statistics with value of zero not displaying correctly at song select
Closes #13307.
2021-06-03 01:58:51 +09:00
Nathan Alo
277545bb06 refactor BeatmapBackgroundWithStoryboard to reduce overhead
This avoids loading the sprite if its not needed and instead of hiding it, it is removed when the storyboard replaces the background or there is a video.

This also only initializes DrawableStoryboard if there are any elements in any layer.
2021-06-02 20:27:12 +08:00
Dean Herbert
cde8de154d Remove unused test property for now 2021-06-02 19:11:09 +09:00
Dan Balasescu
c065f761c7
Merge branch 'master' into legacy-skin-default-fallback 2021-06-02 19:08:52 +09:00
Dean Herbert
e0eb0adb0a Remove unnecessary bind in ReplayPlayer 2021-06-02 18:32:14 +09:00
Nathan Alo
3c3ef13632 remove fade 2021-06-02 16:28:22 +08:00
Nathan Alo
e66f6e8f91 fix inspect code issues and cleanup code 2021-06-02 16:12:41 +08:00
Nathan Alo
dde64adcb5 add new background type in BackgroundScreenDefault 2021-06-02 15:51:43 +08:00
Nathan Alo
dec18ef826 implement BeatmapBackgroundWithStoryboard 2021-06-02 15:50:58 +08:00
Nathan Alo
5b436ee436 add beatmap with storyboard source 2021-06-02 15:50:33 +08:00
Dean Herbert
5366e7f61e
Merge branch 'master' into remove-hud-component-lookup 2021-06-02 16:10:06 +09:00
Dean Herbert
f8ae70e562 Update existing function type rather than adding an override 2021-06-02 16:04:53 +09:00
Dean Herbert
a15cac6f53 Change the way Score is initialised in Player to better lend to population of metadata 2021-06-02 15:44:04 +09:00
Dan Balasescu
47019196f6
Merge branch 'master' into fix-relative-link-resolution 2021-06-02 14:55:38 +09:00
Dean Herbert
ac761bb075 Use string.Empty instead of arbitrary string 2021-06-02 14:43:35 +09:00
Dean Herbert
4759ac098f
Merge pull request #13293 from smoogipoo/update-dependencies
Update dependencies
2021-06-02 14:35:06 +09:00
Dean Herbert
4fd8c9c17b
Merge pull request #13284 from ppy/dependabot/nuget/ppy.LocalisationAnalyser-2021.525.0
Bump ppy.LocalisationAnalyser from 2021.524.0 to 2021.525.0
2021-06-02 14:34:37 +09:00
Dean Herbert
45984f035b Make autoplay tests test via the ReplayPlayer code path 2021-06-02 11:49:06 +09:00
smoogipoo
d3d8941ec8 Make method internal 2021-06-02 11:11:41 +09:00
Dean Herbert
911256603b Rewrite comment to hopefully be more informative 2021-06-02 11:10:02 +09:00
smoogipoo
8ee2b3a2d2 Merge branch 'master' into fix-scrolling-lifetime 2021-06-02 11:08:28 +09:00
Dan Balasescu
ac83450791
Merge pull request #13256 from ekrctb/update-lifetime-2
Update DHO lifetime on entry lifetime change
2021-06-02 11:07:54 +09:00
Dean Herbert
8a76d97b63 Remove replay logic from DrawableRuleset (and implement in DrawableEditorRulesetWrapper) 2021-06-02 11:06:30 +09:00
smoogipoo
51e4b6c860 Merge remote-tracking branch 'ppy/dependabot/nuget/Microsoft.AspNetCore.SignalR.Client-5.0.6' into update-dependencies 2021-06-02 09:21:26 +09:00
smoogipoo
4184cb88f6 Merge remote-tracking branch 'ppy/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.MessagePack-5.0.6' into update-dependencies 2021-06-02 09:21:09 +09:00
smoogipoo
dc31e2925c Merge remote-tracking branch 'ppy/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson-5.0.6' into update-dependencies 2021-06-02 09:20:37 +09:00
smoogipoo
e19568c91b Merge remote-tracking branch 'ppy/dependabot/nuget/Sentry-3.4.0' into update-dependencies 2021-06-02 09:20:33 +09:00
smoogipoo
b0a229da87 Merge remote-tracking branch 'ppy/dependabot/nuget/ppy.LocalisationAnalyser-2021.525.0' into update-dependencies 2021-06-02 09:20:31 +09:00
dependabot[bot]
a758b38278
Bump Microsoft.AspNetCore.SignalR.Protocols.MessagePack
Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:32 +00:00
dependabot[bot]
a10ef2ba65
Bump Humanizer from 2.8.26 to 2.10.1
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.26 to 2.10.1.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/main/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.26...v2.10.1)

---
updated-dependencies:
- dependency-name: Humanizer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:31 +00:00
dependabot[bot]
deaa381440
Bump Sentry from 3.3.4 to 3.4.0
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.3.4 to 3.4.0.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.3.4...3.4.0)

---
updated-dependencies:
- dependency-name: Sentry
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:30 +00:00
dependabot[bot]
bd8db2ce63
Bump ppy.LocalisationAnalyser from 2021.524.0 to 2021.525.0
Bumps [ppy.LocalisationAnalyser](https://github.com/ppy/osu-localisation-analyser) from 2021.524.0 to 2021.525.0.
- [Release notes](https://github.com/ppy/osu-localisation-analyser/releases)
- [Commits](https://github.com/ppy/osu-localisation-analyser/compare/2021.524.0...2021.525.0)

---
updated-dependencies:
- dependency-name: ppy.LocalisationAnalyser
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:28 +00:00
dependabot[bot]
ea9919e8fe
Bump Microsoft.AspNetCore.SignalR.Client from 5.0.5 to 5.0.6
Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:27 +00:00
dependabot[bot]
069baab883
Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:27 +00:00
Dean Herbert
92ffc4627f Update framework 2021-06-01 23:24:49 +09:00
Dean Herbert
2e2281c7d2 Revert disabling taiko sample tests and fix logic 2021-06-01 18:57:19 +09:00
Dean Herbert
e8aa5c4ecf Merge branch 'legacy-skin-default-fallback' into fix-skin-sample-lookup 2021-06-01 18:05:00 +09:00
Dean Herbert
cd139660ab Merge branch 'master' into legacy-skin-default-fallback 2021-06-01 18:04:54 +09:00
Dean Herbert
3a6d081d82 Remove duplicated taiko fallback 2021-06-01 18:04:49 +09:00
Dean Herbert
ea4644be90 Revert "Fix weird taiko logic failing for weird reasons that probably should not have been a thing"
This reverts commit 69c4ccad05.
2021-06-01 18:04:49 +09:00
Dean Herbert
a837fc9e3b Remove duplicated taiko fallback 2021-06-01 18:00:24 +09:00
Dean Herbert
f14c0eae99 Fix editor no longer creating autoplay frames 2021-06-01 17:28:41 +09:00
Dean Herbert
df0a5689e4 Revert "Fix weird taiko logic failing for weird reasons that probably should not have been a thing"
This reverts commit 69c4ccad05.
2021-06-01 17:13:13 +09:00
Dean Herbert
3668f1861f Fix one more null issue 2021-06-01 17:10:09 +09:00
Dean Herbert
ff815cb4b4 Fix incorrect xmldoc 2021-06-01 16:57:41 +09:00
Dean Herbert
289dc00f38 Merge branch 'master' into autoplay-pause-support 2021-06-01 16:50:44 +09:00
Dean Herbert
145e42928b Fix remaining null checks 2021-06-01 16:49:05 +09:00
Dean Herbert
1f8abcdf6c Merge branch 'master' into fix-relative-link-resolution 2021-06-01 16:49:02 +09:00
Dean Herbert
6e861a9b7f Revert incorrect ScoreProcessor change 2021-06-01 16:39:50 +09:00
Dean Herbert
790f1dacc9 Ensure ScoreProcessor is still hooked up in special case 2021-06-01 16:24:38 +09:00
Salman Ahmed
7c6400735f Merge branch 'master' into remove-hud-component-lookup 2021-06-01 10:17:52 +03:00
Salman Ahmed
c090110ae2 Provide cell skin on content creation 2021-06-01 10:16:13 +03:00
Gagah Pangeran Rosfatiputra
b4dd935538
add corner radius and padding 2021-06-01 14:14:12 +07:00
Gagah Pangeran Rosfatiputra
5108dadfbc
use inline code in markdown text flow 2021-06-01 14:03:57 +07:00
Gagah Pangeran Rosfatiputra
1babb05fc7
add OsuMarkdownInlineCode 2021-06-01 14:03:31 +07:00
Dean Herbert
3ba0d29108 Fix incorrect beatmap being parsed down for autoplay generation 2021-06-01 15:44:24 +09:00
Dean Herbert
240f7facba Add local concessions for autoplay test handling 2021-06-01 15:39:02 +09:00
Dean Herbert
dce24e3d4d
Merge pull request #12950 from gagahpangeran/osu-wiki-overlay
Initial implementation of Wiki Overlay
2021-06-01 15:20:56 +09:00
ekrctb
40949f6c1b Simplify lifetime setter
Setting entry lifetime will cause `LifetimeChanged` event and `base.LifetimeStart`/`End` will be modified in the callback.
2021-06-01 14:46:43 +09:00
ekrctb
0f381f7758 Fix wrong code 2021-06-01 14:38:02 +09:00
Dean Herbert
6ef9b346e1 Fix newly found inspections from 2021.1EAP1 2021-06-01 14:33:21 +09:00
ekrctb
86020adf64 Revert invalid code transformation 2021-06-01 14:28:23 +09:00
Dean Herbert
cbf3ef5400 Create replay via the ICreateReplay interface instead of explicitly ModAutoplay 2021-06-01 14:22:16 +09:00
Dean Herbert
9221213fe5 Fix potential nullref is beatmap load failed 2021-06-01 14:19:23 +09:00
Dean Herbert
14570b6fb1 Merge branch 'master' into autoplay-pause-support 2021-06-01 14:19:21 +09:00
Dean Herbert
a9f4bc6285 Never return a null argument
Enable nullable
2021-06-01 14:11:17 +09:00
Dean Herbert
27b7039520 Use constant 2021-06-01 14:02:32 +09:00
Dean Herbert
6e4730652e Push private methods down 2021-06-01 14:01:08 +09:00
Dean Herbert
3ff97f787a Localise all URL generation for now to avoid weird Schedule logic 2021-06-01 13:56:59 +09:00
Dean Herbert
111bfd4d88 Fix relative URLs having a null argument after resolution to LinkDetails 2021-06-01 13:50:20 +09:00
ekrctb
d5714e63b9 Apply code styling suggestions
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-01 13:17:30 +09:00
ekrctb
86d1ba7ef2 Remove unused IScrollingHitObject interface 2021-05-31 23:17:26 +09:00
Dean Herbert
00b3eea840 Merge branch 'legacy-skin-default-fallback' into fix-skin-sample-lookup 2021-05-31 21:39:04 +09:00
Dan Balasescu
bd7814b487
Merge pull request #13257 from ekrctb/simplify-shoc
Multiple `ScrollingHitObjectContainer` logic simplification
2021-05-31 21:31:10 +09:00
Dean Herbert
69c4ccad05 Fix weird taiko logic failing for weird reasons that probably should not have been a thing 2021-05-31 21:29:47 +09:00
Dean Herbert
1161378b6b Fix incorrect fallback logic in LegacyBeatmapSkin 2021-05-31 21:29:47 +09:00
Dean Herbert
282c5a9177 Fix potential nullref in SkinProvidingContainer 2021-05-31 21:29:47 +09:00
Dean Herbert
3ff9f9c89d Make FindProvider non-default 2021-05-31 21:29:47 +09:00
Dean Herbert
8e489754cc Add ability for LegacySkins to customise the fallback provider 2021-05-31 21:29:47 +09:00
Dean Herbert
88ed95e012 Add FindProvider lookup function 2021-05-31 21:29:47 +09:00
Dean Herbert
1d30791ab0 Add potential pathway for legacy lookups 2021-05-31 21:29:47 +09:00
Dean Herbert
4b27d43e26 Add new parameter for default fallback logic in LegacySkin 2021-05-31 21:29:47 +09:00
ekrctb
ff04942295 Change timing of HitObjectContainer.OnAdd/OnRemove
Now, `OnAdd` is always invoked after the DHO is added to the container.
This change is required by `ScrollingHitObjectContainer` to compute origin adjusted lifetime when origin position is relative to the parent drawable size.
2021-05-31 20:56:25 +09:00
Dan Balasescu
9036b13637
Merge pull request #13260 from peppy/legacy-skin-resource-improvements
Allow `LegacyDefaultSkin` to be constructed without extra resource store parameter
2021-05-31 20:49:21 +09:00
Dean Herbert
f60e9cb085 Remove weird override logic in TestCase methods 2021-05-31 20:00:47 +09:00
Dean Herbert
e78391db7a Fix usage of DI before it's ready in combo colour tests 2021-05-31 19:58:19 +09:00
Dean Herbert
17fa2426d4 Merge branch 'master' into legacy-skin-resource-improvements 2021-05-31 19:36:09 +09:00
smoogipoo
7f24518004 Fix spectator crashing when converting mania replay frames 2021-05-31 19:24:22 +09:00
smoogipoo
d2d0896298 Expose GameplayBeatmap and GameplayRuleset from Player 2021-05-31 19:22:20 +09:00
Dean Herbert
ebfc24a499 Rename conflicting resources 2021-05-31 19:14:49 +09:00
Dean Herbert
65709ec7d7 Move leagcy resource store construction local to DefaultLegacySkin 2021-05-31 19:14:49 +09:00
Dan Balasescu
46b6f49a92
Merge pull request #13230 from peppy/non-nullable-beatmapset-files
Make `BeatmapSet.Files` non-nullable
2021-05-31 19:10:03 +09:00
Dean Herbert
d1ef5483bc
Merge pull request #12826 from frenzibyte/catch-hide-combo-workaround
Hide legacy HUD combo counters on osu!catch ruleset
2021-05-31 19:04:25 +09:00
Dean Herbert
b16d10bd95 Provide game-wide resources via IStorageResourceProvider 2021-05-31 18:57:47 +09:00
Dean Herbert
675fe37446 Change check order around to ensure re-fetches which return no results don't nullref 2021-05-31 18:35:18 +09:00
Dean Herbert
d4cb70735d Merge branch 'master' into non-nullable-beatmapset-files 2021-05-31 18:19:57 +09:00
Dan Balasescu
d8768a8c01
Merge pull request #13254 from peppy/fix-editor-beatmap-creation-test-failure-again
Fix bindable lease failure in editor beatmap creation tests
2021-05-31 17:38:19 +09:00
ekrctb
948a14a627 Merge branch 'simplify-shoc' into fix-scrolling-lifetime
# Conflicts:
#	osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
2021-05-31 16:50:47 +09:00
ekrctb
86d1225aad Reset lifetime to initial lifetime when layout is invalidated 2021-05-31 16:47:10 +09:00
ekrctb
6d96846776 Remove scrollLength caching field
It was not clear when the field is updated.
2021-05-31 16:28:02 +09:00
ekrctb
742c5b442b Remove delay of lifetime update
The scheduling is no longer necessary because `OnAdd` is changed to not invoked immediately for non-pooled DHOs.
2021-05-31 16:24:13 +09:00
ekrctb
3cedc0824d Don't add nested hit objects to the sets
Only top-level hit objects are checked for layout computation caching.
Also, lifetime of nested hit objects are not managed by the HitObjectContainer.
2021-05-31 16:20:35 +09:00
ekrctb
56a0a24cba Make SetInitialLifetime public 2021-05-31 15:33:28 +09:00
Dean Herbert
de0e51a81d Merge branch 'master' into fix-skin-sample-lookup 2021-05-31 15:27:39 +09:00
Salman Ahmed
4e186b0cf5 ContentVisible -> HiddenByRulesetImplementation 2021-05-31 09:24:26 +03:00
Salman Ahmed
02d18c7a49 Merge branch 'master' into remove-hud-component-lookup 2021-05-31 09:23:04 +03:00
ekrctb
e25cca6fbe Update drawable lifetime on entry lifetime change 2021-05-31 14:45:29 +09:00
Dan Balasescu
8c6277f0d8
Merge pull request #13235 from ekrctb/update-lifetime-1
Update hit object lifetime on `HitObject.DefaultsApplied`
2021-05-31 14:44:40 +09:00
Dean Herbert
5925beaf21 Fix bindable lease failure in editor beatmap creation tests 2021-05-31 14:24:46 +09:00
Dean Herbert
06bd696cc2 Remove previous consumption logic in GetWorkingBeatmap
This should not be required since the introduction of `workingCache`,
which does the same thing in a more global way.
2021-05-31 14:11:58 +09:00
ekrctb
0c101d2859
Apply comment rewording suggestion
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-05-31 13:41:49 +09:00
smoogipoo
a4dca6f839 Reorder methods around load() 2021-05-31 13:39:18 +09:00
Dan Balasescu
1ba607b3ff
Merge branch 'master' into osu-game-base-cleanup 2021-05-31 13:32:09 +09:00
Salman Ahmed
fb111e23d8 Remove "temporarily" 2021-05-31 07:24:59 +03:00
Gagah Pangeran Rosfatiputra
113f90e92e
add back schedule is CurrentPath setter 2021-05-31 10:49:16 +07:00
smoogipoo
bca8a9ea53 Fix HandleFrame crashing when not playing 2021-05-31 10:02:02 +09:00
Bartłomiej Dach
ab077c6656
Merge branch 'master' into non-nullable-beatmapset-files 2021-05-31 00:10:03 +02:00
Salman Ahmed
3fbd4e276d Add simple xmldoc 2021-05-31 00:07:29 +03:00
Bartłomiej Dach
78213e09d4
Merge branch 'master' into editor-exit-stability 2021-05-30 23:03:50 +02:00
Salman Ahmed
d12e93bfc6 Add skin traget resetting on setup/teardown steps 2021-05-31 00:02:55 +03:00
Gagah Pangeran Rosfatiputra
3c7f1ae996
Merge branch 'master' into osu-wiki-overlay 2021-05-30 20:27:12 +07:00
Dean Herbert
f3bde258a2
Merge pull request #13232 from ekrctb/initial-lifetime
Fix wrong/misleading comment of `InitialLifetimeOffset`
2021-05-30 22:26:47 +09:00
Dean Herbert
f35cf2d846
Merge branch 'master' into main-page-wiki 2021-05-30 21:01:05 +09:00
Salman Ahmed
fb81e5133f Merge branch 'master' into catch-hide-combo-workaround 2021-05-30 14:16:46 +03:00
Dean Herbert
dac1a98d8a Merge branch 'master' into fix-skin-sample-lookup 2021-05-30 15:19:47 +09:00