1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 01:33:21 +08:00
Commit Graph

53389 Commits

Author SHA1 Message Date
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
Gabe Livengood
6443338251
use cursor position instead of destination for dampLength calculation
the destination vector is clamped within playfield borders, we want dampLength to be based on distance from the cursor.
2022-07-10 01:22:22 -04:00
Ludio235
52aef09cd6
Update PlaylistsRoomSettingsOverlay.cs 2022-07-10 02:05:40 +00:00
Joseph Madamba
834bb1f187 Fix editor playing object samples while paused after cancelling exit 2022-07-09 12:14:39 -07:00
Joseph Madamba
5fcc4bf713 Add failing sample playback disabled check 2022-07-09 12:10:18 -07:00
Dean Herbert
315a73fb1b
Merge pull request #19059 from andy840119/remove-the-nullable-disable-in-the-benchmark-project
Remove the nullable disable annotation in the benchmark project
2022-07-10 03:00:48 +09:00
為什麼
378be99fe1 Remove un-need null check. 2022-07-09 21:12:35 +08:00
為什麼
8fcc33936c Mark the parameter as non-nullable. 2022-07-09 21:07:47 +08:00
為什麼
086388ec4e Remove nullable disable annotation in the benchmark project. 2022-07-09 21:06:47 +08:00
Dean Herbert
200f0d9f55
Merge pull request #19050 from peppy/fix-mono-fuck-off
Fix crash on mobile releases when attempting to read any file
2022-07-09 06:01:43 +09:00
Dean Herbert
66f314915d Fix crash on mobile releases when attempting to read any file 2022-07-09 06:01:22 +09:00
Salman Ahmed
26b9352aeb
Merge pull request #19025 from peppy/custom-ruleset-score-import
Fix custom rulesets not importing scores at all
2022-07-08 20:01:14 +03:00
Salman Ahmed
7c77be80f7
Merge branch 'master' into custom-ruleset-score-import 2022-07-08 19:25:37 +03:00
Salman Ahmed
667b1d795d Ensure score has custom ruleset 2022-07-08 19:15:03 +03:00
Salman Ahmed
8c7aabccb0 Fix custom legacy ID in test scene not overriding base value 2022-07-08 19:01:21 +03:00
Gabe Livengood
a606d545c1
update new usage of CalculatePossibleMovementBounds 2022-07-08 12:00:07 -04:00
cdwcgt
d2406242ae
rename updateTooltip to updateState 2022-07-09 00:38:17 +09:00
cdwcgt
91f471ebe0
disabled button instead of shake
removed `ShakeContainer`
2022-07-09 00:37:53 +09:00