h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 01:55:37 +08:00
Code Issues Releases Wiki Activity
42,375 Commits 3 Branches 661 Tags 369 MiB
8b09ddbcd6
Commit Graph

42375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derrick Timmermans
8b09ddbcd6
Merge branch 'ppy:master' into timeline-object-interactions 2021-07-20 16:36:39 +02:00
Dan Balasescu
738d321788
Merge pull request #13946 from peppy/fix-online-play-sub-screens-not-async-loaded 
Fix `OnlinePlayScreen` sub-screens not loaded asynchronously
 2021-07-20 19:51:13 +09:00
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
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
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
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
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
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
smoogipoo
0a43e54dfc Fix request failing due to parameters 2021-07-19 21:24:22 +09: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
smoogipoo
3168a927dc Fix possible exception 2021-07-19 20:50:30 +09:00
smoogipoo
2eec524f27 Fix password not copied from multiplayer client 2021-07-19 20:20:08 +09:00
smoogipoo
d6aa15e5d7 Remove local APIRoom from test multiplayer client 2021-07-19 20:19:23 +09:00
smoogipoo
1b9d297911 Add test 2021-07-19 20:08:29 +09:00
smoogipoo
a5a0f12e19 Also copy password in test room manager 2021-07-19 20:07:56 +09:00
smoogipoo
26d0eea485 Set HasPassword correctly in the response room 2021-07-19 20:03:32 +09:00
smoogipoo
2515785f93 Use room password to fill settings textbox 2021-07-19 20:03:32 +09:00
smoogipoo
8c0daa89a0 Make test multiplayer client validate password 2021-07-19 20:03:27 +09:00
smoogipoo
063f14da98 Update test room manager to not return passwords 2021-07-19 20:03:27 +09:00
Dean Herbert
b3f60c8253 Fix date being updated on replays unexpectedly 2021-07-19 19:28:35 +09:00
Dean Herbert
f16b4957aa Move clone to earlier in the process 2021-07-19 19:18:34 +09:00
Dean Herbert
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
Dan Balasescu
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
Dean Herbert
443058f879 Move playfield constant to top of file and make internal 2021-07-19 18:41:29 +09:00
Dan Balasescu
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
Dean Herbert
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
Dean Herbert
13cb658d29 Mark identifiers as verbatim strings 2021-07-19 18:15:09 +09:00
Dean Herbert
80539fefe1 Merge branch 'master' into localise-profile-overlay 2021-07-19 18:14:59 +09:00
Dean Herbert
b29209d13f Ensure tool is always set back to select tool when beatmap becomes untimed 2021-07-19 17:08:40 +09:00
Dean Herbert
bde35d9f21 Rename radio button classes to be local to editor 2021-07-19 16:57:12 +09:00