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

48156 Commits

Author SHA1 Message Date
Dean Herbert
11ca1b6e7b Remove one more usage of IsManaged which could potentially go wrong 2022-01-17 13:40:27 +09:00
Dean Herbert
d27ee2c9fb Remove incorrect IsManaged check in ScoreManager 2022-01-17 13:37:42 +09:00
Dean Herbert
a3806f44a5 Add back null beatmap allowance to GetTotalScore flow to fix playlist aggregate scores 2022-01-17 13:11:43 +09:00
Dean Herbert
88bf406c22 Fix null reference in equality comparison causing beatmap set overlay to crash 2022-01-17 13:05:55 +09:00
Dean Herbert
5601f6f1fe Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-17 12:29:02 +09:00
Dean Herbert
4ac8830d42
Merge pull request #16474 from Susko3/move-version-overlay
Move `VersionManager` from `osu.Desktop` to `osu.Game`
2022-01-17 11:53:17 +09:00
Dan Balasescu
560832fe64
Merge pull request #16477 from bdach/mania-2x-lookups
Strip `@2x` scale specifications from legacy texture lookups if present
2022-01-17 09:47:31 +09:00
Bartłomiej Dach
cbaa3de548
Strip @2x scale modifiers when looking up legacy skin textures 2022-01-16 19:46:15 +01:00
Bartłomiej Dach
8e5ff201a1
Modify mania special skin to demonstrate failure case 2022-01-16 18:59:26 +01:00
Bartłomiej Dach
093b76e0ff
Fix drawable mania judgement scene looking broken 2022-01-16 18:56:21 +01:00
Bartłomiej Dach
c6adbdd46f
Fix drum rolls nested objects not applying min result on kill 2022-01-16 17:53:37 +01:00
Bartłomiej Dach
632246a3b3
Add failing test scene 2022-01-16 17:04:59 +01:00
Susko3
084b1fb470 Load the VersionManager earlier 2022-01-16 15:25:21 +01:00
Dean Herbert
566d341b1e Split conditions out for readability 2022-01-16 22:04:29 +09:00
Susko3
6e4214de4d Move VersionManager from osu.Desktop to osu.Game 2022-01-15 19:42:38 +01:00
Dean Herbert
565611ee00 Fix typo in inline comment 2022-01-15 23:57:20 +09:00
Dean Herbert
236fa6da7e Rename ControlPointVisualisation interface type to be less specific 2022-01-15 23:56:00 +09:00
Dean Herbert
c5cae4e3ee Rename methods and add xmldoc 2022-01-15 23:55:11 +09:00
Dean Herbert
4ca2822d40
Merge pull request #16447 from nekodex/mp-host-changed-sfx
Add audio feedback for host change in multiplayer rooms
2022-01-15 23:43:35 +09:00
Bartłomiej Dach
e75d21507c
Fix GetDisplayTitleRomanisable() relying on ToString() implementation 2022-01-15 15:26:41 +01:00
Bartłomiej Dach
03e4ec4214
Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-15 14:45:42 +01:00
Dean Herbert
671a3d47b8 Move bindable binding to LoadComplete and remove unnecessary unbind 2022-01-15 21:20:27 +09:00
Dean Herbert
ea8e49c543 Reorder private/protected methods 2022-01-15 21:19:02 +09:00
Dean Herbert
e7d9a2fa00
Merge pull request #16463 from frenzibyte/spinner-tick-position
Assign position to spinner ticks for correct positional sound playback
2022-01-15 21:06:13 +09:00
Salman Ahmed
3ab13dd78c Assign position to spinner ticks for correct positional playback 2022-01-15 14:24:52 +03:00
Dean Herbert
c4976e9db8 Update resources 2022-01-15 20:08:08 +09:00
Dean Herbert
64c499d9d6 Revert unintended temporary commenting (was used during benchmarking) 2022-01-15 15:24:30 +09:00
Dean Herbert
83bbe70374
Merge pull request #16459 from Susko3/remove-bdl-unused-params
Remove unused params from BDL methods
2022-01-15 14:39:22 +09:00
Salman Ahmed
67ee67c2d8
Merge pull request #16460 from Susko3/rider-idea 2022-01-15 08:34:43 +03:00
Salman Ahmed
bc64fd2078 Add missing vcs.xml file to the android solution
Present in both `.idea.osu` and `.idea.osu.Desktop`.
2022-01-15 08:01:44 +03:00
Susko3
9e173f7fcd Update rider .idea files for Android .slnf 2022-01-15 01:28:11 +01:00
Susko3
11580a2e71 Update rider .idea files for osu.sln 2022-01-15 01:24:59 +01:00
Susko3
19467e58c1 Remove unused params from BDL methods 2022-01-15 01:06:39 +01:00
Dean Herbert
48498cf8a1
Merge pull request #16452 from Susko3/tcs-xamarin
Fix `osu.Game.Tests.Android` not building
2022-01-15 03:52:00 +09:00
Susko3
9af9155e66 Fix osu.Game.Tests.Android not building 2022-01-14 17:37:58 +01:00
Dean Herbert
2984f2f6c4 Fix custom keybindings not working due to incorrect use of IsManaged flag 2022-01-15 01:22:48 +09:00
Dean Herbert
2f2c498477 Fix importer not considering that some EF beatmaps have no local metadata 2022-01-14 23:31:42 +09:00
Dean Herbert
8d4a3cc569 Remove pointless Metadata set 2022-01-14 23:27:33 +09:00
Dean Herbert
e558fd69d2 Remove unnecessary null check and associated comment 2022-01-14 23:26:29 +09:00
Dean Herbert
9900a3f408 Remove outdated comment 2022-01-14 21:40:35 +09:00
Dean Herbert
289ae7c72f Update one more mismatched test implementation 2022-01-14 21:39:42 +09:00
Dean Herbert
a59dcccab7 Add local ContextFactory caching to all remaining test scenes that create local managers 2022-01-14 19:59:21 +09:00
Dean Herbert
3a95425a9e Remove left-over methods in MusicController 2022-01-14 19:55:49 +09:00
Dean Herbert
7acd1b545f Remove unnecessary Live conversion in IntroScreen (handled by GetWorkingBeatmap) 2022-01-14 19:55:09 +09:00
Dean Herbert
34dbde6023 Only copy across Hash and ID so statistics aren't lost 2022-01-14 18:22:52 +09:00
Jamie Taylor
7e9b5dd150
Add audio feedback for host change in multiplayer 2022-01-14 18:11:00 +09:00
Dean Herbert
916b591b1b Fix watch replay button not working immediately after playing 2022-01-14 18:03:06 +09:00
Dean Herbert
c64a919a9d Reduce number of redundant control points displayed on summary timeline
As pointed out in https://github.com/ppy/osu/discussions/16435, beatmaps
with too many control points (usually added via external automation
apps) could cause the lazer editor to grind to a halt.

The overheads here are mostly from the GL side. An eventual goal would
be to render this in a smarter way, rather than using thousands of
drawables. Until that, this optimisation should help reduce the overhead
by omitting control points in close proximity that are redundant for
display purposes.

I've tried to contain this in the display logic directly, with the goal
that it can be ripped out as fast as it was added. Certainly required
more changes than I hoped for, but I don't think it's too ugly.
2022-01-14 17:13:26 +09:00
Dan Balasescu
70f56cd0c9
Merge pull request #16442 from peppy/fix-multiplayer-chat-polling
Fix chat poll rate being too low in multiplayer lobby and gameplay
2022-01-14 13:52:37 +09:00
Dean Herbert
dea2e1fac0 Return immediately on failed web request in synchronous BeatmapOnlineLookupQueue flow 2022-01-14 13:20:51 +09:00