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

28977 Commits

Author SHA1 Message Date
Dean Herbert
e92def0ba2 Fix LegacyBeatmapEncoder using incorrect path length value 2021-10-26 17:34:52 +09:00
Dan Balasescu
6a6d3a5e8a
Merge pull request #15304 from peppy/fix-editor-new-beatmap-sample-change-crash
Fix editor crash when attempting to change sample/velocity from timeline on new beatmap
2021-10-26 17:13:56 +09:00
Dean Herbert
4cef86dd12
Merge pull request #15301 from jaswon/reverse-slider-symmetric
Fix slider shape not always being maintained when reversing
2021-10-26 16:17:29 +09:00
Dean Herbert
ea55ba7ba9 Remove unused using statement 2021-10-26 16:08:21 +09:00
Dean Herbert
dae7cdc4c5 Ensure HitObject-local control points are non-default after ApplyDefaults
We will probably want to make this whole flow more efficient in the
future, but this should suffice for now.
2021-10-26 16:06:03 +09:00
Dean Herbert
5e5b86a1f4
Merge pull request #15156 from Susko3/use-ShowFileInNativeExplorer
Update usages of `OpenInNativeExplorer` to use `PresentFileExternally` / `PresentExternally`
2021-10-26 15:53:03 +09:00
Dean Herbert
81fee02c2b Fix slider paths being extended even when the last two points are equal 2021-10-26 15:47:59 +09:00
Dan Balasescu
f687ed8599
Merge pull request #15283 from peppy/test-api-beatmap-set
Add ability to make test `APIBeatmapSet`s from test scenes
2021-10-26 15:34:19 +09:00
Dan Balasescu
7b8982c87c
Merge pull request #15302 from peppy/fix-multiplayer-chat-escape-focus
Fix gameplay chat display not losing focus on escape key press
2021-10-26 15:34:05 +09:00
Dan Balasescu
efe6763226
Merge branch 'master' into move-online-beatmap-metrics 2021-10-26 14:24:40 +09:00
Dean Herbert
370775af68 Fix some surrounding code formatting 2021-10-26 14:05:07 +09:00
Dean Herbert
53ff0802cb Merge branch 'master' into use-ShowFileInNativeExplorer 2021-10-26 13:58:30 +09:00
Dean Herbert
26fb9af021 Update framework 2021-10-26 13:58:07 +09:00
Dean Herbert
6c38028d06 Fix gameplay chat display not losing focus on escape key press
Closes #15293.
2021-10-26 13:55:08 +09:00
Dan Balasescu
1e3c84b34b
Merge branch 'master' into use-beatmap-interfaces-more-uncontested 2021-10-26 13:51:55 +09:00
Dan Balasescu
676e7ff2a6
Merge pull request #15287 from peppy/get-beatmap-request-via-interface
Allow API beatmap requests using interface type
2021-10-26 13:50:46 +09:00
Jason Won
a582976851 reversing slider maintains shape 2021-10-26 00:05:46 -04:00
Dean Herbert
d7ac94038a Update GetBeatmapRequest to use AddParameter 2021-10-26 12:05:31 +09:00
Dean Herbert
5d1170aaf4 Remove unnecessary null check 2021-10-26 11:57:51 +09:00
Bartłomiej Dach
a49a1f41cb
Merge branch 'master' into move-online-beatmap-metrics 2021-10-25 20:33:49 +02:00
Bartłomiej Dach
5a03e1736e
Merge branch 'master' into update-beatmap-set-status-pill-appearance 2021-10-25 20:26:49 +02:00
Bartłomiej Dach
6802e9ec10
Remove FixedWidth and add AutoSizeAxes specs to all usages 2021-10-25 20:24:48 +02:00
Dean Herbert
b65d199f6a Fix incorrect length when calling APIBeatmap.ToBeatmapInfo 2021-10-25 17:01:47 +09:00
Dean Herbert
6adb0f068b Fix multiple issues with json serialisation of online info (causing tournament failures) 2021-10-25 16:52:50 +09:00
Dean Herbert
67ef1c40e6 Allow API beatmap requests using interface type 2021-10-25 15:59:40 +09:00
Dean Herbert
2c308f3008 Rename BeatmapMetrics to APIFailTimes 2021-10-25 15:34:41 +09:00
Dean Herbert
4969ab0599 Add forgotten JsonIgnore rules on interface types
Just to avoid them getting serialised as part of the "new" .osu
serialisation format.
2021-10-25 15:32:18 +09:00
Dean Herbert
20baae9094 Move online metrics out of BeatmapInfo model 2021-10-25 15:32:18 +09:00
Dean Herbert
045dd94a6e Move online metrics out of BeatmapSetInfo model 2021-10-25 15:12:39 +09:00
Dean Herbert
94175bfb4a Update PreviewTrackManager to use IBeatmapSetInfo 2021-10-25 14:25:01 +09:00
Dean Herbert
19312435d0 Add ability to make test APIBeatmaps from test scenes
Allow tests to create a sample `APIBeatmapSet`

