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

40579 Commits

Author SHA1 Message Date
Dean Herbert
9b239e308b Merge branch 'master' into beatmap-skin 2021-05-29 15:36:43 +09:00
Dean Herbert
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
Susko3
2439de1c3d fix capitalzation of osu!catch HitResults 2021-05-28 18:40:58 +02:00
ekrctb
265dfe5416 Add test case of DHO setting LifetimeStart in OnApply 2021-05-28 21:51:48 +09:00
ekrctb
68c5f4813e Add test of lifetime update on DefaultsApplied 2021-05-28 21:35:26 +09:00
ekrctb
43bf734816 Reset lifetime on HitObject.DefaultsApplied 2021-05-28 21:35:26 +09:00
ekrctb
972bd11ea9
Merge pull request #13226 from peppy/update-framework
Update framework
2021-05-28 20:26:23 +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
ba80361c4c Fix tests that were previously doing reference comparisons 2021-05-28 18:38:50 +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
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
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
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
7844c2d4be
Merge pull request #12962 from peppy/fix-slow-load-test-failure
Fix `SlowLoadPlayer` potentially not being instantiated in time for test
2021-05-27 23:54:20 +09:00
Dan Balasescu
1a0ace8d58
Merge branch 'master' into fix-slow-load-test-failure 2021-05-27 23:15:42 +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
680eae8598
Merge pull request #12967 from LittleEndu/slider-tail-position
Make `DrawableSliderTail` not require `ITrackSnaking`
2021-05-27 23:13:43 +09:00
Dan Balasescu
be7f9821d5
Merge pull request #13215 from peppy/update-issue-template
Remove feature request issue template and link to discussions
2021-05-27 22:46:35 +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
Dan Balasescu
f45c934dd5
Merge pull request #13213 from peppy/fix-storyboard-outro-test-failure
Fix test failures in `TestSceneStoryboardWithOutro`
2021-05-27 21:51:13 +09:00
Dan Balasescu
a7afdd427c
Merge pull request #13212 from peppy/fix-collection-async-test-failures
Fix collection import tests deadlocking due to `TaskCompletionSource` continuation triggering host disposal
2021-05-27 21:49:37 +09:00
Dean Herbert
ff1fa71e6f Remove feature request issue template and link to discussions 2021-05-27 20:06:37 +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
Dean Herbert
bcf1e3db1e Fix test failures in TestSceneStoryboardWithOutro
Test was not accounting for the fact that the results may not have
loaded in time.
2021-05-27 19:45:55 +09:00
Dean Herbert
a2ed85bf46 Fix broken formatting 2021-05-27 19:34:39 +09:00