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

9180 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
8e1f8c28bd Use default value to denote no play date, rather than null 2021-07-20 19:05:08 +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
Dean Herbert
d87ea741ed Fix OnlinePlayScreen sub-screens not loaded asynchronously 2021-07-20 16:38:39 +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
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
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
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
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
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
3168a927dc Fix possible exception 2021-07-19 20:50:30 +09:00
smoogipoo
2515785f93 Use room password to fill settings textbox 2021-07-19 20:03:32 +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
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
bde35d9f21 Rename radio button classes to be local to editor 2021-07-19 16:57:12 +09:00
Dean Herbert
caba78cb5d Copy score during submission process to ensure it isn't modified 2021-07-19 14:14:28 +09:00
Dean Herbert
3c028ce05c Add IDeepCloneable interface and update existing CreateCopy methods to use it 2021-07-19 12:54:17 +09:00
Dean Herbert
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
Derrick Timmermans
2e2a2bdd99
Allow moving timeline selection when mousedown event is outside of blueprint container 2021-07-18 18:06:59 +02:00
Derrick Timmermans
ee220feecf
Avoid using guesses to determine whether inputs blocked 2021-07-18 16:04:23 +02:00
Dean Herbert
c6bc95767d Simplify popover hide logic and add test coverage 2021-07-17 22:31:47 +09:00
Dean Herbert
c966cb0530 Fix dependency lookup failing due to location of PopoverContainer 2021-07-17 15:04:18 +09:00
Dean Herbert
50eed26bd1 Rename radio button item to label 2021-07-17 02:32:23 +09:00
Dean Herbert
eac9b1ec7e Disable toolbox composition buttons when beatmap is not timed 2021-07-17 02:30:13 +09:00
Dean Herbert
3ae5f6707a Expose whether an EditorBeatmap has timing present or not via bindable 2021-07-17 02:30:00 +09:00
Dean Herbert
7a671754f2 Change RadioButton's object to a string 2021-07-17 02:29:31 +09:00
Derrick Timmermans
e35cff99c7
Pass on mouseDown input to timeline if no selection modification is made with that input 2021-07-16 17:21:43 +02:00
Derrick Timmermans
3e8a13bfbf
Allow interacting with timeline objects outside of drawable bounds 2021-07-16 16:16:34 +02:00
Dean Herbert
d0fc258886 Remove unused OsuLogo.BeatMatching 2021-07-15 15:11:42 +09:00
Dean Herbert
9d693c75cf Add Schedule to restore password text box focus behaviour 2021-07-14 23:56:52 +09:00
Dean Herbert
cc09a8b5ba Update to use OsuPopover implementation 2021-07-14 23:55:46 +09:00
Dean Herbert
b5dd9403b1 Merge branch 'master' into add-password-support 2021-07-14 23:53:03 +09:00
Dan Balasescu
4ce96109b7
Merge branch 'master' into fix-match-screen-buttons-no-user 2021-07-13 18:20:23 +09:00
Dan Balasescu
0557761e51
Merge pull request #13862 from peppy/fix-multiplayer-create-game-failure-crash 
Fix crash when multiplayer server join fails during game creation
 2021-07-13 18:00:47 +09:00
Dean Herbert
e791669c40 Fix multiplayer screen buttons showing no text when local user not available 2021-07-13 17:59:58 +09:00
Dean Herbert
60e17fc2b7 Fix disconnected-from-server multiplayer exit sequence being blocked by confirmation dialog 2021-07-13 17:12:35 +09:00
Dean Herbert
481e4dedb0 Move PopoverContainer to OsuGameBase 2021-07-13 16:51:31 +09:00
Dean Herbert
6409a518db Focus password text box on popover display 2021-07-13 16:35:37 +09:00
Dean Herbert
5cffaf4d3b Add extra explanatory comment to avoid any confusion 2021-07-13 14:34:56 +09:00
Dean Herbert
125bd36ab1 Send password in request ctor directly 2021-07-13 14:27:07 +09:00
Dean Herbert
c6bd58ea4b Exit match sub screen when a room goes away 
Closes #13847.

