1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 05:12:53 +08:00
Commit Graph

37079 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
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
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
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
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
1f47def3c4
Merge branch 'master' into skin-editor-loc 2023-01-17 11:53:08 +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
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
Bartłomiej Dach
bf58fe21ce
Merge branch 'master' into beatmap-set-converted-beatmaps 2023-01-16 20:46:41 +01: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
Dean Herbert
988544073c
Merge branch 'master' into ruleset-settings-loc 2023-01-16 13:29:15 +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
Joseph Madamba
85c1932851 Mark Converts as nullable 2023-01-15 12:46:41 -08:00
ansel
6f84641596 Localise osu!mania settings 2023-01-15 23:30:20 +03:00
ansel
9ce7c51b14 Localise osu! settings 2023-01-15 23:29:58 +03:00
ansel
00acea59fc Move some strings to common 2023-01-15 19:37:40 +03:00
mk56-spn
9a29c9ae26 remove hacky method to check if carousel is null 2023-01-15 15:32:53 +01:00
Dean Herbert
c5775aa452
Merge branch 'master' into song_select_nullability 2023-01-15 22:44:13 +09:00
Dean Herbert
4cf4a66858 Make MusicController a required dependency of SongSelect 2023-01-15 22:43:30 +09:00
Dean Herbert
f7af5a8115 Revert some formatting changes 2023-01-15 22:39:00 +09:00
Salman Ahmed
13c1b8f5a4 Fix intermittent failure in tests with restarting player instances 2023-01-15 16:06:06 +03:00
ansel
5d2e09137c Remove text padding in editor menu for now 2023-01-15 14:40:53 +03:00
ansel
8777d5349b Use existing strings 2023-01-15 14:39:34 +03:00
Joseph Madamba
627d1725c3 Fix kudosu wiki link from user profile not linking to in-game overlay 2023-01-14 19:56:51 -08:00
ansel
87650044bb Localise create/save dialog 2023-01-15 01:50:47 +03:00
ansel
78e562903d Localise part of editor 2023-01-15 01:50:47 +03:00