1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-08 17:23:17 +08:00
Commit Graph

42423 Commits

Author SHA1 Message Date
Dean Herbert
1bbfbb0d8e Fix test that never should have worked
This was only working by luck until now. It was "correctly" matching on
null online ID (see logic at
abc96057b2/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs (L199-L207)).

Now it works by actually matching on the online ID.
2021-06-23 19:30:11 +09:00
Dean Herbert
d148656108 Update in line with framework event structural changes (and add unbind) 2021-06-23 18:08:34 +09:00
Henry Lin
b7dd26612d Reordered things and added regions 2021-06-23 16:50:05 +08:00
smoogipoo
6215f2d42b Remove unnecessary string interpolation 2021-06-23 17:40:11 +09:00
Dean Herbert
f6180b7e6a Mark static methods as such 2021-06-23 17:37:26 +09:00
Dean Herbert
dcba7bf779 Fix import flow potentially hitting foreign key constraint 2021-06-23 17:34:56 +09:00
Dean Herbert
ed0552a9e8 Add failing test for FK constraint conflict on reimporting modified beatmap with scores present 2021-06-23 17:34:56 +09:00
smoogipoo
7767e2e77f Add to tooltip 2021-06-23 17:34:30 +09:00
Henry Lin
6dc5f406b2 Implement IMutateApproachCircles 2021-06-23 16:29:36 +08:00
Henry Lin
10541dbc0a Merge branch 'master' into osu-target-mod
# Conflicts:
#	osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
#	osu.Game/Rulesets/Mods/IHasSeed.cs
2021-06-23 16:26:23 +08:00
Henry Lin
5a031eada8 Revert "Display results after fail"
This commit reverts 7815b3c7
2021-06-23 16:22:10 +08:00
Dan Balasescu
29d45a387b
Merge branch 'master' into hard-rock-pattern 2021-06-23 17:08:59 +09:00
Dan Balasescu
b6793aadb4
Merge pull request #13628 from ekrctb/add-IApplicableToBeatmapProcessor
Add `IApplicableToBeatmapProcessor` mod interface
2021-06-23 17:08:40 +09:00
Dan Balasescu
8c87419364
Merge pull request #13631 from peppy/remove-data-sources-xml
Remove local configuration of rider data sources
2021-06-23 17:03:29 +09:00
Salman Ahmed
d484469906 Handle case where SkinManager sources aren't part of AllSources
In tests.
2021-06-23 10:44:23 +03:00
Dean Herbert
28f4c56cd6 Fix minor typo in comment 2021-06-23 16:30:28 +09:00
Dean Herbert
2f657b972d Remove local configuration of rider data sources 2021-06-23 16:29:18 +09:00
smoogipoo
e7981eae9b Safeguard load procedure a bit more 2021-06-23 16:14:08 +09:00
Salman Ahmed
53fa229880 Add ruleset resources skin before SkinManager.DefaultSkin 2021-06-23 10:09:25 +03:00
Salman Ahmed
2e6800f586 Enable NRT in RulesetResourcesSkin 2021-06-23 09:52:00 +03:00
Salman Ahmed
0db06c727b Dispose resource stores on finalizer 2021-06-23 09:41:45 +03:00
smoogipoo
0510282dcb Add missing ctor 2021-06-23 15:10:03 +09:00
smoogipoo
5828606c13 Prefer using the backup file if it exists 2021-06-23 15:09:42 +09:00
Dean Herbert
e4d17bd757 Remove commented code
This will be reverted in a future change, no need to keep it around.
2021-06-23 15:06:29 +09:00
smoogipoo
c9a203cc11 Move collections db in-place 2021-06-23 15:03:34 +09:00
Dean Herbert
151dfdfb79
Merge pull request #13627 from Joehuu/fix-multiplayer-exit-logic
Fix multiplayer leave dialog not working on all exit operations
2021-06-23 14:56:57 +09:00
ekrctb
ad60b9d5a0 Allow catch difficulty adjust to enable hard rock offsets 2021-06-23 14:52:41 +09:00
ekrctb
a0fd7f72ac Use IApplicableToBeatmapProcessor in CatchModHardRock 2021-06-23 14:47:32 +09:00
ekrctb
e1b2c63e09 Add IApplicableToBeatmapProcessor mod interface 2021-06-23 14:46:30 +09:00
Dean Herbert
cb6fbd88c7 Merge branch 'master' into mod-settings-dropdown-height 2021-06-23 14:14:17 +09:00
Dean Herbert
a1da9c5ee3
Merge pull request #13626 from Henry-YSLin/IHasSeed-interface
Extract `SeedSettingsControl` to `IHasSeed` interface
2021-06-23 14:10:34 +09:00
Dean Herbert
bae42a8908 Add inline comment explaining why the height is set lower 2021-06-23 14:07:37 +09:00
Dean Herbert
f62b4f2d24
Merge pull request #13617 from ekrctb/catch-editor
Add "placeholder" (pre-MVP) implementation of osu!catch editor
2021-06-23 14:00:34 +09:00
Dean Herbert
54084f8a9c Move SeedSettingsControl to own file 2021-06-23 13:40:05 +09:00
smoogipoo
6fd020d91d Remove unnecessary public accessibility
All interface members are implicitly public.
2021-06-23 12:00:57 +09:00
Joseph Madamba
dc428da06c Fix test regression 2021-06-22 19:30:52 -07:00
Joseph Madamba
49000b9501 Add multiplayer leave navigation tests 2021-06-22 19:30:40 -07:00
ekrctb
0b351c9922 Fix "possible NRE" inspection 2021-06-23 10:57:04 +09:00
ekrctb
125e143401 Fix banana shower placement outline initial opacity 2021-06-23 10:27:40 +09:00
ekrctb
5a5cb39c9f Add some comments about logic 2021-06-23 10:27:40 +09:00
ekrctb
69c8865a04 Use more consistent method names 2021-06-23 10:19:25 +09:00
ekrctb
a9b8736f70 Order field and properties consistently 2021-06-23 10:18:44 +09:00
ekrctb
eec4457473 Add [CanBeNull] to methods returning null by default 2021-06-23 09:40:07 +09:00
ekrctb
e96814bb86 Remove comment about using skin for blueprint
As the current game-wise direction is not using skin elements in blueprints.
The design of the blueprint could be improved somehow, though.
2021-06-23 09:37:30 +09:00
ekrctb
1a7bfafc69 Add icon for composition tools 2021-06-23 09:34:11 +09:00
aitani9
59928a7d91 Decrease the max height of dropdown menus in mod settings 2021-06-22 13:32:45 -07:00
aitani9
9cb9ef5c56 Refactor the menu's max height to be a property 2021-06-22 13:31:41 -07:00
Salman Ahmed
ee84364d7c Resolve conflict issues 2021-06-22 20:38:24 +03:00
Salman Ahmed
896c1dc202 Merge branch 'master' into ruleset-resources-skin 2021-06-22 20:36:49 +03:00
Dean Herbert
f03c2bab48 Update event name in line with framework changes 2021-06-22 22:45:13 +09:00