I think we can probably get some test coverage of this if required, but
needs a bit of thought (basically an error needs to be thrown during the
multiplayer client portion of the join procedure, after `CurrentRoom` is
non-null but before the join completes).

Manual testing on password branch (#13861) is possible since it
currently errors due to missing method on the live/dev servers.

- Create game, which will fail with `MethodNotExists`.
- Note the fields on the settings screen are emptied.
- Fill fields again and press create game (crash).
 2021-07-12 19:20:41 +09:00
Dean Herbert
4dea2d9778 Dismiss popovers on returning to lounge 2021-07-12 18:54:17 +09:00
Dean Herbert
bbc3a013c8 Use BasicPopover for now 2021-07-12 18:29:50 +09:00
Dean Herbert
b4ca6b6188 Update popover logic to take advantage of new explicit popup functionality 2021-07-12 18:25:04 +09:00
Dean Herbert
a3e0168a46 Update tests 2021-07-12 18:25:04 +09:00
Dean Herbert
e25b3518dc Make password popover display inside RoomsContainer rooms 2021-07-12 18:25:04 +09:00
Dean Herbert
9f9d7f9125 Add remaining pieces of password flow (for osu-web join request) 2021-07-12 18:22:52 +09:00
Dean Herbert
3c49b46c5f Add lock overlay for rooms which are password protected 2021-07-12 18:22:52 +09:00
Dean Herbert
08c40938db Add support for updating a room's password 2021-07-12 15:49:19 +09:00
Dean Herbert
4fd6f2101c Add password textbox input 2021-07-12 15:49:19 +09:00
Dean Herbert
24f330e5c1 Avoid MatchSettingsOverlay base class potentially accessing an uninitialised field 2021-07-12 15:49:19 +09:00
Salman Ahmed
07ede7a147 Disallow custom rulesets from score submission 2021-07-11 03:34:57 +03:00
Dean Herbert
6a5f0e8237 Move handling of replay seek operations out of progress bar 
This is in order to avoid using the now obsoleted property
`SliderBar.AllowKeyboardInputWhenNotHovered`
(see https://github.com/ppy/osu-framework/pull/4579).
 2021-07-09 14:28:59 +09:00
Dean Herbert
e612d7568c
Merge pull request #13771 from LumpBloom7/volume-meter-switch 
Add ability to navigate between volume meters via Alt+Left/Right arrows
 2021-07-07 21:50:44 +09:00
Derrick Timmermans
4d7c744101
Fix failing test 2021-07-07 12:59:31 +02:00
Bartłomiej Dach
f45418dde7 Replace game-side directory/file selector with framework extensions 2021-07-06 22:11:54 +02:00
Derrick Timmermans
ffe18ebe51
Resolve build errors 2021-07-06 14:11:46 +02:00
Derrick Timmermans
07d54d261a
Let selection container handle manual selection changes 2021-07-06 13:24:18 +02:00
Derrick Timmermans
c5a0672277
Use IStateful<SelectionState> instead of ISelected 2021-07-06 12:07:25 +02:00
Dan Balasescu
32e6c9c5d3
Merge pull request #13786 from peppy/multiplayer-test-fixes 
Fix multiplayer test failures due to leaderboard load process
 2021-07-06 16:33:41 +09:00
Dean Herbert
0658cfb986 Throw exceptions rather than silently failing if attempting to add a clock for a non-tracked user 2021-07-06 14:56:00 +09:00
Dean Herbert
1a6b8b2c73 Populate UserScores as early as possible to avoid weird ordering requirements 2021-07-06 14:53:31 +09:00
Bartłomiej Dach
686dd2b5ce Remove unused constant 2021-07-05 20:35:14 +02:00
Derrick Timmermans
d495196b66
Share item cycling logic with GameplayMenuOverlay 2021-07-05 19:22:55 +02:00
Dean Herbert
f5ddd2a53b Fix critical failure causing scores to not update on the leaderboard 2021-07-06 01:15:30 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Dean Herbert
f1014af284 Move LoadComplete content to run after user retrieval has completed 
Feels safer, I think.
 2021-07-05 21:35:41 +09:00
Dean Herbert
459f9a0465 Handle nulls and fix missing documentation 2021-07-05 21:35:37 +09:00
Dean Herbert
77adf687c6 Consume ability to lookup multiple users in MultiplayerGameplayLeaderboard 
Avoids syncrhonously blocking on asynchronous operations (which was
leading to LCA starvation in tests).
 2021-07-05 19:56:37 +09:00
Dean Herbert
9c311a6d8a Add ability to lookup multiple users at once to UserLookupCache 2021-07-05 19:56:16 +09:00
Dean Herbert
229bba14e6 Fix master clock becoming incorrectly paused when all spectator players are too far ahead 2021-07-05 17:45:08 +09:00
Bartłomiej Dach
c143a50b73
Merge branch 'master' into fix-zero-hit-score-submit 2021-07-04 15:31:38 +02:00
Dean Herbert
7a710ceffe Check count as well (statistics can be populated with zero counts) 2021-07-04 16:41:09 +09:00
Dean Herbert
ef82528309 Don't attempt to submit score when nothing has been hit 2021-07-04 15:16:18 +09:00
Dean Herbert
ec71deec51 Remove some mentions of "lazer" 
I am aware there are more throughout the codebase but intentionally left
the remaining mentioned for one reason or another. The intention here is
to mainly change user-facing versioning to change the positioning of the
"lazer" term (to be where we would expect "cuttingedge" or "beta" to
be).
 2021-07-04 12:41:27 +09:00
Bartłomiej Dach
fbe3b447e5 Merge branch 'master' into linkify-metadata 2021-07-03 15:51:08 +02:00
Dan Balasescu
ace57a9ee9
Merge pull request #13727 from peppy/update-disclaimer 
Update disclaimer
 2021-07-02 21:08:43 +09:00
Dan Balasescu
9eb6ae4d45
Merge pull request #13721 from peppy/submit-on-player-exit 
Submit scores on player exit
 2021-07-02 18:25:26 +09:00
Dean Herbert
362816492f Move to more friendly namespace 2021-07-02 18:09:16 +09:00
Dean Herbert
eacf867073 Move shared types into their own classes 2021-07-02 18:05:00 +09:00
Dean Herbert
f689e788c9 Avoid using game-wide beatmap during score submission 2021-07-02 14:24:27 +09:00
Dean Herbert
62c125d7a2 Tidy up font formatting methods 2021-07-02 12:21:28 +09:00
Dean Herbert
f0727a63be Reduce usable width 2021-07-02 12:18:52 +09:00
Dean Herbert
a1eaf39645 Slightly change wording to hopefully read better 2021-07-02 12:15:16 +09:00
smoogipoo
4c95af4b16 Add star rating range display 2021-07-01 20:35:31 +09:00
Dean Herbert
4c1b8bc427 Update disclaimer 2021-07-01 20:23:12 +09:00
Dean Herbert
0522500a57 Fix a couple of merge oversights 2021-07-01 19:45:17 +09:00
Dean Herbert
31dbc7798b Merge branch 'master' into linkify-metadata 2021-07-01 19:41:33 +09:00
smoogipoo
a78d1b4c2e Update SR colours to match osu-web 2021-07-01 19:37:21 +09:00
Dean Herbert
74c63e15be Mark score failed on fail and exit 2021-07-01 17:48:09 +09:00
Dean Herbert
04b874bb00 Add flow for submitting score on exiting SubmittingPlayer 2021-07-01 17:02:33 +09:00
Dean Herbert
5bc970af0d Make TestPlayer inherit from SoloPlayer for more flexibility in testing 2021-07-01 16:55:33 +09:00
Dean Herbert
00d3baef11 Exit handling flow 2021-06-30 20:23:48 +09:00
smoogipoo
6dd3c6fe93 Make MultiSpectatorScreen and tests more resillient to timing 2021-06-29 22:45:51 +09:00