1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 20:42:56 +08:00
Commit Graph

25874 Commits

Author SHA1 Message Date
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
ekrctb
abb77b95b4 Fix comment grammar 2021-05-30 13:06:28 +09:00
Salman Ahmed
53cbf369d7 Fix potential nullref 2021-05-29 21:22:46 +03:00
Salman Ahmed
42618c713f
Merge branch 'master' into legacy-beatmap-skin-hud-fallback 2021-05-29 20:56:05 +03:00
Dean Herbert
4e7d19a3af
Merge branch 'master' into beatmap-skin 2021-05-29 16:51:17 +09:00
Dean Herbert
9b239e308b Merge branch 'master' into beatmap-skin 2021-05-29 15:36:43 +09:00
ekrctb
265dfe5416 Add test case of DHO setting LifetimeStart in OnApply 2021-05-28 21:51:48 +09:00
ekrctb
43bf734816 Reset lifetime on HitObject.DefaultsApplied 2021-05-28 21:35:26 +09:00
Dean Herbert
8652ac05db Merge branch 'editor-exit-stability' into non-nullable-beatmapset-files 2021-05-28 18:58:35 +09:00
Dean Herbert
ee5eb9576f Fix completely wrong conditional logic 2021-05-28 18:38:50 +09:00
ekrctb
1d5e8f4a91 Fix wrong/misleading comment of InitialLifetimeOffset 2021-05-28 17:19:36 +09:00
Dean Herbert
631d217f78 Remove no longer necessary conditional access 2021-05-28 15:42:35 +09:00
Dean Herbert
6268bbea85 Merge branch 'master' into fix-skin-sample-lookup 2021-05-28 14:47:35 +09:00
Dean Herbert
330d61862d Add a mention of why StartHidden is required 2021-05-28 14:41:01 +09:00
Dean Herbert
581a86b91a Revert "Revert "Fix editor tests failing due to empty files being specified""
This reverts commit 1af684c4b2.
2021-05-28 14:33:06 +09:00
Dean Herbert
41733af0ed Revert "Revert "Make BeatmapSetInfo.Files non-nullable""
This reverts commit 9c4f39e968.
2021-05-28 14:33:05 +09:00
Dean Herbert
b349ff8693 Revert "Add temporary accounting for tests with null files"
This reverts commit e52c0a34f8.
2021-05-28 14:33:04 +09:00
Dean Herbert
f1b5aced6f Merge branch 'master' into editor-exit-stability 2021-05-28 14:32:32 +09:00
Dean Herbert
e52c0a34f8 Add temporary accounting for tests with null files 2021-05-28 14:31:26 +09:00
Dean Herbert
9c4f39e968 Revert "Make BeatmapSetInfo.Files non-nullable"
This reverts commit c24712642c.
2021-05-28 14:15:28 +09:00
Dean Herbert
1af684c4b2 Revert "Fix editor tests failing due to empty files being specified"
This reverts commit fdbd421040.
2021-05-28 14:15:28 +09:00
Dean Herbert
5e8893b203 Update framework 2021-05-28 10:42:13 +09:00
Craftplacer
b3ac67675e
Merge branch 'chat-mention' of github.com:Craftplacer/osu into chat-mention 2021-05-27 21:59:51 +02:00
Craftplacer
13b2b7c148
Fix formatting 2021-05-27 21:58:54 +02:00
Gagah Pangeran Rosfatiputra
854ef0abfd
add simple bound check 2021-05-28 00:55:14 +07:00
Gagah Pangeran Rosfatiputra
ead0e92d7d
use select single node for blurb 2021-05-28 00:50:59 +07:00
Dean Herbert
ce96c58230 Move public members up 2021-05-28 02:46:26 +09:00
Dean Herbert
fe6b1936cb Move OsuUserInputManager out from nested class 2021-05-28 02:46:03 +09:00
Dean Herbert
b4c13d837d Move import logic out to partial class 2021-05-28 02:44:44 +09:00
Dean Herbert
b8edca59eb General function reorganisation 2021-05-28 02:37:14 +09:00
Dean Herbert
4e49fbf7fb Switch protected properties to private where feasible 2021-05-28 02:30:31 +09:00
Dean Herbert
d24a712dd4 Move protected properties to one location and mark setters private where feasible 2021-05-28 02:27:06 +09:00
Dan Balasescu
7e0a4562c9
Merge branch 'master' into fix-bad-make-current-call 2021-05-28 00:32:51 +09:00
Dan Balasescu
fd7a6db774
Merge pull request #12728 from SleepySwords/single-bind-reset-button
Add a reset button to individual keybinds
2021-05-28 00:31:26 +09:00
Dan Balasescu
08c8cd7a66
Merge pull request #12946 from peppy/fix-storyboard-video-widescreen-no-elements
Fix storyboard videos not correctly filling the screen
2021-05-28 00:11:04 +09:00
Dan Balasescu
1ffafdd854
Merge branch 'master' into single-bind-reset-button 2021-05-27 23:55:28 +09:00
Dan Balasescu
bc4ccb8a21
Merge pull request #12916 from peppy/fix-taiko-editor-sample-mutations
Fix osu!taiko editor operations not always updating the menu/visual state correctly
2021-05-27 23:55:16 +09:00
Dan Balasescu
cb850e07f7
Merge pull request #12963 from peppy/fix-settings-panel-hide-animation
Fix settings panel hide animation looking wrong when a sub-panel is visible when hidden
2021-05-27 23:55:00 +09:00
Dan Balasescu
0a3d3bc006
Merge pull request #12958 from peppy/fix-invalid-ssdq-access
Fix `BeatmapCarousel` accessing `ScreenSpaceDrawQuad` of non-loaded children
2021-05-27 23:15:06 +09:00
Dan Balasescu
6ddb2062cf
Merge pull request #13214 from peppy/fix-multiplayer-leaderboard-test-failure
Fix test failure in `TestSceneMultiplayerGameplayLeaderboard`
2021-05-27 22:44:05 +09:00
Dean Herbert
121dd175e6 Fix test failure in TestSceneMultiplayerGameplayLeaderboard
The transfer of users was not accounting for the fact that the
`StartPlay` calls are now scheduled and not necessarily run in time.
2021-05-27 19:57:21 +09:00
Gagah Pangeran Rosfatiputra
e1836cd1b2
add debug assert 2021-05-27 17:12:15 +07:00
Dean Herbert
37ef368738 Move async call out of using to better define the flow of data 2021-05-27 19:03:59 +09:00
Craftplacer
0b17af81f1
Use Contains instead of IndexOf
Co-authored-by: Berkan Diler <b.diler@gmx.de>
2021-05-27 09:48:30 +00:00
Dean Herbert
046087a367 Fix access to AliveChildren before IsLoaded 2021-05-27 16:58:01 +09:00
Dean Herbert
aa23c4a4b9
Merge branch 'master' into keyboard_shortcuts 2021-05-27 16:30:34 +09:00
Gagah Pangeran Rosfatiputra
c72e258bfb
change for to while in create panels 2021-05-27 14:12:49 +07:00
Gagah Pangeran Rosfatiputra
4fbd43fcae
add inline comment for width 2 2021-05-27 13:24:06 +07:00
Dean Herbert
122bb05aa8 Add a mention that OnApply/OnFree is performed after ApplyDefaults 2021-05-27 15:20:35 +09:00
Dean Herbert
b13b732e02 Remove incorrect DefaultSkin usage 2021-05-27 14:50:56 +09:00
Dean Herbert
70a844ac10 Remove allowFallback parameters completely 2021-05-27 14:50:42 +09:00
Dean Herbert
4fd89faaa4 Fix default skin not having resources or providing samples 2021-05-27 14:09:01 +09:00
Dean Herbert
d66f07fccb Move text and isFullWidth parameters to constructor 2021-05-27 14:04:50 +09:00
Salman Ahmed
0c2d3ae0e7 Revert "Move beatmap skin info creation to static method at IBeatmapSkin"
This reverts commit 9806d94b74.
2021-05-27 05:08:49 +03:00
Gagah Pangeran Rosfatiputra
a7865d3f22
move colour provider to BDL 2021-05-27 08:46:24 +07:00
Craftplacer
a679efac1c
Reduce duplicate notification code by making a base class 2021-05-27 01:00:26 +02:00
Craftplacer
cf39e58ce7
Subscribe to CollectionChanged before binding to JoinedChannels 2021-05-27 01:00:08 +02:00
Craftplacer
d47370bac9
Locally bind to LocalUser 2021-05-27 00:59:29 +02:00
Gagah Pangeran Rosfatiputra
649163e13b
Merge branch 'master' into main-page-wiki 2021-05-26 23:51:49 +07:00
Dean Herbert
f6dee13991
Merge pull request #12948 from gagahpangeran/markdown-wiki
Add wiki markdown container
2021-05-27 01:49:32 +09:00
Dean Herbert
735e7b9c74 Pass fetch more action in via ctor to avoid potential nullref 2021-05-26 22:49:39 +09:00
Dean Herbert
9947867e84 Remove unnecessary bindable flow 2021-05-26 22:46:43 +09:00
Dean Herbert
71de541245 Minor spacing / reformatting 2021-05-26 22:35:11 +09:00
Andrei Zavatski
1bde11a07e Refactor ArticleListing 2021-05-26 15:35:38 +03:00
Gagah Pangeran Rosfatiputra
905364b5fe
add url as argument for link action external 2021-05-26 19:34:34 +07:00
Gagah Pangeran Rosfatiputra
7546611c14
remove unused cached 2021-05-26 19:32:49 +07:00
Gagah Pangeran Rosfatiputra
2344a1a411
use image block in markdown container 2021-05-26 19:22:33 +07:00
Gagah Pangeran Rosfatiputra
62fb09774a
create WikiMarkdownImageBlock 2021-05-26 19:22:21 +07:00
Andrei Zavatski
82d977f80a Merge remote-tracking branch 'refs/remotes/ppy/master' into news-request 2021-05-26 14:52:42 +03:00
Dean Herbert
7ed4cbf7bf Fix settings panel hide animation looking wrong when a sub-panel is visible when hidden 2021-05-26 19:25:05 +09:00
Dean Herbert
14a4095140 Merge branch 'master' into beatmap-skin 2021-05-26 18:39:47 +09:00
Dean Herbert
c05dfee220 Simplify default handling flow 2021-05-26 18:28:00 +09:00
Dean Herbert
7c9383b586 Combine RestorableKeyBindingRow back into KeyBindingRow 2021-05-26 18:17:28 +09:00
Gagah Pangeran Rosfatiputra
db8ccad0b8
Merge branch 'master' into markdown-wiki 2021-05-26 15:25:46 +07:00
Dean Herbert
02806fedb0 Add missing newline 2021-05-26 17:17:02 +09:00
Dean Herbert
17334fd2e6 Inline KeyBindingRow construction 2021-05-26 17:12:12 +09:00
Gagah Pangeran Rosfatiputra
9c31b8856d
change image url replace implementation 2021-05-26 15:10:09 +07:00
Dean Herbert
49b4a6ea67 Replace local namespace qualifiers with using 2021-05-26 17:07:24 +09:00
Dean Herbert
f8a3a37797 Remove outdated comment 2021-05-26 17:01:47 +09:00