1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-24 08:17:19 +08:00

25349 Commits

Author SHA1 Message Date
Bartłomiej Dach
78213e09d4
Merge branch 'master' into editor-exit-stability 2021-05-30 23:03:50 +02: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
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
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
330d61862d Add a mention of why StartHidden is required 2021-05-28 14:41:01 +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 c24712642cc567f158f2d4a7b559429567347d8b.
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 fdbd421040efcbd9718d95841034471f930e6291.
2021-05-28 14:15:28 +09:00
Dean Herbert
5e8893b203 Update framework 2021-05-28 10:42:13 +09: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
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
Dean Herbert
046087a367 Fix access to AliveChildren before IsLoaded 2021-05-27 16:58:01 +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
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 9806d94b745348e7c44af36cc93b76401234d225.
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
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
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