Commit Graph

42096 Commits

Author SHA1 Message Date
f35cf2d846 Merge branch 'master' into main-page-wiki 2021-05-30 21:01:05 +09:00
60b781701f Rewrite catch combo counter hide logic 2021-05-30 14:22:11 +03:00
fb81e5133f Merge branch 'master' into catch-hide-combo-workaround 2021-05-30 14:16:46 +03:00
656b286c78 Merge pull request #12875 from frenzibyte/legacy-beatmap-skin-hud-fallback
Fix legacy beatmap skins not properly falling back on HUD components request
2021-05-30 20:11:07 +09:00
17574833fb Update other transformers with similar refactored logic 2021-05-30 19:15:59 +09:00
50d71faf56 Restructure lookup code to avoid repeating the base call 2021-05-30 17:55:10 +09:00
dac1a98d8a Merge branch 'master' into fix-skin-sample-lookup 2021-05-30 15:19:47 +09:00
abb77b95b4 Fix comment grammar 2021-05-30 13:06:28 +09:00
fbc316ea1d Fix legacy skin transformers potentially ignoring source implementations 2021-05-29 21:23:22 +03:00
53cbf369d7 Fix potential nullref 2021-05-29 21:22:46 +03:00
200fecc774 Fix missing using directive 2021-05-29 21:22:39 +03:00
42618c713f Merge branch 'master' into legacy-beatmap-skin-hud-fallback 2021-05-29 20:56:05 +03:00
f144fcf16e Merge pull request #12862 from frenzibyte/beatmap-skin
Mark `WorkingBeatmap.GetSkin()` as abstract instead of using `DefaultSkin`
2021-05-29 17:21:57 +09:00
4e7d19a3af Merge branch 'master' into beatmap-skin 2021-05-29 16:51:17 +09:00
951fc5ef6e Remove misleading comment and misplaced bug fix
This shouldn't be fixed in a test scene; the underlying issue should be
fixed in actual game code.
2021-05-29 15:39:13 +09:00
9b239e308b Merge branch 'master' into beatmap-skin 2021-05-29 15:36:43 +09:00
bf9ae2d656 Merge pull request #13237 from Susko3/fix-capitalization-of-catch-results
Fix capitalisation of osu!catch HitResults
2021-05-29 02:17:34 +09:00
2439de1c3d fix capitalzation of osu!catch HitResults 2021-05-28 18:40:58 +02:00
265dfe5416 Add test case of DHO setting LifetimeStart in OnApply 2021-05-28 21:51:48 +09:00
68c5f4813e Add test of lifetime update on DefaultsApplied 2021-05-28 21:35:26 +09:00
43bf734816 Reset lifetime on HitObject.DefaultsApplied 2021-05-28 21:35:26 +09:00
972bd11ea9 Merge pull request #13226 from peppy/update-framework
Update framework
2021-05-28 20:26:23 +09:00
8652ac05db Merge branch 'editor-exit-stability' into non-nullable-beatmapset-files 2021-05-28 18:58:35 +09:00
ba80361c4c Fix tests that were previously doing reference comparisons 2021-05-28 18:38:50 +09:00
ee5eb9576f Fix completely wrong conditional logic 2021-05-28 18:38:50 +09:00
1d5e8f4a91 Fix wrong/misleading comment of InitialLifetimeOffset 2021-05-28 17:19:36 +09:00
631d217f78 Remove no longer necessary conditional access 2021-05-28 15:42:35 +09:00
6268bbea85 Merge branch 'master' into fix-skin-sample-lookup 2021-05-28 14:47:35 +09:00
330d61862d Add a mention of why StartHidden is required 2021-05-28 14:41:01 +09:00
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
41733af0ed Revert "Revert "Make BeatmapSetInfo.Files non-nullable""
This reverts commit 9c4f39e968.
2021-05-28 14:33:05 +09:00
b349ff8693 Revert "Add temporary accounting for tests with null files"
This reverts commit e52c0a34f8.
2021-05-28 14:33:04 +09:00
f1b5aced6f Merge branch 'master' into editor-exit-stability 2021-05-28 14:32:32 +09:00
e52c0a34f8 Add temporary accounting for tests with null files 2021-05-28 14:31:26 +09:00
9c4f39e968 Revert "Make BeatmapSetInfo.Files non-nullable"
This reverts commit c24712642c.
2021-05-28 14:15:28 +09:00
1af684c4b2 Revert "Fix editor tests failing due to empty files being specified"
This reverts commit fdbd421040.
2021-05-28 14:15:28 +09:00
5e8893b203 Update framework 2021-05-28 10:42:13 +09:00
b3ac67675e Merge branch 'chat-mention' of github.com:Craftplacer/osu into chat-mention 2021-05-27 21:59:51 +02:00
13b2b7c148 Fix formatting 2021-05-27 21:58:54 +02:00
854ef0abfd add simple bound check 2021-05-28 00:55:14 +07:00
ead0e92d7d use select single node for blurb 2021-05-28 00:50:59 +07:00
ce96c58230 Move public members up 2021-05-28 02:46:26 +09:00
fe6b1936cb Move OsuUserInputManager out from nested class 2021-05-28 02:46:03 +09:00
b4c13d837d Move import logic out to partial class 2021-05-28 02:44:44 +09:00
b8edca59eb General function reorganisation 2021-05-28 02:37:14 +09:00
4e49fbf7fb Switch protected properties to private where feasible 2021-05-28 02:30:31 +09:00
d24a712dd4 Move protected properties to one location and mark setters private where feasible 2021-05-28 02:27:06 +09:00
8dce147b8a Merge pull request #12922 from peppy/fix-bad-make-current-call
Fix `Player` potentially running `MakeCurrent` when already removed from the screen stack
2021-05-28 00:42:42 +09:00
7e0a4562c9 Merge branch 'master' into fix-bad-make-current-call 2021-05-28 00:32:51 +09:00
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