1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 14:13:21 +08:00
Commit Graph

42886 Commits

Author SHA1 Message Date
Dean Herbert
d066ebcd70
Merge pull request #12682 from frenzibyte/refactor-combo-colour-retrieval
Refactor combo colours retrieval to use skin config lookups instead
2021-07-20 19:47:57 +09:00
Dean Herbert
16a2e63bd4 Use existing localisation 2021-07-20 19:44:02 +09:00
Dean Herbert
59457743e5 Move further to the right to avoid overlap with toolbox listing 2021-07-20 19:43:52 +09:00
Dean Herbert
9c4fbf45e9 Add the ability to enter and exit the skin editor via on-screen buttons 2021-07-20 19:36:12 +09:00
Dean Herbert
8e1f8c28bd Use default value to denote no play date, rather than null 2021-07-20 19:05:08 +09:00
Dean Herbert
1a8ab77f21 Revert nullability change 2021-07-20 19:03:29 +09:00
Dan Balasescu
15127f972e
Merge branch 'master' into fix-online-play-sub-screens-not-async-loaded 2021-07-20 18:47:41 +09:00
Dan Balasescu
13733d8c75
Merge pull request #13943 from peppy/fix-subscreen-exit-before-loaded
Ensure online play subscreen is loaded before forwarding `OnExiting`
2021-07-20 18:36:42 +09:00
Dean Herbert
26cc4af87c Revert unintended changes 2021-07-20 16:44:51 +09:00
Dean Herbert
d87ea741ed Fix OnlinePlayScreen sub-screens not loaded asynchronously 2021-07-20 16:38:39 +09:00
Dean Herbert
4113eae6ad Add test coverage of fail scenario 2021-07-20 16:37:13 +09:00
Salman Ahmed
a1001542f3 Update outdated test cases 2021-07-20 10:28:30 +03:00
Salman Ahmed
554652b033 Merge branch 'refactor-combo-colour-retrieval' into legacy-beatmap-combo-offset 2021-07-20 10:11:52 +03:00
Salman Ahmed
1af230c48c Merge branch 'master' into refactor-combo-colour-retrieval 2021-07-20 10:08:25 +03:00
Dean Herbert
fe414b942f Ensure online play subscreen is loaded before forwarding OnExiting
Closes https://github.com/ppy/osu-framework/issues/4619 (actually not a
framework issue; the framework correctly guards against this scenario,
see
4e29504384/osu.Framework/Screens/ScreenStack.cs (L277)).

