1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 18:47:32 +08:00
Commit Graph

50402 Commits

Author SHA1 Message Date
Dan Balasescu
cabf6f501f
Merge pull request #17594 from peppy/move-skin-component-error-handling
Move `SkinnableInfo` error handling to lower level
2022-04-01 16:04:00 +09:00
Dan Balasescu
c294819128
Merge pull request #17593 from peppy/disable-random-skin-in-skin-editor
Disable ability to use random skin shortcut from within the skin editor
2022-04-01 16:03:50 +09:00
Dean Herbert
6afed5e865 Fix new SettingsItem attribute not playing well with non-Drawables 2022-04-01 16:01:33 +09:00
Dean Herbert
bfd3406f5f Ensure that file is imported and caches are invalidated before placing new sprites 2022-04-01 16:01:33 +09:00
Dean Herbert
314ad63c6e Simplify available file lookup and include file extension 2022-04-01 16:01:33 +09:00
Dean Herbert
2b7105ac4f Add a default sprite representation to allow better placeholder display in skin editor toolbox 2022-04-01 16:01:33 +09:00
Dean Herbert
52eeaffce3 Limit lookup resources to images 2022-04-01 16:01:33 +09:00
Dean Herbert
d1be229d74 Combine SkinSprite into SkinnableSprite 2022-04-01 16:01:33 +09:00
Dean Herbert
762de3cc97 Replace invalidation logic with local realm notification subscription 2022-04-01 16:01:33 +09:00
Dean Herbert
9c3dad9fbf Add proof of concept flow to ensure RealmBackedResourceStore is invalidated on realm file changes
I'm not at all happy with this, but it does work so let's go with it for
now.
2022-04-01 16:01:33 +09:00
Dean Herbert
66f5eae530 Hook up a dropdown to show all available sprites for the current skin 2022-04-01 15:01:43 +09:00
Dean Herbert
fca9faac9b Add SkinnableSprite for arbitrary sprite additions 2022-04-01 14:36:36 +09:00
Dean Herbert
3a16483214 Add prioritised user lookups for default skin
This allows user resources to be consumed before falling back to the
game bundled assets.
2022-04-01 14:36:36 +09:00
Dean Herbert
01829cf2d8 Move SkinnableInfo error handling to lower level
Handling was recently added to handle the usage in
`Skin.GetDrawableCompoent`, but it turns out this is also required for
`DrawableExtensions.ApplySkinnableInfo` which can throw in a similar
fashion.

Found while working on sprite support for the editor, where this becomes
an actual issue (ie. switching to a branch where the new sprite support
is not present can cause unexpected crashes).
2022-04-01 14:30:04 +09:00
Dean Herbert
88306a6180 Disable ability to select random skin from within the skin editor
Reasoning is explained in inline comment.

