Commit Graph

42270 Commits

Author SHA1 Message Date
51b056bf66 Fix WikiHeader setting string.Empty rather than null on breadcrumb
That's supposed to be fixed already in the base PR, but somehow it
continued to exist here.
2021-07-20 02:37:11 +03:00
456f4e6f1f Move RankingsScope to own file and fix mapper strings 2021-07-20 02:37:11 +03:00
944bf2c4f9 Fix incorrect property xmldoc inherited 2021-07-20 02:25:38 +03:00
ccc782ea7e Add description to key names of description strings 2021-07-20 02:24:02 +03:00
9c642f0028 Merge branch 'localisation-header' of https://github.com/kj415j45/osu into localisation-header 2021-07-19 20:48:54 +08:00
fe7aa73aad Add localisation for BeatmapSetHeader 2021-07-19 20:45:03 +08:00
3a4da6b867 use same code style
Co-authored-by: frenzibyte <frenzibyte@gmail.com>
2021-07-19 20:02:39 +08:00
48d398b04a Merge 'master' of ppy/osu into localisation-header 2021-07-19 19:46:40 +08:00
765881d8b0 Move strings 2021-07-19 19:27:33 +08:00
57eed88601 symbol renaming
Co-authored-by: frenzibyte <frenzibyte@gmail.com>
2021-07-19 19:27:33 +08:00
5fc1397564 Apply suggestion from code review
Co-authored-by: frenzibyte <frenzibyte@gmail.com>
2021-07-19 19:27:33 +08:00
bf6204f64e Merge https://github.com/kj415j45/osu into localisation-header 2021-07-19 19:24:09 +08:00
23ef666f34 Merge pull request #13887 from ekrctb/legacy-converted-y
Preserve Y position of hit objects in osu!catch
2021-07-19 18:48:23 +09:00
f1f6af88a1 Merge pull request #13926 from peppy/set-rank-on-failed-submission
Set score's rank on a failed submission
2021-07-19 18:45:21 +09:00
473011070f Merge pull request #13908 from peppy/editor-disallow-placement-when-untimed
Fix editor composer allowing object placement without timing present
2021-07-19 18:37:19 +09:00
5f94692aa6 Merge pull request #13927 from ekrctb/catch-hitobjec-utils
Change the way position is set for components of catch editor
2021-07-19 18:26:11 +09:00
b29209d13f Ensure tool is always set back to select tool when beatmap becomes untimed 2021-07-19 17:08:40 +09:00
bde35d9f21 Rename radio button classes to be local to editor 2021-07-19 16:57:12 +09:00
c347584851 Use added utility function 2021-07-19 13:33:46 +09:00
70c9d7105f Add a function to compute hit object position in catch editor 2021-07-19 13:33:22 +09:00
d7f997a7f3 Set score's rank on a failed submission
As we don't have a `RankInfo.F`, this is the next best choice. I am also
adding a check osu-web side for this - this is just to make sure we
aren't sending scores with SS when they are not actually completed.

I'm working on a separate PR to ensure this does not get mutated during
the player exit process.
2021-07-19 12:36:15 +09:00
48b34457e7 Merge pull request #13925 from peppy/fix-icon-overwrite
Fix osu!(lazer) overwriting osu!(stable) desktop icons by adding back a suffix
2021-07-19 12:08:03 +09:00
49fb8f52e2 Merge pull request #13922 from bdach/replace-get-or-default-calls
Replace calls to obsoleted `GetOrDefault()` extension
2021-07-19 11:55:11 +09:00
e0af5f0469 Fix osu!(lazer) overwriting osu!(stable) desktop icons by adding back a suffix
As discussed in https://github.com/ppy/osu/issues/13864, Squirrel will
use the product name before the title, allowing us to use this variable
to update the icon while not changing the window display title or naming
elsewhere.
2021-07-19 11:38:45 +09:00
fb5d25405e Replace calls to obsoleted GetOrDefault() extension 2021-07-18 21:52:16 +02:00
1cc9e504cf Remove incorrectly added null coalesce 2021-07-19 02:17:21 +09:00
1661c0c681 Merge branch 'master' into localisation-header 2021-07-19 02:13:04 +09:00
856adfe6a3 Merge pull request #12877 from Henry-YSLin/osu-target-mod
Implement osu target mod
2021-07-19 02:09:34 +09:00
4aa0e62673 Merge pull request #13911 from kj415j45/localisation-base
Add support for localising breadcrumb controls
2021-07-19 02:09:11 +09:00
6e065362be Merge branch 'master' into osu-target-mod 2021-07-18 18:22:36 +02:00
fdebe4b94a Code formatting fixes 2021-07-18 22:01:26 +08:00
49f0c707f6 Move approach circle hiding within BeginAbsoluteSequence 2021-07-18 22:34:28 +09:00
353ff5c6ce Merge pull request #13915 from bdach/fix-tourney-seeding-crash
Fix seeding screen crashing on seedings with null mod
2021-07-18 17:47:29 +09:00
f80b183777 Add localisation for DashboardOverlayHeader 2021-07-18 02:45:16 +08:00
f588607ed9 Add localisation for BeatmapListingHeader 2021-07-18 02:45:01 +08:00
3b48975f1e Add localisation for RankingOverlayHeader 2021-07-18 02:44:46 +08:00
93e79d122f Move strings together 2021-07-18 02:24:59 +08:00
224c37bdc3 Add localisation for RankingOverlay 2021-07-18 02:24:39 +08:00
53fe61504c Add localisation for ChangelogHeader 2021-07-18 01:35:54 +08:00
1b4bff0d9f Optimize code style
Co-authored-by: frenzibyte <frenzibyte@gmail.com>
Co-authored-by: bdach <dach.bartlomiej@gmail.com>
2021-07-18 01:29:53 +08:00
7be7fb4ca9 Merge pull request #13906 from peppy/tournament-flow-warnings
Show warning on screens which require a current match to be selected
2021-07-17 19:13:00 +02:00
32ca2b939b Merge branch 'master' into tournament-flow-warnings 2021-07-17 18:33:45 +02:00
714255e6d4 Fix seeding screen crashing on seedings with null mod 2021-07-17 18:06:47 +02:00
9a2fb8ca6c Add test coverage for null mod on seeding screen 2021-07-17 18:06:47 +02:00
f4eeb9139e Correct code style 2021-07-17 21:37:58 +08:00
0183564810 Merge branch 'localisation-base' of https://github.com/kj415j45/osu into localisation-base 2021-07-17 21:19:14 +08:00
ca1080dfb5 use switch statement
Co-authored-by: bdach <dach.bartlomiej@gmail.com>
2021-07-17 21:16:57 +08:00
5b4a1ef70a Update test to match Breadcrumb change 2021-07-17 20:40:59 +08:00
7859d02c5b Allow null for breadcrumb control 2021-07-17 20:33:26 +08:00
6bebb1fdb9 Merge branch 'master' into localisation-base 2021-07-17 19:50:52 +08:00