1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 18:07:28 +08:00
Commit Graph

36656 Commits

Author SHA1 Message Date
Dean Herbert
156f5bd5df
Add newline between statements 2021-02-08 20:05:16 +09:00
smoogipoo
19368f87fb Fix failing test 2021-02-08 19:59:07 +09:00
Dan Balasescu
7bc6010d90
Merge pull request #11703 from Joehuu/fix-timing-editor-attribute-column
Fix attributes header not being aligned with content in editor timing mode
2021-02-08 19:38:59 +09:00
Dean Herbert
5fbed05d04
Merge pull request #11551 from smoogipoo/fix-leave-room-race-2
Fix client potentially not leaving a room on exiting multiplayer
2021-02-08 19:23:14 +09:00
Joehu
5e7823b289 Fix attributes content being zero size and disappearing after being half off-screen 2021-02-08 01:37:34 -08:00
Joehu
6b26a18a23 Fix attributes header not being aligned with content in editor timing mode 2021-02-08 01:34:32 -08:00
Dean Herbert
115ad4c745
Merge pull request #11702 from smoogipoo/fix-bad-merge
Fix incorrect multiplayer connection building
2021-02-08 18:21:30 +09:00
smoogipoo
fb8e31a303 Fix incorrect connection building due to bad merges 2021-02-08 17:52:03 +09:00
Dean Herbert
805da56746
Merge pull request #11701 from peppy/disable-test-temporarily
Disable failing test temporarily pending resolution
2021-02-08 17:42:57 +09:00
Dean Herbert
59dc148a48
Merge pull request #11680 from frenzibyte/instant-pause-on-focus-loss
Make pausing on window focus loss instantaneous
2021-02-08 17:00:17 +09:00
Dean Herbert
10142a4471 Disable failing test temporarily pending resolution 2021-02-08 16:59:21 +09:00
Dean Herbert
9e0724b138 Remove unnecessary double resolution of OsuGame 2021-02-08 15:58:41 +09:00
Dan Balasescu
e8f08b09dc
Merge pull request #11552 from vmaggioli/zero-spinner-slider
Fix being able to set zero or negative hitobject duration via timeline
2021-02-08 14:52:35 +09:00
Dean Herbert
93f1a3c1bf
Merge branch 'master' into instant-pause-on-focus-loss 2021-02-08 14:31:40 +09:00
Dan Balasescu
0698008ef3
Merge pull request #11565 from peppy/fix-multiplayer-client-connection-reliability
Rewrite connection logic to better handle failure cases
2021-02-08 14:22:43 +09:00
smoogipoo
da85fb372d Merge branch 'master' into fix-multiplayer-client-connection-reliability 2021-02-08 13:43:24 +09:00
Dan Balasescu
be0678c031
Merge pull request #11698 from Joehuu/centre-player-loader-metadata
Fix player loader metadata not being centred
2021-02-08 10:42:00 +09:00
Joehu
d74a1437be Fix player loader metadata not being centred 2021-02-07 15:14:08 -08:00
Salman Ahmed
d0ca2b99a8 Remove unnecessary injected dependency 2021-02-06 20:57:01 +03:00
Salman Ahmed
40ddccf0c7 Do not consider replays for "pause on focus lost"
Replays are not pausable as can be seen in the `canPause` check.
2021-02-06 20:56:08 +03:00
Salman Ahmed
c9db0bf886 Call break time update when loaded 2021-02-06 20:54:13 +03:00
Salman Ahmed
f29938e15d Make last binding game activity more sensible 2021-02-05 20:39:57 +03:00
Vincent Maggioli
96652e07cd
Merge branch 'master' into zero-spinner-slider 2021-02-05 09:40:55 -05:00
Dean Herbert
dd4207cb4e
Merge pull request #11661 from peppy/playlist-max-room-attempts
Add support for setting the maximum attempt count for a playlist
2021-02-05 23:40:38 +09:00
vmaggioli
5061231e59
Switch to beat length 2021-02-05 09:39:14 -05:00
Dean Herbert
7f82a06a61 Remove no longer used using directive 2021-02-05 23:08:31 +09:00
Dean Herbert
0679901e4d Update error handling 2021-02-05 22:53:40 +09:00
Dean Herbert
3ca64a1cb2 Merge branch 'master' into playlist-max-room-attempts 2021-02-05 22:13:13 +09:00
Dean Herbert
c94fc3bc62
Merge pull request #11684 from smoogipoo/fix-freemods-flashing
Fix mods on participant panels flashing when changed
2021-02-05 19:29:05 +09:00
smoogipoo
95ad7ea8f7 Fix mods on participant panels flashing when changed 2021-02-05 18:44:33 +09:00
Dan Balasescu
3997cd4104
Merge pull request #11681 from peppy/fix-crash-on-incompatible-freemod-selection
Fix crashes when setting a mod in free mod select overlay which requires deselection of another mod
2021-02-05 17:55:16 +09:00
Dean Herbert
630c5bb747 Avoid potential crashes when lease is held on SelectedMods 2021-02-05 16:46:21 +09:00
Dean Herbert
3e750feaa4 Subclass LocalPlayerModSelectOverlay to correctly deselect incompatible mods on free mod selection 2021-02-05 16:42:35 +09:00
Salman Ahmed
8d18c7e929 Fix BreakTracker.IsBreakTime not updated properly on breaks set
Causes a pause from focus lose when playing a beatmap that has a break section at the beginning, due to `IsBreakTime` incorrectly set to `false`
2021-02-05 10:28:35 +03:00
Salman Ahmed
e1789c29b1 Use Pause() instead of performUserRequestedExit() to avoid unexpected operations 2021-02-05 10:28:13 +03:00
Dean Herbert
2fc3a97f56
Merge pull request #11516 from frenzibyte/ready-button-clean-up
Replace ready button beatmap logic with using `MultiplayerBeatmapTracker` instead
2021-02-05 15:09:25 +09:00
Salman Ahmed
730e66f0ee Make pausing on window focus lose instant 2021-02-05 09:07:59 +03:00
Dean Herbert
de8724b1f6 Use AddRangeInternal for simplicity, but disallow ClearInternal for safety 2021-02-05 14:39:25 +09:00
Dean Herbert
fc37d8b7df Refactor content redirection logic to be easier to parse 2021-02-05 14:25:19 +09:00
Dean Herbert
c5fa818630 Actually handle case of failing to achieve lock on SemaphoreSlim 2021-02-05 14:08:13 +09:00
Dean Herbert
cd67fe1091 Merge branch 'master' into fix-multiplayer-client-connection-reliability 2021-02-05 14:04:57 +09:00
Dean Herbert
9258836f10
Merge pull request #11641 from smoogipoo/freemods
Add support for optional per-user mods in multiplayer (aka freemod)
2021-02-05 13:59:30 +09:00
Salman Ahmed
78ea2d50bb Merge branch 'master' into ready-button-clean-up 2021-02-05 07:23:11 +03:00
Dan Balasescu
56f9dae4f6
Merge pull request #11515 from frenzibyte/multiplayer-beatmap-tracker
Add beatmap availability tracker component for multiplayer and playlists
2021-02-05 13:14:23 +09:00
smoogipoo
df2da5950f Add back vertical spacer 2021-02-05 13:09:13 +09:00
smoogipoo
8004c19a80 Remove ModValidationTest 2021-02-05 12:40:42 +09:00
smoogipoo
2e85ce5b82 Rename UserMods -> Mods for MultiplayerRoomUser 2021-02-05 12:40:16 +09:00
smoogipoo
85e63afcb4 Rename Mods -> RequiredMods 2021-02-05 12:36:25 +09:00
Dan Balasescu
a71d6a4c97
Merge branch 'master' into multiplayer-beatmap-tracker 2021-02-05 12:25:36 +09:00
smoogipoo
a2fdba3e51 Rename to OnlinePlayBeatmapAvailabilityTracker 2021-02-05 12:24:38 +09:00