I knowingly only applied this to the shortcut key. It's still feasible a
user can choose the option from the skin dropdown while the editor is
open, but that's less of an issue (because a user won't get the same
compulsion that I get to mash the key, only to be greeted with 100 new
mutable skins created).
2022-04-01 14:22:32 +09:00
Dean Herbert
69d4f86122 Fix automatically created "(modified)" skins getting conflicting names
Applies the already tested and proven method that is used in the editor
to the mutable skin creation flow.
2022-04-01 14:11:55 +09:00
Dan Balasescu
0a86bf6fb1
Merge pull request #17588 from peppy/aim-assist-rename
Rename "Aim Assist" to "Magnetised" to better suit the mod's behaviour
2022-04-01 14:04:30 +09:00
Dan Balasescu
4c8f427ad3
Merge pull request #17589 from peppy/tournament-scene-manager-key-bindings
Add ability to switch between most common tournament scenes using key bindings
2022-04-01 14:04:21 +09:00
Dean Herbert
6b9f5812a5
Merge pull request #17579 from CenTdemeern1/clock-button
Make the toolbar clock feel more like a button
2022-04-01 13:12:48 +09:00
Dean Herbert
10f15f2bdb
Merge pull request #17559 from bdach/mod-overlay/sheared-toggle
Implement sheared toggle button
2022-04-01 13:06:22 +09:00
Dean Herbert
de625125d6 Rename magnetised mod attraction strength property to match new naming 2022-04-01 13:03:48 +09:00
Dean Herbert
ea672745b0 Add ability to switch between most common tournament scenes using key bindings 2022-04-01 12:44:49 +09:00
Dean Herbert
a987cda30d Rename "Aim Assist" to "Magnetised" to better suit the mod's behaviour
As proposed in https://github.com/ppy/osu/discussions/17375.
2022-04-01 12:15:52 +09:00
Dean Herbert
338a21f4f0
Merge pull request #17581 from CenTdemeern1/remove-bpm-slider
Remove BPM slider
2022-04-01 11:59:16 +09:00
Dan Balasescu
912b6ae8ff
Merge pull request #17194 from hlysine/extract-random-mod-logic-2
Extract the hit object positioning logic of random mod to a separate class
2022-04-01 11:28:53 +09:00
Dean Herbert
058350dfd8 Fix failing test due to incorrect sizing specification 2022-04-01 10:53:16 +09:00
CenTdemeern1
86d262a355
Merge branch 'ppy:master' into clock-button 2022-03-31 23:08:30 +02:00
Bartłomiej Dach
d5b0c0ba8c
Merge pull request #17575 from peppy/runtime-clock-weight
Increase font weight for runtime clock
2022-03-31 22:30:08 +02:00
Bartłomiej Dach
1c7b259f8e
Merge branch 'master' into mod-overlay/sheared-toggle 2022-03-31 22:20:20 +02:00
Bartłomiej Dach
e180db145d
Add constructor argument to facilitate fixed width/autosizing 2022-03-31 22:19:08 +02:00
Bartłomiej Dach
b3896257ca
Move shear amount to constant 2022-03-31 22:09:03 +02:00
Bartłomiej Dach
48df34d0a8
Merge branch 'master' into runtime-clock-weight 2022-03-31 21:24:45 +02:00
Bartłomiej Dach
e14d5b8adb
Remove unused using directives 2022-03-31 21:20:30 +02:00
CenTdemeern1
a6875383fc Rebind SaveState() to bpmTextEntry 2022-03-31 21:06:05 +02:00
CenTdemeern1
bdb21b17f7 Fix my code according to the changes @bdach requested 2022-03-31 20:39:26 +02:00
CenTdemeern1
52d723aaa6 Remove BPM slider 2022-03-31 20:11:07 +02:00
CenTdemeern1
c64a90b39e Remove a newline to comply with codefactor 2022-03-31 17:21:50 +02:00
CenTdemeern1
f1aa60c0f1 Make the clock feel more like a button 2022-03-31 16:26:53 +02:00
Dean Herbert
0b6db31511 Guard other multiplayer client calls with exception handling 2022-03-31 19:45:38 +09:00
Dean Herbert
e0c125a628 Replace existing usage with helper method 2022-03-31 19:27:45 +09:00
Dean Herbert
5b3eb2d6f4 Add helper class to handle firing async multiplayer methods 2022-03-31 19:27:45 +09:00
Dan Balasescu
46be6bcadc
Merge pull request #17574 from peppy/fix-tournament-bracket-invalid-ruleset-id
Fix tournament bracket parsing's ruleset refetch logic not working correctly
2022-03-31 19:18:18 +09:00
Dean Herbert
0a34ce2509 Increase font weight for runtime clock
Fonts this small are required to be `SemiBold` by design guidelines.
Somehow missed this.
2022-03-31 19:07:30 +09:00
Dean Herbert
a06b0a4966 Fix tournament bracket parsing's ruleset refetch logic not working correctly
Due to equality being based on `ShortName`, it was feasible that the
re-fetch exited early (in bindable shortcutting logic) causing the
ruleset's `OnlineID` to remain `-1` or something equally wrong.

Resolves issue pointed out at
https://github.com/ppy/osu/discussions/17538#discussioncomment-2471746.
2022-03-31 18:41:00 +09:00
Dean Herbert
a7a7584d3e Add test coverage ensuring ruleset ID is correct after bracket read
Historically, tournament client may have written incorrect `OnlineID`
values. We wanted to use `ShortName` to re-fetch the ruleset. This test
ensures this flow is working correctly.
2022-03-31 18:39:58 +09:00
Dan Balasescu
bc4d6a3ace
Merge pull request #17570 from peppy/fix-settings-textbox-focus
Focus focus not being transferred correctly to parent settings panel on exiting nested panel
2022-03-31 18:07:51 +09:00
Dean Herbert
140eaa6039
Merge pull request #17572 from peppy/fix-multi-sounds-explosion
Fix multiplayer sounds playing too much after gameplay
2022-03-31 16:52:24 +09:00
Dean Herbert
ef5e37c47a Fix multiplayer sounds playing too much after gameplay
Regressed in https://github.com/ppy/osu/pull/15936.

Closes #17295.
2022-03-31 16:18:28 +09:00
Dean Herbert
ad14b7cac5
Merge pull request #17565 from smoogipoo/fix-gameplay-leaderboard-allocations
Remove ScoreInfo allocations in multiplayer leaderboard
2022-03-31 15:48:14 +09:00
Dean Herbert
496e025fae
Merge pull request #17569 from Joehuu/ignore-line-ending-rev
Ignore line ending normalisation commit from blame
2022-03-31 15:31:53 +09:00