1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 23:47:32 +08:00
Commit Graph

28863 Commits

Author SHA1 Message Date
Bartłomiej Dach
8db2fc439d
Change ruleset ID assert in player to null-check 2021-10-18 23:45:06 +02:00
Bartłomiej Dach
6d9d85685f
Fix settings item having zero height 2021-10-18 23:30:38 +02:00
Bartłomiej Dach
cc9727ec11
Merge branch 'master' into default-value-indicator 2021-10-18 22:07:58 +02:00
Bartłomiej Dach
88a1b31fae
Remove grid usage in SettingsItem 2021-10-18 22:07:32 +02:00
Bartłomiej Dach
6c3637a62a
Remove grid usage in KeyBindingRow 2021-10-18 22:07:30 +02:00
Bartłomiej Dach
830f49bca6
Remove doubled-up opacity specification 2021-10-18 19:43:48 +02:00
Dean Herbert
b3219bb592 Update usages of OnlineID 2021-10-18 16:16:36 +09:00
Dean Herbert
6904938dc1 Merge branch 'realm-indexed-online-id' into realm-importer 2021-10-18 16:14:37 +09:00
Dean Herbert
88a575462c Work around weird null inspection 2021-10-18 16:11:55 +09:00
Dean Herbert
2c5ba1d8e2 Change OnlineID to non-nullable to allow for indexing in Realm 2021-10-18 15:53:40 +09:00
Dan Balasescu
8643c725cc
Merge pull request #15175 from peppy/fail-animation-flash-controlled-by-setting
Don't flash screen red on fail if the user has disabled red tinting
2021-10-18 15:27:10 +09:00
Dan Balasescu
f2f9872718
Merge pull request #15173 from peppy/fix-epilepsy-warning-fade-out
Fix epilepsy warning not being faded out on an early exit during gameplay load
2021-10-18 15:18:38 +09:00
Dean Herbert
b2f9f8b8da Update logic surrounding removal of previous OnlineIDs when running a new import 2021-10-18 15:14:13 +09:00
Dean Herbert
264fa703f2 Remove some forgotten temporary code from BeatmapImporter
And make the online queue not `dynamic`, at very least.
2021-10-18 14:43:50 +09:00
Dean Herbert
75bfa705cf Remove unused method for now 2021-10-18 14:32:38 +09:00
Dean Herbert
ad112cbbc5 Fix intendation in a way it doesn't regress with older inspectcode 2021-10-18 14:28:29 +09:00
Dean Herbert
3c4c9ab7a7 Move ICanAcceptFiles specification to IModelImporter<TModel> 2021-10-18 14:25:51 +09:00
Dean Herbert
762949f49f Don't flash screen red on fail if the user has disabled red tinting 2021-10-18 14:20:38 +09:00
Dean Herbert
6d6eed61aa Fix new indentation inspections 2021-10-18 14:00:35 +09:00
Dean Herbert
59dc04017e Fix epilepsy warning not being faded out on an early exit from PlayerLoader 2021-10-18 13:30:37 +09:00
Bartłomiej Dach
2a41e8bd1f
Remove unneeded extra padding from settings number box 2021-10-17 21:50:04 +02:00
Bartłomiej Dach
552fc1dc8a
Adjust key binding rows to accommodate new default value indicator 2021-10-17 21:50:04 +02:00
Bartłomiej Dach
f422ebb281
Adjust SettingsItem to accommodate new default value indicator 2021-10-17 21:50:03 +02:00
Bartłomiej Dach
818f35c35f
Restyle default value indicator 2021-10-17 21:50:03 +02:00
5ln
3529f34c98
Multi: Hide mods when spectating or Beatmap isn't Locally Available.
Signed-off-by: 5ln <xnafumie@gmail.com>
2021-10-18 02:01:50 +08:00
Susko3
25f172fae8 Update usages of OpenInNativeExplorer to use ShowFileInNativeExplorer
Also updates WrappedStorage to override ShowFileInNativeExplorer.
2021-10-17 12:56:29 +02:00
Bartłomiej Dach
874decb3cd
Replace spectator-local fix for wrong ruleset ID with player-global consistency check 2021-10-16 16:10:42 +02:00
Bartłomiej Dach
e57d6e930e
Source spectator state sent to server from gameplay state 2021-10-16 13:48:49 +02:00
Dean Herbert
7a5a612896 Move retry and exit hotkey overlays to same depth / container 2021-10-16 02:29:45 +09:00
Dean Herbert
e9f50179ab
Merge branch 'master' into fail-animation-update 2021-10-15 23:32:10 +09:00
Dean Herbert
91754450b2 Remove dispose method completely 2021-10-15 21:27:44 +09:00
Dean Herbert
6f947cacbd Fix test failures 2021-10-15 21:22:38 +09:00
Dean Herbert
c47497923a Schedule drag events for now 2021-10-15 19:52:44 +09:00
Dean Herbert
30c3fcb4ea Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-15 19:45:04 +09:00
Dean Herbert
3909fd8caa Fix wonkiness when dragging slider end at high input refresh rates 2021-10-15 19:43:57 +09:00
Dean Herbert
b9fd1f52df Tweak animation slightly 2021-10-15 19:37:22 +09:00
Dean Herbert
b08743342b Fix incorrect nesting 2021-10-15 19:35:08 +09:00
Dean Herbert
66f3370a19 Add new fail animation to better match new sound effects 2021-10-15 19:14:59 +09:00
Dean Herbert
a59ee9ec1f
Merge pull request #15121 from nekodex/fail-highpass
Add high-pass filter to gameplay fail sequence
2021-10-15 19:14:44 +09:00
Dean Herbert
ae33b7b87f Update resources 2021-10-15 18:27:01 +09:00
Dan Balasescu
8d11f4ce48
Merge pull request #15075 from peppy/fix-editor-difficulty-name-update
Use actual `BeatmapInfo` rather than `PlayableBeatmap.BeatmapInfo` for editor writes
2021-10-15 18:12:12 +09:00
Dan Balasescu
3d314dad9f
Merge pull request #15115 from peppy/fix-realm-config-save-overhead
Fix changing osu!mania scroll speed causing game-wide lag
2021-10-15 17:33:42 +09:00
Dean Herbert
0e1f144bf4 Rename ArchiveModelImporter with Realm prefix to avoid confusion 2021-10-15 17:08:43 +09:00
Dean Herbert
cd64faa4f9 Tidy up importer difficulty creation code 2021-10-15 17:07:34 +09:00
Dean Herbert
49969ac328 Add beatmap import and file store tests 2021-10-15 17:07:34 +09:00
Jamie Taylor
8d6d7fcdbe
Add high-pass filter to gameplay fail sequence 2021-10-15 17:03:37 +09:00
Dean Herbert
d95a62fa56 Add models and stores for beatmap manager requirements 2021-10-15 16:58:41 +09:00
Dan Balasescu
3604a762d0
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-15 16:58:01 +09:00
Dan Balasescu
05150b34e5
Merge pull request #15117 from peppy/update-present-import-post-import
Update one missed instance of `PresentImport`
2021-10-15 16:57:47 +09:00
Dan Balasescu
56758435ee
Merge pull request #15043 from peppy/realm-ruleset-store
Add realm `RulesetStore`
2021-10-15 16:49:48 +09:00
Dean Herbert
8fb9aec730 Fix threaded realm usage not disposing context fast enough 2021-10-15 16:39:53 +09:00
Dan Balasescu
34d60b9e10
Merge branch 'master' into fix-realm-config-save-overhead 2021-10-15 16:30:39 +09:00
Dean Herbert
e9c3d09e0e Remove redundant specs 2021-10-15 16:27:16 +09:00
Dean Herbert
fdb734ac91 Also add spec directly to IModelImporter 2021-10-15 16:24:40 +09:00
Dean Herbert
2eb1170c0c Use AsNonNull instead 2021-10-15 16:15:34 +09:00
Dean Herbert
efaed4cba4 Revert "Attempt bumping inspectcode to fix remaining inspection"
This reverts commit e018a6d6a5.
2021-10-15 16:14:57 +09:00
Dean Herbert
a90f40e831 Update one missed instance of PresentImport 2021-10-15 16:00:09 +09:00
Dan Balasescu
745f319c7d
Merge branch 'master' into fix-realm-disposal-order 2021-10-15 15:44:14 +09:00
Dean Herbert
e018a6d6a5 Attempt bumping inspectcode to fix remaining inspection 2021-10-15 14:08:25 +09:00
Dan Balasescu
48a9ab9e89
Merge branch 'master' into fix-multiplayer-tests 2021-10-15 14:04:27 +09:00
Dean Herbert
e38eb31fd4 Merge branch 'fix-realm-disposal-order' into fix-realm-config-save-overhead 2021-10-15 14:00:31 +09:00
Dean Herbert
818fac6ac8 Make realm a non-drawable component to better order disposal
Until now, the `RealmContextFactory` would be disposed as part of the
drawable hierarchy. This is too early, as it may be being used by higher
level components (like `ConfigManager`s, see #15115) that perform final
operations after the drawables have been disposed.

Seems to make sense moving this out of the drawable hierarchy and in
line with how we were doing things with EF.
2021-10-15 13:58:16 +09:00
Dan Balasescu
1e15b5a5a0
Merge pull request #15113 from peppy/rounded-button-colour-provider
Change `RoundedButton` to source from overlay colour provider
2021-10-15 13:52:52 +09:00
Dean Herbert
e47ccbd08a Fix realm transactional overhead when rapidly changing RulesetConfigManager values 2021-10-15 13:50:26 +09:00
smoogipoo
80dfd11c90 Remove unnecessary extra task
Further testing shows continuations also run before the .Wait() returns.
2021-10-15 13:28:02 +09:00
Dean Herbert
7ab028576e Change RoundedButton to source from overlay colour provider 2021-10-15 12:54:19 +09:00
Dean Herbert
f73e505ee6 Further adjustments to glow to be less bright on settings overlay 2021-10-15 12:35:19 +09:00
Dean Herbert
e1ac5fbed9 Remove externally exposed Expanded state and change behaviour and visuals surrounding it 2021-10-15 12:13:42 +09:00
Dean Herbert
35d776078c Ensure sliderbar nub stays glowing while dragging an adjustment 2021-10-15 11:51:08 +09:00
Dean Herbert
be3b88a5c3 Adjust glow to look good 2021-10-15 11:48:19 +09:00
Dean Herbert
3a25bdaf3d
Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-15 11:18:37 +09:00
Dean Herbert
874d722820
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-15 11:14:45 +09:00
Bartłomiej Dach
ed2f9dd443
Adjust settings slider spacings 2021-10-15 00:31:06 +02:00
Bartłomiej Dach
a10a7e7903
Refresh nub/slider appearance and use overlay theming 2021-10-15 00:31:05 +02:00
smoogipoo
eed8fa8d69 Expand comment a bit 2021-10-15 00:20:45 +09:00
smoogipoo
e6ee360511 Fix intermittent multiplayer tests 2021-10-15 00:10:39 +09:00
Dean Herbert
ad0732484f Just wait for metadata section to be loaded 2021-10-14 22:12:38 +09:00
Dean Herbert
9d54285b2e Merge branch 'master' into fix-multiplayer-sounds-during-gameplay 2021-10-14 21:34:04 +09:00
Dean Herbert
a31f5ca326 Update framework 2021-10-14 20:13:55 +09:00
Dean Herbert
06249c4ab2 Fix incorrect usages of Scheduler.AddOnce 2021-10-14 17:52:19 +09:00
Dean Herbert
0d86dab80a Fix multiplayer components updating when not alive
Should close https://github.com/ppy/osu/issues/15092.

- [ ] Depends on https://github.com/ppy/osu-framework/pull/4826.
2021-10-14 17:37:10 +09:00
smoogipoo
901f107b2e Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-14 17:25:51 +09:00
Dan Balasescu
fb9c3fe72e
Merge pull request #14619 from peppy/no-more-difficulty-control-points-info
Move `DifficultyControlPoint`s to be specified at a per-`HitObject` level
2021-10-14 17:24:32 +09:00
Dean Herbert
1212b08672 Fix gameplay audio ramping down in frequency a second time at the end of the fail sequence 2021-10-14 16:45:34 +09:00
Dean Herbert
8a4c0c0ac8 Lock one more case of usage 2021-10-14 16:22:43 +09:00
Dean Herbert
060bb1afbd Add locking around async beatmap (task) retrieval 2021-10-14 15:39:53 +09:00
Dean Herbert
4ed794e434 Throw and log instead of silently failing on type/instance creation failure 2021-10-14 14:24:36 +09:00
Dean Herbert
364fa068b3 Add non-null check to appease inspection 2021-10-14 14:20:34 +09:00
Dean Herbert
ccc8012fd4 Mark non-localisable strings 2021-10-14 14:16:39 +09:00
Dean Herbert
e0babe4b79 Add global logging of WorkingBeatmap changes 2021-10-14 14:07:43 +09:00
Dean Herbert
09536cd733 Add logging of WorkingBeatmapCache.Invalidate calls 2021-10-14 14:05:33 +09:00
Dean Herbert
b1fc870130 Adjust item selection and chevron animation slightly 2021-10-14 13:34:08 +09:00
Dean Herbert
bf1000000e
Merge branch 'master' into dropdown-refresh 2021-10-14 12:48:56 +09:00
smoogipoo
aa380a11c1 Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-14 12:02:10 +09:00
Dean Herbert
8d479bbe56
Merge branch 'master' into fix-editor-difficulty-name-update 2021-10-14 10:17:01 +09:00
Bartłomiej Dach
c7db286b94
Merge branch 'master' into file-sanity-checks 2021-10-14 00:17:29 +02:00
Bartłomiej Dach
d2115824fa
Merge branch 'master' into dropdown-refresh 2021-10-13 23:53:14 +02:00
Bartłomiej Dach
d8450a7375
Recolour "slim dropdown" in online lounge screens 2021-10-13 22:57:37 +02:00
Bartłomiej Dach
f3647eb94e
Recolour room settings screens to match dropdown theming 2021-10-13 22:50:19 +02:00
Bartłomiej Dach
d067159435
Recolour elements of editor setup screen to match dropdown theming 2021-10-13 22:32:54 +02:00
Bartłomiej Dach
a6c2848460
Fix hovered dropdown item chevron not using OverlayColourProvider 2021-10-13 22:08:23 +02:00
Bartłomiej Dach
7e7b747755
Always use OverlayColourProvider in scroll containers if available 2021-10-13 22:05:48 +02:00
Bartłomiej Dach
d4e3460912
Always use OverlayColourProvider in dropdowns if available 2021-10-13 22:04:48 +02:00
Bartłomiej Dach
d205483a36
Revert ThemedDropdown-related changes 2021-10-13 21:57:50 +02:00
Dean Herbert
f7a5879fa6
Merge pull request #15056 from smoogipoo/fix-gamehost-tests
Fix GameHosts being run on TPL threads
2021-10-13 23:06:26 +09:00
smoogipoo
fdf7142711 Remove Room.Position 2021-10-13 21:24:54 +09:00
Dan Balasescu
e49f1f6e6b
Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-13 20:17:57 +09:00
Dean Herbert
2af1e6acc7 Update framework 2021-10-13 18:02:22 +09:00
Dan Balasescu
d88daf0cc2
Merge pull request #15073 from peppy/fix-player-loader-low-pass
Improve `PlayerLoader` audio and visual transitions
2021-10-13 17:01:49 +09:00
Dean Herbert
93d7cdc509 Don't check whether the source realm was closed or not
Based on what we now know, this is not required, as long as there is
another realm context open on the same thread.
2021-10-13 15:50:06 +09:00
Dean Herbert
2fb5c85377
Merge branch 'master' into realm-ruleset-store 2021-10-13 15:25:18 +09:00
Dean Herbert
f5f0486e18
Merge branch 'master' into realm-live 2021-10-13 15:24:34 +09:00
Dean Herbert
29dfe33465 Rewrite AudioFilter to be easier to follow (and fix tests) 2021-10-13 15:17:20 +09:00
Dean Herbert
02689a1b60 Use actual BeatmapInfo rather than PlayableBeatmap.BeatmapInfo for editor writes 2021-10-13 14:50:12 +09:00
Dan Balasescu
3445d915b9
Merge pull request #15074 from peppy/fix-storyboard-fail-test-fails
Fix storyboard outro during fail test not being lenient enough
2021-10-13 14:16:26 +09:00
Dan Balasescu
df5a76ad9d
Merge pull request #15041 from peppy/realm-file-store
Add realm `FileStore`
2021-10-13 13:54:56 +09:00
Dean Herbert
26a1e40d24 Fix storyboard outro during fail test not being lenient enough 2021-10-13 13:48:57 +09:00
Dean Herbert
ae4dcbd829 Improve PlayerLoader audio and visual transitions 2021-10-13 13:26:20 +09:00
Dean Herbert
b37096f440 Avoid using bindable for AudioFilter cutoff
It doesn't play nicely with screen exiting, as it is automatically
unbound during the exit process. Easiest to just avoid using this for
now.
2021-10-13 13:25:55 +09:00
smoogipoo
cf10239e70 Add a few nullabilities and DCC excludes 2021-10-13 12:51:46 +09:00
Dean Herbert
f69a56a26a Add test coverage of startup import sequence 2021-10-13 12:19:10 +09:00
Dean Herbert
94de24075e Ensure startup imports trigger notifications 2021-10-13 12:18:56 +09:00
Bartłomiej Dach
7c5bd2db7b
Allow using ThemedDropdown even if OverlayColourProvider not available
This is to accommodate `SettingsDropdown` usages without an available
`OverlayColourProvider`, such as mod settings controls and tournament
client usages.
2021-10-12 23:12:16 +02:00
Bartłomiej Dach
7139c832b0
Add support for changing scrollbar accent colour & use in themed dropdown 2021-10-12 22:20:07 +02:00
Bartłomiej Dach
a2f3a7cba8
Add "themed" dropdown variant and use in settings sidebar 2021-10-12 21:58:43 +02:00
Bartłomiej Dach
1fba932e84
Adjust settings dropdown spacings 2021-10-12 21:41:33 +02:00
Bartłomiej Dach
5ddb7f74e2
Adjust default dropdown dimensions & spacings 2021-10-12 21:41:29 +02:00
Bartłomiej Dach
3ceee176e6
Merge branch 'master' into frame-stability-container-direction-flip 2021-10-12 18:34:04 +02:00
Dean Herbert
e468bfb31c
Merge branch 'master' into realm-file-store 2021-10-12 23:11:02 +09:00
Dan Balasescu
cabbb1697a
Merge pull request #15054 from peppy/settings-ordering
Initial settings usability pass
2021-10-12 22:00:30 +09:00
Dan Balasescu
60ba1987ba
Merge pull request #15050 from peppy/fix-cross-thread-list-manipulation-skin-source-provider
Fix cross-thread list manipulation in `SkinProvidingContainer`
2021-10-12 21:59:49 +09:00
Dan Balasescu
7bb401b974
Merge pull request #15040 from peppy/realm-test-game-host
Update realm tests to run inside a `GameHost` to allow running on update thread
2021-10-12 21:16:06 +09:00
Dan Balasescu
f76b58e843
Merge pull request #15055 from peppy/fix-taiko-convert-woes
Fix `BeatmapConverter` not cloning deeply enough
2021-10-12 21:07:39 +09:00
Dan Balasescu
f01e995cd9
Merge branch 'master' into fix-cross-thread-list-manipulation-skin-source-provider 2021-10-12 20:59:17 +09:00
Dean Herbert
427bf4ef0a
Merge branch 'master' into fix-audio-filter-test-failures 2021-10-12 19:42:18 +09:00
Dean Herbert
e6cd0a8371 Remove unused using statements 2021-10-12 17:17:40 +09:00
Dean Herbert
1373cc02d7 Shallow clone BeatmapInfo during conversion process to avoid overwriting fields 2021-10-12 16:43:56 +09:00
Bartłomiej Dach
b79cf0b58b Add failing coverage for conversion not altering original beatmap 2021-10-12 16:43:56 +09:00
Dean Herbert
6fec821a17 Update framework 2021-10-12 16:20:13 +09:00
Dean Herbert
c66e50ac55 Remove temporary logging 2021-10-12 16:19:58 +09:00
Dean Herbert
76c64751de Remove RealmBeatmap.Clone for the time being (incorrectly implemented) 2021-10-12 16:18:12 +09:00
Dean Herbert
0df9ab3eec Fix migration blocking code running on the wrong thread 2021-10-12 16:04:09 +09:00
Dean Herbert
ce128476ae Remove public setter of RealmFileStore.Storage 2021-10-12 15:46:32 +09:00
Dean Herbert
129416835f
Remove stray string.Empty specification
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-10-12 15:40:12 +09:00
Dean Herbert
24b87cf655 Change some icons to be more descriptive (still placeholder) 2021-10-12 15:09:59 +09:00
Dean Herbert
59202d27c7 Add some missing labels 2021-10-12 15:09:59 +09:00
Dean Herbert
5ca1d1d12c Reorder graphics settings and move gameplay related pieces out 2021-10-12 15:09:59 +09:00
Dean Herbert
c4347de57e Move ruleset settings to own section 2021-10-12 14:58:43 +09:00
Dean Herbert
8285f065c2 Reorganise gameplay settings into more sections 2021-10-12 14:58:43 +09:00
Dan Balasescu
8291d74b68
Merge pull request #15053 from peppy/remove-button-drop-shadow
Remove drop shadow from `RoundedButton`
2021-10-12 14:04:41 +09:00