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

58263 Commits

Author SHA1 Message Date
Feodor0090
99c65af6cd
Merge branch 'master' into registration-loc 2023-01-17 13:38:05 +03:00
ansel
df74bccaaa Replace 2 strings with one formattable 2023-01-17 13:31:03 +03:00
Dean Herbert
3f2077a527
Merge pull request #22079 from Joehuu/fix-pause-gameplay-action-not-closing
Make pause overlay close with pause gameplay action
2023-01-17 18:19:41 +09:00
Dean Herbert
53e7873f6c
Merge branch 'master' into fix-pause-gameplay-action-not-closing 2023-01-17 17:41:16 +09:00
Dean Herbert
a1152fa0db
Merge pull request #22147 from Feodor0090/forbid-negative-snap
Forbid negative time snap in editor
2023-01-17 17:35:45 +09:00
Joseph Madamba
da0eb9b0cb Simplify TriggerClicks in gameplay menu overlays 2023-01-17 00:34:52 -08:00
Dean Herbert
c799375ae0
Merge pull request #20709 from Domilz/toolbar-localisation
Localise toolbar home button and ruleset description tooltips
2023-01-17 17:28:34 +09:00
Dean Herbert
dd5db58a53
Merge pull request #22174 from mk56-spn/song_select_nullability
Enable NRT annotations in `SongSelect` classes
2023-01-17 17:24:32 +09:00
Joseph Madamba
8f7cb18217 Use TriggerClick() instead of calling BackButton action for pause gameplay 2023-01-16 23:36:28 -08:00
Joseph Madamba
08c570849f Simplify container logic 2023-01-16 23:24:47 -08:00
Dean Herbert
f74bc4ff7c
Merge pull request #22246 from frenzibyte/mark-tests-flaky
Mark remaining frequently-failing intermittent tests with `FlakyTest` attribute
2023-01-17 15:57:58 +09:00
Dean Herbert
9acf22b2b1
Merge branch 'master' into song_select_nullability 2023-01-17 15:29:37 +09:00
Dean Herbert
ef35493864 Avoid need for weird null check by reordering initialisation process 2023-01-17 15:27:21 +09:00
Dean Herbert
d0c7138313
Merge pull request #21829 from integerrr/replay-menu-expanded-state-memory
Make replay controls menus expand on hover
2023-01-17 15:24:01 +09:00
Dean Herbert
a02556d2fa Move hover logic to SettingsToolboxGroup to avoid expanded state clash 2023-01-17 14:43:22 +09:00
Dean Herbert
6a0bf89401 Merge branch 'master' into replay-menu-expanded-state-memory 2023-01-17 14:30:23 +09:00
Dean Herbert
776b6fa2e1
Merge pull request #22203 from bdach/fix-new-diff-creation-fail
Fix difficulty creation flow failing for some ruleset combinations
2023-01-17 14:08:34 +09:00
Dean Herbert
c085421029
Merge pull request #22236 from Feodor0090/skin-editor-loc
Localise skin editor
2023-01-17 12:27:43 +09:00
Dean Herbert
1f47def3c4
Merge branch 'master' into skin-editor-loc 2023-01-17 11:53:08 +09:00
Dean Herbert
4cf448ec11 Use ToString() for test instead of linq skip 2023-01-17 11:51:17 +09:00
Bartłomiej Dach
0c5a436754
Merge pull request #22241 from stanriders/refactor-levelbadge
Refactor `LevelBadge` to use `LevelInfo`
2023-01-16 23:33:03 +01:00
Bartłomiej Dach
f79037cefb
Move to LoadComplete() better 2023-01-16 21:47:31 +01:00
StanR
3f75506552 Move binding to LoadComplete 2023-01-16 23:42:07 +03:00
StanR
c5d09c0e2c
Rename variable
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-16 23:36:50 +03:00
Bartłomiej Dach
d9d0df78bf
Merge pull request #22206 from Joehuu/beatmap-set-converted-beatmaps
Add ability to view converted beatmaps on beatmap set overlay
2023-01-16 21:28:36 +01:00
StanR
6207a96a29 Refactor LevelBadge to use LevelInfo 2023-01-16 23:24:09 +03:00
ansel
ad32d99daa Localise caps lock warning 2023-01-16 23:08:29 +03:00
ansel
133b9b79d7 Do not touch "currently editing" line 2023-01-16 22:52:17 +03:00
ansel
0ec608ec5d Select button using its index in test 2023-01-16 22:47:14 +03:00
Bartłomiej Dach
bf58fe21ce
Merge branch 'master' into beatmap-set-converted-beatmaps 2023-01-16 20:46:41 +01:00
Salman Ahmed
f63de55a20 Mark ready-button-pressing multiplayer tests with FlakyTest attribute 2023-01-16 22:34:32 +03:00
Salman Ahmed
1a776eb546 Mark item-mutating queue mode tests with FlakyTest attribute 2023-01-16 22:34:04 +03:00
ansel
bb3668c769 Reuse existing 2023-01-16 22:24:03 +03:00
ansel
4c341db33f Localise registration window 2023-01-16 21:31:01 +03:00
ansel
ff5a12fcb4 Localise login form 2023-01-16 20:39:38 +03:00
ansel
17aeb0ec19 Localise editor's UI 2023-01-16 19:55:28 +03:00
ansel
6eb5508404 Localise menu bar 2023-01-16 19:39:50 +03:00
ansel
26f3b1dbfe Localise "revert to default" tooltip 2023-01-16 19:37:47 +03:00
Dean Herbert
4224907f08
Merge pull request #22208 from Feodor0090/editor-loc
Localise most visible parts of editor
2023-01-16 23:05:17 +09:00
Dan Balasescu
83e0e1f1ce
Merge pull request #22232 from frenzibyte/fix-beatmap-options-test-failure
Fix intermittent failure in beatmap options state test
2023-01-16 20:58:03 +09:00
Salman Ahmed
1552726150 Fix intermittent failure in beatmap options state test 2023-01-16 14:06:02 +03:00
Dean Herbert
d00811374f
Merge pull request #22225 from Feodor0090/ruleset-settings-loc
Localise ruleset settings section
2023-01-16 14:04:26 +09:00
Dean Herbert
988544073c
Merge branch 'master' into ruleset-settings-loc 2023-01-16 13:29:15 +09:00
Dean Herbert
eb0f30c641 Use scroll speed localisation in one more usage 2023-01-16 13:28:45 +09:00
Dean Herbert
d19b35bd5f Rename ambiguous translation keys 2023-01-16 13:18:49 +09:00
Joseph Madamba
6a847faea9 Make home string keys more specific 2023-01-15 15:23:26 -08:00
Joseph Madamba
0ff143d4c8 Add argument for play some ruleset string 2023-01-15 15:23:26 -08:00
Joseph Madamba
ae49e724e4 Move converted beatmap icons logic locally 2023-01-15 15:09:25 -08:00
Joseph Madamba
b733f46c6f Apply NRT to BeatmapPicker 2023-01-15 15:09:25 -08:00
Joseph Madamba
27671f0401 Merge remote-tracking branch 'upstream/master' into pr/20709 2023-01-15 15:08:11 -08:00