Commit Graph

7988 Commits

Author SHA1 Message Date
38a2124921 Support instant exit if pausing is not allowed in the current game mode 2021-02-20 14:26:50 +09:00
52372fe50d Merge pull request #11713 from peppy/fix-error-exit-during-results-transition
Fix a potential crash when exiting play during the results screen transition
2021-02-19 18:39:21 +09:00
9fc57b2145 Merge pull request #11832 from peppy/leaderboard-compact-mode
Show compact leaderboard during gameplay to reduce distractions
2021-02-19 18:17:46 +09:00
82cc06ca57 Fix new logic not considering fail overlay correctly 2021-02-19 17:26:54 +09:00
4c214b74ce Merge branch 'master' into fix-error-exit-during-results-transition 2021-02-19 17:13:55 +09:00
b8c1e8ed7a Merge pull request #11708 from frenzibyte/multiplayer-participant-rank
Display user global rank for multiplayer room participants
2021-02-19 16:57:30 +09:00
9d02f589fe Compact leaderboard during gameplay 2021-02-19 16:51:39 +09:00
691cfa5bc3 Add expanded/compact display modes for GameplayLeaderboard 2021-02-19 16:46:30 +09:00
ee9e6fff40 Add bindable flow for expanded leaderboard state 2021-02-19 15:09:41 +09:00
484968d797 Fix weird bool check
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-02-19 14:46:10 +09:00
4504023a23 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:43:59 +09:00
39059ed82d Remove unnecessary null coalesce check 2021-02-19 14:36:51 +09:00
df05c57f44 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:35:20 +09:00
a2aec6bcdc Merge pull request #11808 from smoogipoo/multiplayer-no-playlist-mangling
Rework multiplayer playlist handling to support multiple items
2021-02-19 14:33:53 +09:00
bc10fcafae Remove now unnecessary schedule 2021-02-19 13:23:51 +09:00
b68dbbceff Merge branch 'master' into multiplayer-participant-rank 2021-02-19 13:16:44 +09:00
6240d3964c Merge pull request #11817 from peppy/fix-collection-dropdown-cross-thread-manipulation
Fix potential crash from cross-thread drawable manipulation in CollectionFilterDropdown
2021-02-19 10:06:42 +09:00
e14a59f272 Fix creating ruleset instances per LINQ select 2021-02-18 15:26:59 +03:00
46b67dd7bc Merge pull request #11821 from peppy/fix-carousel-border-additive-alplha
Fix carousel items' borders getting blown out when selected and hovered
2021-02-18 17:45:58 +09:00
b713eb2eae Make field readonly 2021-02-18 17:13:48 +09:00
c3a98b6ad1 Fix carousel items' borders getting blown out when selected and hovered
I tried restructuring the hierarchy to avoid needing this added property
(moving the hover layer out of the border container) but this leads to
some subpixel leakage outside the borders which looks even worse.

Closes #6915.
2021-02-18 16:59:44 +09:00
e911760318 Split OnlinePlayComposite to remove if-statement 2021-02-18 15:47:33 +09:00
421cdb6650 Consume new method in existing usages (and remove some unnecessary set/unset code) 2021-02-18 15:01:11 +09:00
49589b64c3 Intro track should not restart from preview point 2021-02-18 14:55:15 +09:00
90dce52042 Fix potential crash from cross-thread drawable manipulation in CollectionFilterDropdown 2021-02-18 14:10:28 +09:00
e30fb72ee2 Merge pull request #11811 from peppy/fix-mod-display-thread-safety
Fix ModDisplay potentially being operated on before loaded completely
2021-02-18 00:05:31 +09:00
3208b2c5bf Fix potential nullref if mods are never set 2021-02-17 23:13:51 +09:00
6ef235c4c5 Fix beatmap panel flickering multiple times 2021-02-17 21:54:43 +09:00
2a1bb2f578 Fix selected item potentially changing during gameplay 2021-02-17 21:40:21 +09:00
403536ef80 Fix ModDisplay potentially being operated on before loaded completely
Closes https://github.com/ppy/osu/issues/11810.
2021-02-17 21:11:46 +09:00
9c298fac4a Merge pull request #11801 from peppy/fix-import-always-importing
Fix intro beatmap always being imported even if already in a good state
2021-02-17 20:59:33 +09:00
8930ff4465 Merge branch 'master' into multiplayer-no-playlist-mangling 2021-02-17 19:29:01 +09:00
c1620ce21b Fix intro beatmap always being imported even if already in a good state 2021-02-17 19:19:49 +09:00
604add04e4 Fix song select mods being reset incorrectly 2021-02-17 19:06:37 +09:00
70a995919c Update comments 2021-02-17 17:58:24 +09:00
57ede6eb37 Merge branch 'master' into fix-multiplayer-mod-propagation-race 2021-02-17 16:22:51 +09:00
86faa7f465 Merge pull request #11798 from smoogipoo/multiplayer-long-types
Use long type where required in multiplayer
2021-02-17 15:50:12 +09:00
a845e96b7a Replace Ranks.Global completely with a GlobalRank property 2021-02-17 08:52:04 +03:00
d7c91a7c6f Merge branch 'fix-tournament-user-population' into multiplayer-participant-rank 2021-02-17 08:42:59 +03:00
8f72631c31 Fix typo in comment 2021-02-16 21:48:19 +01:00
100097d78f Fix playlist not being handled correctly for non-joined cases 2021-02-16 21:32:35 +09:00
bef0e5cfa1 Merge pull request #11790 from peppy/playlists-show-remaining-attempts
Display remaining attempts for playlist rooms with room-level attempt limits
2021-02-16 21:10:19 +09:00
ffa90c1a23 Remove whitespace 2021-02-16 20:23:19 +09:00
8e077c2857 Merge pull request #11791 from peppy/rooms-container-fix-click-deselection
Add the ability to deselect the currently selected room via clicking away
2021-02-16 20:22:24 +09:00
379393fe10 Merge branch 'multiplayer-long-types' into multiplayer-no-playlist-mangling 2021-02-16 19:37:55 +09:00
3e802531d3 Use long type where required in multiplayer 2021-02-16 19:34:01 +09:00
e24a5949c5 Fix resolve 2021-02-16 19:26:51 +09:00
2a1096a3c8 Make BeatmapSelectionControl use the selected item 2021-02-16 19:02:16 +09:00
3ff9e14e35 Make StatefulMultiplayerClient control current playlist item 2021-02-16 18:56:13 +09:00
855d24dce7 Cache selected item bindable from RoomSubScreen 2021-02-16 17:38:33 +09:00