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

53506 Commits

Author SHA1 Message Date
Dean Herbert
6cf94b7ead
Merge pull request #19084 from ggliv/fix-rp-rx
Fix mod incompatibility between repel and relax
2022-07-12 21:59:16 +09:00
Gabe Livengood
b96734e31a
fix mod incompatibility between repel and relax 2022-07-12 08:43:48 -04:00
Dan Balasescu
363e23c251 Use correct HitResult in test 2022-07-12 18:47:44 +09:00
Dean Herbert
0fe3bac173 Store mods to array and update test scenes 2022-07-12 18:00:25 +09:00
Dean Herbert
12a56e36bd Fix ID mapping and move osu-web additions to region to identify them clearly 2022-07-12 18:00:25 +09:00
Dean Herbert
f956955d4d Combine ScoreInfo construction helper methods 2022-07-12 18:00:25 +09:00
Dean Herbert
900e0ace8e Standardise naming and enable NRT 2022-07-12 18:00:25 +09:00
Dean Herbert
1bef2d7b39 Add and consume SoloScoreInfo 2022-07-12 18:00:25 +09:00
Dan Balasescu
41c2263fa4
Merge pull request #19069 from peppy/add-drawings-video
Add support for a drawings screen video background
2022-07-12 17:29:34 +09:00
Dan Balasescu
bd6f8bde9f
Merge pull request #19079 from peppy/fix-audio-playback-disposed
Fix potential crash during shutdown sequence if intro playback was aborted
2022-07-12 17:29:23 +09:00
Dan Balasescu
52dfdb9eee
Merge pull request #19080 from peppy/guard-windows-7
Show an error message on startup when attempting to run on an unsupported version of windows
2022-07-12 17:12:07 +09:00
Dean Herbert
cad18ebc58 Reword comment to better explain what we are guarding against 2022-07-12 16:46:19 +09:00
Dan Balasescu
ec2d7461c7
Merge pull request #19078 from peppy/score-submit-fail-error-display
Show basic error message when score submission fails
2022-07-12 16:18:17 +09:00
Dean Herbert
a36f786725 Change minimum version to Windows 8.1 instead of Windows 8 2022-07-12 16:16:46 +09:00
Dean Herbert
2885d6cf35
Merge pull request #18607 from ggliv/osu-mod-repel
Add repel mod to the osu ruleset
2022-07-12 15:50:22 +09:00
Dean Herbert
10a14f39ed Show an error message on startup when attempting to run on an unsupported version of windows
A lot of sentry error reports are coming from realm / EF failures due to the host operating system being too old. Let's give the user some proper feedback rather than a silent crash and error report hitting our logging.
2022-07-12 15:48:36 +09:00
Dean Herbert
cafe30fc4d Fix potential crash during shutdown sequence if intro playback was aborted
Fixes one of the audio related `ObjectDisposedException`s
(https://sentry.ppy.sh/organizations/ppy/issues/92/events/12f282f048cb4a4fae85810e8a70b68d/?project=2&query=is%3Aunresolved&sort=freq&statsPeriod=7d).

Ran into this while testing locally. See
`IntroScreen.ensureEventuallyArrivingAtMenu` for the related cause of
this happening (forced continuing to next screen if the intro doesn't
load in time).
2022-07-12 15:20:30 +09:00
Dean Herbert
fa626a82b3 Add missed incompatilibity rules 2022-07-12 15:19:06 +09:00
Dean Herbert
3d9252e4b8 Merge branch 'master' into osu-mod-repel 2022-07-12 15:19:05 +09:00
Dean Herbert
b52ea16133 Show basic error message when score submission fails 2022-07-12 15:10:59 +09:00
Dean Herbert
9e40e50d93
Merge pull request #19039 from Cwazywierdo/mod-icon-colors
Update mod icon colors
2022-07-12 15:08:07 +09:00
Dean Herbert
779d512b44 Merge branch 'master' into mod-icon-colors 2022-07-12 14:36:55 +09:00
Dean Herbert
8dbe24fd7c Simplify colour assigning logic and remove system mod colour for now 2022-07-12 14:36:50 +09:00
Dean Herbert
90fecbc9c7 Add test showing all mod icons for reference 2022-07-12 14:32:39 +09:00
Dean Herbert
aac3c166de
Merge pull request #19038 from novialriptide/replay-user-bug-fix
Populate user ID for locally imported scores
2022-07-12 13:55:11 +09:00
Dan Balasescu
d82d50e308
Merge pull request #19065 from Ludio235/master
Fix playlist room creation screen pushing content on opening dropdowns
2022-07-12 13:22:38 +09:00
Dean Herbert
bae314a254 Add background on SetupScreen to hide video 2022-07-12 13:03:43 +09:00
Dean Herbert
76be9a829c Fix mutation after disposal in TeamEditorScreen 2022-07-12 12:59:55 +09:00
Dan Balasescu
3ca10ac02c
Merge pull request #19063 from Joehuu/fix-samples-cancel-exit
Fix editor playing object samples while paused after cancelling exit
2022-07-12 12:51:27 +09:00
Gabe Livengood
28278e2554
enable NRT again 2022-07-11 17:27:25 -04:00
Gabe Livengood
54fe84350c
reciprocate mod incompatibility 2022-07-11 17:23:32 -04:00
Bartłomiej Dach
cca208b3c7
Merge branch 'master' into replay-user-bug-fix 2022-07-11 21:51:09 +02:00
Bartłomiej Dach
f7f0546f2a
Merge branch 'master' into add-drawings-video 2022-07-11 21:49:02 +02:00
Bartłomiej Dach
2eb79f38af
Merge pull request #19074 from peppy/fix-multiplayer-spectator-crash
Fix crash when currently played beatmap finishes download while multiplayer spectating
2022-07-11 21:43:44 +02:00
Bartłomiej Dach
0da4ab765a
Merge branch 'master' into fix-multiplayer-spectator-crash 2022-07-11 21:14:45 +02:00
Salman Ahmed
4f009419b8 Simplify population logic and match code style 2022-07-11 21:51:09 +03:00
Salman Ahmed
09bfca4e4a Fix build failing on tests 2022-07-11 21:45:39 +03:00
Salman Ahmed
1ac794dcf1
Merge pull request #19073 from peppy/update-deps
Update dependencies
2022-07-11 19:53:55 +03:00
Dean Herbert
73e924479f Find video by recursive check rather than marker interface
Seems a lot more reliable, and allows falling back to the "main" video
in cases which didn't support this previously.

A next step may be to allow every screen to support a video based on its
screen name, rather than specifying the local `TourneyVideo` every time.
2022-07-11 20:42:05 +09:00
Dean Herbert
00c7101f54 Remove DrawingsScreen world map completely 2022-07-11 20:36:05 +09:00
Dean Herbert
44d2e001ed Update various dependencies 2022-07-11 20:16:49 +09:00
Joseph Madamba
6220650ea3 Fix dialog overlay not loading in time for headless test 2022-07-11 02:29:56 -07:00
Andrew Hong (홍준원)
56896e8b41 Move PostImport() 2022-07-11 02:36:52 -04:00
Andrew Hong
10d6027c89 Assign missing UserID to RealmUser 2022-07-11 02:36:51 -04:00
Dean Herbert
22a51fdc50 Add support for a drawings screen video background 2022-07-11 15:35:00 +09:00
Dean Herbert
958c0fb390 Remove Appveyor.TestLogger 2022-07-11 15:01:16 +09:00
Alden Wu
48911b956a Remove ClearTransformsAfter call
A bit weird only having one call on its own; probably deserves an
entire PR dedicated to adding ClearTransformsAfter calls
2022-07-10 17:07:21 -07:00
Dean Herbert
0434c10914 Use global WorkingBeatmap in PlayerArea for the time being 2022-07-11 02:57:44 +09:00
Dean Herbert
8b6665cb5b Ensure initial beatmap processing is done inside the import transaction 2022-07-11 02:51:54 +09:00
Dean Herbert
8116a4b6f6 Fix multiplayer spectator crash due to track potentially not being loaded in time 2022-07-11 02:51:40 +09:00