1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Commit Graph

37235 Commits

Author SHA1 Message Date
Bartłomiej Dach
3e98d7621a
Merge pull request #11842 from Susko3/android-export-activity 2021-02-21 15:25:44 +01:00
Bartłomiej Dach
b8090c1638
Merge branch 'master' into android-export-activity 2021-02-21 14:28:17 +01:00
Dean Herbert
9a7fe4056a
Merge pull request #11848 from peppy/update-framework
Update framework
2021-02-20 20:26:21 +09:00
Dan Balasescu
303c6bcda7
Merge pull request #11846 from Syriiin/diffcalc/tests/add-clockrate-tests
Add tests for clockrate adjusted difficulty calculations
2021-02-20 17:41:38 +09:00
Dean Herbert
3b7ebfa2ac Update framework 2021-02-20 17:17:31 +09:00
Dan Balasescu
23ce5e7077
Merge pull request #11844 from peppy/fix-exit-from-player
Fix support for instant exit if pausing is not allowed in the current game mode
2021-02-20 17:01:33 +09:00
Samuel Cattini-Schultz
9d229a5ec2 Add tests for clockrate adjusted difficulty calculations 2021-02-20 16:27:58 +11:00
Dean Herbert
38a2124921 Support instant exit if pausing is not allowed in the current game mode 2021-02-20 14:26:50 +09:00
Dean Herbert
d2ec151c67 Add failing test for pausing when pause support is disabled 2021-02-20 14:20:13 +09:00
Susko3
32556b1898 add Exported = true to Activity manifest 2021-02-20 02:32:44 +01:00
Dean Herbert
5eee46074c Ensure the current screen is current when a sub screen is found as the target 2021-02-19 19:45:29 +09:00
Dan Balasescu
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
Dan Balasescu
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
Dean Herbert
362e4802f7 Add the ability for PerformFromMenuRunner to inspect nested screen stacks 2021-02-19 17:58:04 +09:00
Salman Ahmed
f6c279ab00 Add assert ensuring player resumed properly 2021-02-19 11:45:45 +03:00
Salman Ahmed
fe5e45ea81 Move gameplay cursor outside instead and fix potential failure 2021-02-19 11:43:33 +03:00
Salman Ahmed
0771154dd2 Make PauseCooldownActive protected and expose on test class 2021-02-19 11:42:30 +03:00
Salman Ahmed
ddd1dcff88 Attempt pausing every single frame 2021-02-19 11:33:26 +03:00
Dean Herbert
82cc06ca57 Fix new logic not considering fail overlay correctly 2021-02-19 17:26:54 +09:00
Dean Herbert
52ebe34347 Update TestScenePause exit from fail test to actually fail 2021-02-19 17:26:26 +09:00
Dean Herbert
4c214b74ce Merge branch 'master' into fix-error-exit-during-results-transition 2021-02-19 17:13:55 +09:00
Dean Herbert
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
Dean Herbert
e4d3c91ff4
Merge pull request #11819 from peppy/update-framework
Update implementation of AdjustableAudioComponents in line with framework changes
2021-02-19 16:57:03 +09:00
Dean Herbert
781379826b
Merge pull request #11793 from peppy/playlists-freemod-support
Add "free mod" user mod selection support to the playlists system
2021-02-19 16:56:21 +09:00
Dean Herbert
9d02f589fe Compact leaderboard during gameplay 2021-02-19 16:51:39 +09:00
Salman Ahmed
4436585aa4 Keep attempting to pause gameplay while window not active 2021-02-19 10:46:32 +03:00
Salman Ahmed
772471a6d8 Add failing test case 2021-02-19 10:46:31 +03:00
Dean Herbert
691cfa5bc3 Add expanded/compact display modes for GameplayLeaderboard 2021-02-19 16:46:30 +09:00
Dean Herbert
43c35c5118 Show local user in test scene 2021-02-19 15:15:31 +09:00
Dean Herbert
ee9e6fff40 Add bindable flow for expanded leaderboard state 2021-02-19 15:09:41 +09:00
Dan Balasescu
a6d163619a
Merge pull request #11827 from peppy/perform-from-screen-subclass-support
Allow beatmap imports from any derived version of SongSelect, rather than only PlaySongSelect
2021-02-19 15:05:18 +09:00
Dean Herbert
484968d797
Fix weird bool check
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-02-19 14:46:10 +09:00
Dean Herbert
4504023a23 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:43:59 +09:00
Dean Herbert
39059ed82d Remove unnecessary null coalesce check 2021-02-19 14:36:51 +09:00
Dean Herbert
df05c57f44 Merge branch 'master' into playlists-freemod-support 2021-02-19 14:35:20 +09:00
Dean Herbert
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
Dean Herbert
1701d69a60 Fix calls to IsAssignableFrom being back-to-front 2021-02-19 14:33:08 +09:00
Dean Herbert
95d62d03e2
Merge pull request #11826 from frenzibyte/fix-score-type-wrong-order
Fix misordered hit error in score meter types
2021-02-19 14:16:57 +09:00
Dean Herbert
87edf67879 Update framework 2021-02-19 14:07:39 +09:00
smoogipoo
c0e0bd4f42 Add compatibility with old server build 2021-02-19 13:57:04 +09:00
Dean Herbert
85a844a378 Restructure class slightly 2021-02-19 13:40:12 +09:00
smoogipoo
183a481a34 Refactor playlist update to remove .Contains() check 2021-02-19 13:32:32 +09:00
Dean Herbert
841c2c56d9 Remove confusing pp_rank include (will be removed osu-web side too) 2021-02-19 13:30:42 +09:00
smoogipoo
bc10fcafae Remove now unnecessary schedule 2021-02-19 13:23:51 +09:00
Dean Herbert
b68dbbceff
Merge branch 'master' into multiplayer-participant-rank 2021-02-19 13:16:44 +09:00
Dan Balasescu
f32a2739ec
Merge pull request #11823 from peppy/online-overlay-login-placeholder
Add login placeholder logic to OnlineOverlay
2021-02-19 11:53:04 +09:00
Dean Herbert
4caca9653a Update framework 2021-02-19 10:39:56 +09:00
Dean Herbert
ce0011f710 Merge branch 'master' into update-framework 2021-02-19 10:39:50 +09:00
Dan Balasescu
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
Dan Balasescu
19a2ef1148
Merge pull request #11799 from frenzibyte/fix-tournament-user-population
Fix multiple issues with user population in tournament client
2021-02-19 10:06:30 +09:00