Added the assertions to be very explicit about the nested stack's state
at this point. Both of those events can only be triggered if the stack
has a loaded screen (as far as I can tell), making this check
unnecessary in those cases.
2021-07-20 15:51:34 +09:00
Dean Herbert
662822a40c Avoid showing time of play on results screen when autoplay
Closes https://github.com/ppy/osu/issues/13940.
2021-07-20 15:19:44 +09:00
Dean Herbert
6cc81c24b4
Merge pull request #13785 from ekrctb/dependency-providing-container
Add a convenient way to provide ad-hoc dependency to children in visual test
2021-07-20 14:18:17 +09:00
Dean Herbert
f415dc18a7
Merge pull request #13941 from Henry-YSLin/update-TargetBeatContainer
Update `OsuModTarget` to take advantage of the new `BeatSyncedContainer`
2021-07-20 12:30:49 +09:00
Henry Lin
1c6a13fca7 Disallow mistimed event firing 2021-07-20 10:31:19 +08:00
Henry Lin
a387d8df74 Use BeatSyncClock 2021-07-20 10:30:40 +08:00
Salman Ahmed
6a8c16d3ef Fix news/wiki tests checking against incorrect constant string 2021-07-20 03:29:32 +03:00
Salman Ahmed
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
Salman Ahmed
456f4e6f1f Move RankingsScope to own file and fix mapper strings 2021-07-20 02:37:11 +03:00
Salman Ahmed
944bf2c4f9 Fix incorrect property xmldoc inherited 2021-07-20 02:25:38 +03:00
Salman Ahmed
ccc782ea7e Add description to key names of description strings 2021-07-20 02:24:02 +03:00
Dean Herbert
9ea1f5900a Don't consider version suffixes when checking for updates
This is just to make life easier for me with deploys for now.
2021-07-20 01:05:37 +09:00
Dean Herbert
e77597c2b6
Merge pull request #13921 from Game4all/localise-profile-overlay
Localise user profile overlay
2021-07-20 00:37:01 +09:00
Dean Herbert
844152e1b1
Merge pull request #13861 from peppy/add-password-support
Add multiplayer room password support
2021-07-19 23:32:28 +09:00
Dan Balasescu
6e104fe084
Merge pull request #13894 from peppy/fix-beat-synced-container-alt
Fix multiple issues with `BeatSyncedContainer`
2021-07-19 23:19:20 +09:00
Dan Balasescu
0fc1d3e404
Merge pull request #13931 from peppy/fix-replay-date
Fix replay dates being unexpectedly updated on play completion
2021-07-19 22:56:27 +09:00
ekrctb
9db5847344 Add test that a slider path is resampled when the path is edited 2021-07-19 22:53:32 +09:00
ekrctb
8586458704 Implement vertex deletion in juice stream selection blueprint 2021-07-19 22:53:32 +09:00
ekrctb
08f8d4e65e Implement vertex addition in juice stream selection blueprint 2021-07-19 22:53:32 +09:00
ekrctb
01f5258a26 Add tests of juice stream selection blueprint 2021-07-19 22:53:32 +09:00
ekrctb
8cc1630655 Add initial juice stream editing 2021-07-19 22:53:32 +09:00
smoogipoo
6a55cb9df0 Revert unintended change
It's a deeper issue with ScreenStack (see:
https://github.com/ppy/osu-framework/issues/4619).
2021-07-19 22:52:07 +09:00
smoogipoo
7956f73f62 Move initial content into step 2021-07-19 22:31:53 +09:00
smoogipoo
57a99886d5 Fix password icon not disappearing when no password 2021-07-19 22:31:01 +09:00
smoogipoo
892d858d5f Fix compile error 2021-07-19 22:23:31 +09:00
smoogipoo
b7c2d6b1ab Merge branch 'master' into add-password-support 2021-07-19 22:23:09 +09:00
Dean Herbert
6d49165664
Merge pull request #13928 from ekrctb/juice-stream-path
Add `JuiceStreamPath` as alternative representation of `JuiceStream` path for catch editor
2021-07-19 22:18:05 +09:00
Dan Balasescu
5ef1fe6948
Merge branch 'master' into fix-replay-date 2021-07-19 21:58:37 +09:00
Dan Balasescu
f3bcaf7f11
Merge pull request #13929 from peppy/i-deep-cloneable
Create a deep clone of score for score submission purposes
2021-07-19 21:58:27 +09:00
kj415j45
9c642f0028 Merge branch 'localisation-header' of https://github.com/kj415j45/osu into localisation-header 2021-07-19 20:48:54 +08:00
kj415j45
fe7aa73aad Add localisation for BeatmapSetHeader 2021-07-19 20:45:03 +08:00
smoogipoo
0a43e54dfc Fix request failing due to parameters 2021-07-19 21:24:22 +09:00
ekrctb
81d0a9bd9c Fix item ordering 2021-07-19 21:05:36 +09:00
kj415j45
3a4da6b867 use same code style
Co-authored-by: frenzibyte <frenzibyte@gmail.com>
2021-07-19 20:02:39 +08:00
smoogipoo
a001e4aa16 Fix web request failing if password is null 2021-07-19 20:57:16 +09:00
smoogipoo
05295241b8 Add room joining tests 2021-07-19 20:55:14 +09:00