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

41379 Commits

Author SHA1 Message Date
Salman Ahmed
53fa229880 Add ruleset resources skin before SkinManager.DefaultSkin 2021-06-23 10:09:25 +03:00
Salman Ahmed
2e6800f586 Enable NRT in RulesetResourcesSkin 2021-06-23 09:52:00 +03:00
Salman Ahmed
0db06c727b Dispose resource stores on finalizer 2021-06-23 09:41:45 +03:00
Salman Ahmed
ee84364d7c Resolve conflict issues 2021-06-22 20:38:24 +03:00
Salman Ahmed
896c1dc202 Merge branch 'master' into ruleset-resources-skin 2021-06-22 20:36:49 +03:00
Dan Balasescu
bdc440f11c
Merge pull request #13605 from aitani9/overlay-item-sound-edge
Empty the space between `OverlayStreamItem`s
2021-06-22 22:13:39 +09:00
Dean Herbert
4cb9c6a842
Merge pull request #13423 from frenzibyte/transformers-per-skin
Refactor ruleset skin transforming logic to be per-`ISkin` rather than one `ISkinSource`
2021-06-22 21:24:56 +09:00
Dan Balasescu
e39ce6cc67
Merge pull request #13610 from gagahpangeran/markdown-heading-font-size
Change osu markdown heading to use actual font size
2021-06-22 20:58:48 +09:00
Dan Balasescu
c436f9f0fa
Merge pull request #13615 from peppy/mod-utils-check-duplicate-mods
Ensure duplicate mods cannot be defined
2021-06-22 20:28:40 +09:00
Dan Balasescu
883b3e56f4
Merge branch 'master' into markdown-heading-font-size 2021-06-22 20:21:25 +09:00
Salman Ahmed
37f7486fb1 Fix potential null reference in LINQ method 2021-06-22 12:25:29 +03:00
Salman Ahmed
71e2815e7e
Update and improve code documentation
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-06-22 12:05:17 +03:00
Salman Ahmed
ece63b9ba1 Remove unused using directive 2021-06-22 12:03:55 +03:00
Salman Ahmed
31cbb36a64 Implement FindProvider and AllSources properly on all test ISkinSources 2021-06-22 12:03:14 +03:00
Dean Herbert
b8126e3ca8 Update framework 2021-06-22 17:59:24 +09:00
Dean Herbert
6e0801b852 Fix incorrect existing test case 2021-06-22 17:41:27 +09:00
Dean Herbert
c4fde635c6 Ensure duplicate mods cannot be defined 2021-06-22 17:41:20 +09:00
Dean Herbert
2bea44fe94
Merge pull request #13349 from ribbanya/skin-editor-closest-anchor
Allow skin elements to find closest anchor
2021-06-22 17:31:05 +09:00
Salman Ahmed
c1284940e1 Fix potentially providing the same skin instance twice in AllSources 2021-06-22 10:49:37 +03:00
Salman Ahmed
d0cdc07b11 Reuse AllSources when looking up on FindProvider 2021-06-22 10:49:21 +03:00
Salman Ahmed
b12adc6073 Remove all test skinning changes in favour of the ISkinSource.AllSources path 2021-06-22 10:48:03 +03:00
Dean Herbert
1fff9a93b9 Merge branch 'master' into skin-editor-closest-anchor 2021-06-22 16:41:51 +09:00
Dean Herbert
4b3165084d Move scoped functionality into local function 2021-06-22 16:40:56 +09:00
Dean Herbert
ffac32a848 Reword xmldoc 2021-06-22 16:40:48 +09:00
Dean Herbert
6c3d2315d0
Merge pull request #13606 from Naxesss/low-diff-checks
Add low difficulty spacing checks
2021-06-22 16:29:37 +09:00
Dean Herbert
14bdcef26b Add missing newline 2021-06-22 16:20:09 +09:00
Dean Herbert
0ad189e357 Expose skin sources via ISkinSource and revert to consuming based on hierarchy 2021-06-22 16:19:55 +09:00
Dean Herbert
1b0aadcc6f Merge branch 'master' into transformers-per-skin 2021-06-22 16:03:15 +09:00
Dan Balasescu
d8b23bb841
Merge pull request #13611 from ekrctb/remove-unused-argument
Remove unused constructor argument from `CatchPlayfield`
2021-06-22 15:54:31 +09:00
ekrctb
b54e82eb99 Remove unused argument from CatchPlayfield 2021-06-22 15:23:50 +09:00
Dean Herbert
e9339d6100 Move some inline comments on consts to xmldoc instead 2021-06-22 15:16:19 +09:00
Gagah Pangeran Rosfatiputra
5c3129f1a2
add font size in HeadingTextFlowContainer 2021-06-22 12:24:56 +07:00
Gagah Pangeran Rosfatiputra
f89c154e18
change GetFontSizeByLevel to return actual font size 2021-06-22 12:24:25 +07:00
Salman Ahmed
ec040ff3fc Fix leak due to not properly unbinding SourceChanged event on disposal 2021-06-22 05:05:41 +03:00
Salman Ahmed
caa90bccc6 Fix default skin potentially added twice in RulesetSkinProvidingContainer 2021-06-22 03:45:43 +03:00
Salman Ahmed
627c857da8 Propagate SourceChanged events from SkinManager down in the ruleset skin container 2021-06-22 03:45:24 +03:00
Salman Ahmed
9e5bb146d3 Add xmldoc to SkinManager
The `<summary>` part comes from `BeatmapManager`, which I believe works correctly here as well, as this does handle the "storage and retrieval" of skins.
2021-06-22 03:07:31 +03:00
Salman Ahmed
97dbc7f20e Add back SkinManager.DefaultSkin to the ruleset skin lookup sources 2021-06-22 02:54:34 +03:00
Salman Ahmed
d53a43cf3c Isolate RulesetSkinProvidingContainer from falling back to parent skin sources
For simplicity of lookup order, and which sources are used for the lookup.
2021-06-22 02:53:22 +03:00
Salman Ahmed
ebe0d43790 Add ability to disallow falling back to parent skins 2021-06-22 02:51:17 +03:00
aitani9
36e459e97e Use margin instead of padding 2021-06-21 13:42:15 -07:00
Naxess
629c98e6a0 Add time distance equality tests 2021-06-21 15:34:11 +02:00
Naxess
e11139eadf Add low difficulty overlap tests
Moq is introduced to mock sliders' end time/position. This is already used similarly in `osu.Game.Tests`.
2021-06-21 15:33:50 +02:00
Naxess
2f3f4f3e4b Add new checks to verifier 2021-06-21 15:30:45 +02:00
Naxess
fcb918d0e1 Add time distance equality check 2021-06-21 15:30:23 +02:00
Naxess
3eb088f89a Add low difficulty overlaps check 2021-06-21 15:30:04 +02:00
Dean Herbert
5b9bf54f1f
Merge pull request #13545 from frenzibyte/legacy-spinner-approach-circle
Add support for legacy spinner approach circles
2021-06-21 18:52:06 +09:00
Salman Ahmed
999bf27eae Remove unnecessary abstraction of ApproachCircle property 2021-06-21 12:07:00 +03:00
Salman Ahmed
ba15f7c19b Move ApproachCircle out of the scale container and revert relevant changes 2021-06-21 10:47:38 +03:00
Dan Balasescu
7d31943ff5
Merge pull request #13597 from Joehuu/fix-beatmap-discussion-links
Fix beatmap discussion links wrongly leading to beatmap page
2021-06-21 14:52:55 +09:00