1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 22:27:25 +08:00
Commit Graph

40582 Commits

Author SHA1 Message Date
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
Samuel Cattini-Schultz
7cdef5cb0a Merge branch 'master' into diffcalc/refactor/catch-clockrate-effects 2021-06-03 15:51:03 +10:00
Dean Herbert
4a5d8215f3
Merge branch 'master' into keyboard_shortcuts 2021-06-03 14:47:40 +09:00
Samuel Cattini-Schultz
94701b77cb Add TODO for variable clockrate support in catch difficulty calculator 2021-06-03 15:44:28 +10:00
Dean Herbert
66dd7b7705 Update test logic to allow gameplay to properly continue 2021-06-03 14:38:50 +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
Dan Balasescu
86a7ab791e
Merge pull request #13308 from peppy/fix-zero-statistics-display
Fix beatmap statistics with value of zero not displaying correctly at song select
2021-06-03 10:53:55 +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
Dan Balasescu
7b88ba8c63
Merge pull request #13300 from peppy/fix-ios-package-mismatch
Fix iOS props Newtonsoft.Json version not matching osu.Game
2021-06-02 18:15:30 +09:00
Dan Balasescu
ff9b1c19e1
Merge pull request #13298 from peppy/fix-stable-import-no-songs-folder
Fix osu!stable directory selection failing if no `Songs` folder is present at install location
2021-06-02 17:47:05 +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
d00cd7be31
Merge pull request #12848 from frenzibyte/remove-hud-component-lookup
Remove HUD skin component lookup in favour of the `MainHUDComponents` target system
2021-06-02 16:45:56 +09:00
Dean Herbert
e76e540ac1 Fix iOS props Newtonsoft.Json version not matching osu.Game 2021-06-02 16:45:25 +09: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
61ce599898
Merge pull request #13269 from peppy/fix-relative-link-resolution
Fix relative URLs having a null argument after resolution to `LinkDetails`
2021-06-02 15:43:05 +09:00
Dean Herbert
d5d5a4d0d7 Actually combine the path 2021-06-02 15:13:21 +09:00
Dean Herbert
bf216687e1 Fix osu!stable directory selection failing if no Songs folder is present at install location 2021-06-02 15:05:06 +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
e9d37bc892
Merge pull request #13285 from ppy/dependabot/nuget/Microsoft.NET.Test.Sdk-16.10.0
Bump Microsoft.NET.Test.Sdk from 16.9.4 to 16.10.0
2021-06-02 14:34:12 +09:00
Dean Herbert
13f86ef370
Merge pull request #13296 from ekrctb/fix-hitcircle-animation-skin-changed
Fix hit circles reappearing when changing skins
2021-06-02 13:31:54 +09:00
Dan Balasescu
c192dbcbf4
Merge pull request #13295 from Joehuu/inspectcode-remove-windows-note
Remove windows-only note from InspectCode section of readme
2021-06-02 12:52:36 +09:00
Joseph Madamba
82c1a9ae4c Remove windows-only note from InspectCode section of readme 2021-06-01 20:12:32 -07:00
Dean Herbert
45984f035b Make autoplay tests test via the ReplayPlayer code path 2021-06-02 11:49:06 +09:00
Dan Balasescu
8f1e64b606
Merge pull request #13258 from ekrctb/fix-scrolling-lifetime
Fix lifetime of scrolling hit object not updated when scrolling speed is adjusted
2021-06-02 11:48:48 +09:00
ekrctb
c06ff3c623 Remove defunct Animate calls 2021-06-02 11:46:28 +09:00
ekrctb
b82190e157 Fix hit circle animation reset when skin is changed
The transforms applied in `Animate` call was not applied because the piece is recreated.
2021-06-02 11:32:24 +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