1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:57:25 +08:00
Commit Graph

45654 Commits

Author SHA1 Message Date
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
ea2069e1f3
Merge pull request #15197 from bdach/dropdown-selection-hover-split
Use different colours for selection and hover in dropdowns
2021-10-20 13:18:35 +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
Bartłomiej Dach
6c18d46443
Add test scene for demonstrating OsuDropdown appearance 2021-10-19 22:09:50 +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
6c1d224164
Merge pull request #15164 from bdach/default-value-indicator
Update appearance of setting default value indicator
2021-10-19 16:47:17 +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
32cbf6e54b Add test coverage ensuring password popover keeps focus 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
f7ec135b9b Fix TestSceneLoungeRoomsContainer crashing on selecting a room with a password 2021-10-19 15:36:27 +09:00
Dan Balasescu
f159710aae
Merge pull request #15189 from peppy/fix-migration-failure-old-version
Fix realm migration potentially failing from older releases
2021-10-19 15:19:50 +09:00
Dean Herbert
d3ab45084d Fix realm migration potentially failing from older releases 2021-10-19 14:19:58 +09:00
Dean Herbert
41999a9bb1
Merge pull request #15186 from sh0ckR6/rankdisplay-unused-removal
Comment out unused RankDisplay
2021-10-19 12:44: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
Dean Herbert
05bd440cbb
Merge pull request #15183 from bdach/fix-failing-assert-ruleset-tests
Fix ruleset template player tests failing due to null ruleset ID
2021-10-19 10:06:25 +09:00
Bartłomiej Dach
95ed9a431c
Add test coverage for no submission for ruleset with null ID 2021-10-19 00:06:07 +02: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
Dan Balasescu
cd80d8eb51
Merge pull request #15174 from peppy/disable-stupid-syntax
Disable new null check inspections which we won't be using
2021-10-18 15:10:55 +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