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

37126 Commits

Author SHA1 Message Date
Dean Herbert
6a515391f0
Merge pull request #11891 from smoogipoo/more-incompatible-mods 2021-02-24 19:11:09 +09:00
smoogipoo
6b6811063b Make ExpandDirection abstract 2021-02-24 15:05:12 +09:00
smoogipoo
0b44d2483b Make some properties virtual
I think they were intended to be this way from the beginning.
2021-02-24 15:03:41 +09:00
smoogipoo
14160b897e Fix references to ModSuddenDeath 2021-02-24 14:44:53 +09:00
smoogipoo
30a58691f0 Make SD and PF incompatible with each other 2021-02-24 14:34:37 +09:00
smoogipoo
dd702ccfd2 Make mania FI/HD incompatible with each other 2021-02-24 14:34:37 +09:00
Dan Balasescu
a229c3a0f4
Merge pull request #11882 from peppy/fix-import-collections-twice-crash
Fix importing collections twice from stable causing a hard crash
2021-02-24 14:31:54 +09:00
Dan Balasescu
e76c6b1019
Merge pull request #11880 from peppy/disable-all-mouse-buttons
When disable mouse buttons during gameplay is selected, disable more globally
2021-02-24 14:30:38 +09:00
Dan Balasescu
de48b7c8c8
Merge branch 'master' into fix-import-collections-twice-crash 2021-02-24 13:25:31 +09:00
Dan Balasescu
90e515aadd
Merge branch 'master' into disable-all-mouse-buttons 2021-02-24 13:25:28 +09:00
Dan Balasescu
2e730cdde7
Merge pull request #11867 from peppy/add-quick-run-test-beatmap
Fix test failures due to beatmap taking too long to complete autoplay/replay
2021-02-24 13:25:22 +09:00
Dan Balasescu
cfea4c7d4d
Merge pull request #11881 from peppy/disable-hub-connections-on-ios
Disable multiplayer/spectator on iOS until it can be supported again
2021-02-24 13:09:03 +09:00
Dean Herbert
59e6bad0b9 Remove unnecessary interpolated string specification 2021-02-24 12:46:37 +09:00
Dean Herbert
7000132d03 Specify full filename inline for quick beatmap 2021-02-24 12:45:00 +09:00
Dean Herbert
e1f71038e3 Remove unncessary action 2021-02-24 12:13:55 +09:00
Dean Herbert
71182347d6 Also add a notifiation when trying to enter the multiplayer screen
Turns out the only check required to get into this screen was that the
API was online, which it always is even if the multiplayer component
isn't.

This provides a better end-user experience.
2021-02-24 11:30:14 +09:00
Bartłomiej Dach
6dc0cf5ea9
Merge branch 'master' into fix-import-collections-twice-crash 2021-02-23 22:14:25 +01:00
Dean Herbert
e679a1916f
Merge pull request #11833 from frenzibyte/fix-pofl-on-cooldown
Keep pausing gameplay on focus loss if cannot on first attempt
2021-02-24 00:15:58 +09:00
Dean Herbert
c514233141 Fix importing collections twice from stable causing a hard crash
Somehow a bindable equality check failure got through review. Not sure
if there's some way to protect against this going forward, but we may
want to.
2021-02-23 15:57:43 +09:00
Dean Herbert
664d243003 Disable multiplayer/spectator on iOS until it can be supported again 2021-02-23 15:22:46 +09:00
Dean Herbert
ec4b770cba Remove unused using statement 2021-02-23 14:56:03 +09:00
Dean Herbert
672fd3f9d2 When disable mouse buttons during gameplay is selected, disable more globally
Until now the disable setting would only apply to left/right buttons,
and only in gameplay. This change will cause any global actions bound to
mouse buttons to also not work during gameplay.

Closes #11879.
2021-02-23 14:37:46 +09:00
Dean Herbert
996c0897d1 Seek via GameplayClockContainer for better reliability 2021-02-23 13:40:21 +09:00
Dean Herbert
6a5c6febc5 Add inline comment explaining the retry loop 2021-02-23 13:23:32 +09:00
Bartłomiej Dach
66f86bdee5
Merge pull request #11868 from peppy/fix-playlist-test-delay-when-headless 2021-02-22 23:33:03 +01:00
Bartłomiej Dach
15e250622b Merge branch 'master' into fix-playlist-test-delay-when-headless 2021-02-22 22:48:12 +01:00
Bartłomiej Dach
f62120c66b Remove unused using directive 2021-02-22 22:45:55 +01:00
Salman Ahmed
5493c55da7 Fix silly mistake 2021-02-22 16:59:35 +03:00
Salman Ahmed
5e9040c291 Use "pausing supported" conditional instead 2021-02-22 16:26:35 +03:00
Dean Herbert
b8f23e4c84
Merge pull request #11870 from smoogipoo/increase-beatmap-download-timeout
Increase beatmapset download timeout
2021-02-22 18:35:59 +09:00
smoogipoo
d985b8ab2a Increase beatmapset download timeout 2021-02-22 17:14:39 +09:00
Salman Ahmed
6bac83964a Merge branch 'master' into fix-pofl-on-cooldown 2021-02-22 10:03:27 +03:00
Dean Herbert
adf2dc36c9 Fix PlaylistResults tests performing delays in real-time when headless 2021-02-22 15:43:58 +09:00
Dean Herbert
c99e152fe4
Merge pull request #11866 from peppy/update-framework
Update framework
2021-02-22 15:31:26 +09:00
Dean Herbert
fde026d443 Remove redundant interface specification 2021-02-22 14:54:48 +09:00
Dean Herbert
cdbf8de29d Update other tests which can benefit from using a shorter beatmap 2021-02-22 14:53:32 +09:00
Dean Herbert
541237ef16 Use a shorter test beatmap for tests which need to run to completion 2021-02-22 14:48:04 +09:00
Dean Herbert
63dd55c92c Add missing methods from updated audio component interface implementation 2021-02-22 14:18:52 +09:00
Dean Herbert
e2c5dded7f Update framework 2021-02-22 14:14:36 +09:00
Dan Balasescu
bc8e67ad7c
Merge pull request #11834 from peppy/perform-from-subscreen-support
Add the ability for PerformFromMenuRunner to inspect nested screen stacks
2021-02-22 12:24:08 +09:00
Dan Balasescu
8037b101cb
Merge branch 'master' into perform-from-subscreen-support 2021-02-22 11:55:51 +09:00
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