One step towards removing calls to `ToBeatmap` / `ToBeatmapSet`.
2021-10-25 14:18:13 +09:00
Dean Herbert
78edc7554e Fix BeatmapSetInfo's Status value being marked as non-databased 2021-10-25 12:05:34 +09:00
Bartłomiej Dach
feedd53a53
Add support for setting fixed size of status pill 2021-10-24 21:37:00 +02:00
Bartłomiej Dach
5ab3337a10
Update beatmap set status pill appearance 2021-10-24 20:40:34 +02:00
Dean Herbert
26cf5370c3 Remove unused reader parameter 2021-10-24 23:48:46 +09:00
Dean Herbert
5303cae044 Add mention of stream close logic 2021-10-24 23:43:37 +09:00
Susko3
51c5d0aec7 Update to be in line with framework changes 2021-10-24 13:21:41 +02:00
Bartłomiej Dach
d24fbc6ade
Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-24 12:58:56 +02:00
Bartłomiej Dach
051cc2cd92
Update reference to configuration population process in comment 2021-10-24 12:47:17 +02:00
goodtrailer
0affe7b79d Remove unnecessary using 2021-10-23 02:25:20 -07:00
goodtrailer
4440b9ca11 Change IHasRepeats.NodeSamples to IList from List 2021-10-23 01:59:07 -07:00
Susko3
4a425b5c3e Merge remote-tracking branch 'upstream/master' into use-ShowFileInNativeExplorer 2021-10-23 10:01:24 +02:00
Joseph Madamba
1ae6621c85 Fix a missed toast shortcut string not localising correctly 2021-10-22 15:45:48 -07:00
Dan Balasescu
c6ca0e5895
Merge branch 'master' into fix-password-popover-focus 2021-10-22 22:52:46 +09:00
Dan Balasescu
9bb0d32fda
Merge pull request #15247 from peppy/beatmap-metadata-container-interface
Refactor `BeatmapMetadataContainer` and usages to use interface types
2021-10-22 22:42:23 +09:00
Dan Balasescu
e8fbb19c63
Merge branch 'master' into remove-unused-classes 2021-10-22 22:25:22 +09:00
Dean Herbert
c701579c69 Refactor BeatmapMetadataContainer and usages to use interface types 2021-10-22 21:38:50 +09:00
Dean Herbert
28d8820976
Merge pull request #15224 from peppy/no-more-beatmap-metadata-base
Remove `BeatmapMetadata` base class from API classes
2021-10-22 21:07:29 +09:00
Dean Herbert
90477e3788 Remove unused BeatmapTypeInfo class
Helps reduce the scope of upcoming changes.
2021-10-22 19:13:50 +09:00
Dan Balasescu
14a7b00f58
Merge pull request #15242 from peppy/fix-low-pass-sticking-after-fail
Fix low-pass filter continuing to take effect after fail animation has already ended
2021-10-22 19:04:03 +09:00
Dean Herbert
cc1d759290 Remove unnecessary setters from IBeatmapSetOnlineInfo interface 2021-10-22 17:48:09 +09:00
Dean Herbert
91cc77407d Fix low-pass filter continuing to take effect after fail animation has already ended 2021-10-22 17:02:02 +09:00
Dean Herbert
ea473428e8 Fix incorrect length mapping in APIBeatmap 2021-10-22 15:54:40 +09:00
Dean Herbert
de33b2f45a Return set metadata if available before falling back to empty object 2021-10-22 15:00:31 +09:00
Dean Herbert
eef9949a0a Remove unnecessary branching around EF logic 2021-10-22 14:48:20 +09:00
Dean Herbert
93482414d6 Remove SkinConfiguration subclasses and allow configuration parsing for all skin types 2021-10-22 14:42:23 +09:00
Dean Herbert
82d0a6515f Fix incorrect conditional for checking whether import (would fail for default skin) 2021-10-22 14:08:12 +09:00
Dean Herbert
9cdc1ba592 Fix default legacy skin not being able to read from stored skin.ini 2021-10-22 13:43:45 +09:00
Dean Herbert
e5b73f25cd Ensure newly created skin.ini files are set to latest version 2021-10-22 12:56:05 +09:00
Dean Herbert
fb7cf35481 Remove BeatmapMetadata base class from APIBeatmap 2021-10-21 21:48:14 +09:00
Dean Herbert
6dd54a417f Remove BeatmapMetadata base class from APIBeatmapSet 2021-10-21 21:32:07 +09:00
Dean Herbert
9e0d839ef3
Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-21 20:33:47 +09:00
Dean Herbert
c580ec865f APIBeatmapSet.Covers is never null 2021-10-21 19:34:01 +09:00
Dean Herbert
0fe0b5dc09 APIBeatmap implements IBeatmapInfo 2021-10-21 19:14:31 +09:00
Dean Herbert
40a176e86e APIBeatmapSet implements IBeatmapSetInfo 2021-10-21 19:14:19 +09:00
Dean Herbert
69e7810dad Enable nullable and switch classes to structs 2021-10-21 18:54:36 +09:00
Dan Balasescu
8ae05ee8f7
Merge branch 'master' into online-info-as-interface 2021-10-21 17:14:57 +09:00
Dean Herbert
0335ed6f27 Add missing licence header 2021-10-21 17:14:29 +09:00
Dean Herbert
ff674ca913 Remove unnecessary access modifiers from interface 2021-10-21 17:01:57 +09:00
Dean Herbert
b73bd54ab2 Split out individual pieces into own files 2021-10-21 16:58:42 +09:00
Dean Herbert
32d01f022f Rename usages which rely on online backing 2021-10-21 16:58:42 +09:00
Dean Herbert
0706ad70fb Move BeatmapSetOnlineInfo to an interface type 2021-10-21 16:58:42 +09:00
Dean Herbert
a5c155bc87 Remove APIPlaylistBeatmap subclass 2021-10-21 16:43:46 +09:00
Dean Herbert
a5088cac27 Fix default metadata propagation when no files are present 2021-10-21 13:43:42 +09:00
Dean Herbert
59b7210efa Revert disallowing imports with no files
While it is logical that we want this, from a testing perspective this is a bit of a nightmare to fix. Let's revisit at a later point in time.
2021-10-21 13:43:42 +09:00
Dean Herbert
7bc8f5cd5c Change selection colour to also match the colour provider scheme 2021-10-21 13:01:13 +09:00
Bartłomiej Dach
9ad9465020
Remove online-screen-local textbox recolours 2021-10-20 22:49:25 +02:00
Bartłomiej Dach
1ec881ce1d
Recolour focused text box variant 2021-10-20 22:49:25 +02:00
Bartłomiej Dach
addcef4f5d
Recolour text box using OverlayColourProvider 2021-10-20 22:49:25 +02:00
Dean Herbert
68c01fc204 Fix infinite loop on default skin (it can't have a skin.ini) 2021-10-20 17:56:45 +09:00
Dean Herbert
9e6e41d7c0 Add migration to reset and repopulate existing skin hashes 2021-10-20 17:56:45 +09:00
Dean Herbert
602303e947 Add test coverage for skin.ini contents 2021-10-20 17:56:45 +09:00
Dean Herbert
a95c754fd3 Fix multiple issues and make metadata fallback process more logical 2021-10-20 17:56:45 +09:00
Dean Herbert
439e90fce3 Disallow archive imports with no hashable files 2021-10-20 17:45:06 +09:00
Dean Herbert
fa542f2547 Include json files in skin hashing
This covers the new layout storage we are doing.
2021-10-20 17:45:06 +09:00
Dean Herbert
789c715f13 Add skin.ini write support to allow for more correct hashing 2021-10-20 17:45:06 +09:00
Dan Balasescu
08f3bc3f44
Merge pull request #15120 from peppy/realm-importer
Implement realm beatmap importer
2021-10-20 16:44:16 +09:00
Dean Herbert
da750a74fc Add xmldoc mention of valid OnlineID values 2021-10-20 15:24:27 +09:00
smoogipoo
c8cdc38efd Always compare OnlineIds by >0 2021-10-20 15:20:34 +09:00
smoogipoo
2c979d6420 Merge branch 'master' into localise-toasts 2021-10-20 15:04:07 +09:00
smoogipoo
a06f624a4a Fix possible exception with "invalid" key
Triggered by toggling Shift+Tab during gameplay.
2021-10-20 15:03:16 +09:00
Dean Herbert
4b2eb7736c Move helper method to bottom of file 2021-10-20 12:52:38 +09:00
Dean Herbert
37841ca3aa Remove incorrect ToString calls causing localisation to not actually apply 2021-10-20 10:41:34 +09:00
Bartłomiej Dach
f29eb08d93
Improve contrast in default OverlayColourProvider-themed appearance 2021-10-19 22:55:49 +02:00
Bartłomiej Dach
80da153697
Recolour a few other existing dropdowns with same hover & selection colours 2021-10-19 22:47:18 +02:00
Bartłomiej Dach
61127a389c
Fix tab dropdown receiving accent colour too early 2021-10-19 22:09:51 +02:00
Bartłomiej Dach
ef03787fe0
Split dropdown accent colour into hover and selection colours 2021-10-19 22:09:51 +02:00
Dean Herbert
8672b3325a Fix a couple more weird variable names 2021-10-19 17:22:50 +09:00
Dean Herbert
61670a70b6 Tidy up tracked settings code syntax and fix remaining issue 2021-10-19 17:21:07 +09:00
Dean Herbert
192cfe8717
Replace unnecessary ToString call
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-10-19 16:42:07 +09:00
Dean Herbert
c97cfdd978 Merge branch 'master' into localise-toasts 2021-10-19 16:37:14 +09:00
Dean Herbert
7cf4395875 Merge branch 'master' into default-value-indicator 2021-10-19 16:23:02 +09:00
Dean Herbert
480dc57102 Schedule joinFailed callback for added safety 2021-10-19 15:54:12 +09:00
Dean Herbert
da524261c0 Fix focus potentially being transferred too far up when password is being verified 2021-10-19 15:53:29 +09:00
Dean Herbert
a589964dc7 Centralise join logic 2021-10-19 15:53:29 +09:00
Dean Herbert
8944b1dd78 Add basic test coverage of DrawableLoungeRoom 2021-10-19 15:36:27 +09:00
Dean Herbert
473459d191 Add layout duration to PasswordEntryPopover to make error text look a bit smoother 2021-10-19 15:36:27 +09:00
Dean Herbert
d35fe5493a Change default value of DrawableLoungeRoom.matchingFilter so they display by default 2021-10-19 15:36:27 +09:00
Dean Herbert
d3ab45084d Fix realm migration potentially failing from older releases 2021-10-19 14:19:58 +09:00
sh0ckR6
e7b280fc81
Comment out RankDisplay
Commented out as it may be revisited at a later time.
Also currently unused.
2021-10-18 23:12:33 -04:00
Dean Herbert
ff2eae4597 Rename confusing variable 2021-10-19 11:37:46 +09:00
Dan Balasescu
30af27e561
Merge branch 'master' into realm-importer 2021-10-19 11:06:11 +09:00
Dan Balasescu
4fcdeffbd9
Merge pull request #15176 from peppy/realm-indexed-online-id
Change `OnlineID` to non-nullable to allow for indexing in Realm
2021-10-19 11:05:34 +09:00
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