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

26815 Commits

Author SHA1 Message Date
Dan Balasescu
95d767bd0c
Merge branch 'master' into fix-orange-hue 2021-07-14 12:32:45 +09:00
Dean Herbert
ed29646291 Remove IApplicableToDifficulty.ReadFromDifficulty
This was added specifically for `ModDifficultyAdjust`, but turned out to
be more of a headache than we expected. We have since removed usage and
would hope that this is not required by any other mods.

Opting for complete removal rather than obsoletion, as we discovered
this was already broken in multiple cases, with fixes being quite
logically complex.

If you happen to be a ruleset developer relying on this, open an issue
and we'll talk you through a better approach (or check what
`ModDifficultyAdjust` is doing now for an example).
2021-07-14 12:32:16 +09:00
Dean Herbert
48d5a3f94f
Merge pull request #13866 from frenzibyte/remove-duplicates
Reference `OverlayColourProvider` static colours in `OsuColour`'s definitions xmldocs
2021-07-14 12:06:47 +09:00
Salman Ahmed
80636be767 Link Lime1 and Orange1 to their OverlayColourProvider's alternative 2021-07-14 03:22:00 +03:00
Salman Ahmed
b4961cd12e Revert "Remove duplicated colour definitions"
This reverts commit 9869986c59.
2021-07-14 03:18:13 +03:00
Bartłomiej Dach
9bec53bfa8 Implement osu!-side popover 2021-07-14 01:05:06 +02:00
Dean Herbert
8d82412b39
Merge pull request #13851 from gagahpangeran/autolink-md
Add autolink support in osu markdown container
2021-07-13 19:40:53 +09:00
Dean Herbert
2436ebb6d3
Merge pull request #13874 from Naxesss/short-object-checks
Add object duration checks
2021-07-13 19:01:02 +09:00
Dan Balasescu
4ce96109b7
Merge branch 'master' into fix-match-screen-buttons-no-user 2021-07-13 18:20:23 +09:00
Dan Balasescu
0557761e51
Merge pull request #13862 from peppy/fix-multiplayer-create-game-failure-crash
Fix crash when multiplayer server join fails during game creation
2021-07-13 18:00:47 +09:00
Dean Herbert
e791669c40 Fix multiplayer screen buttons showing no text when local user not available 2021-07-13 17:59:58 +09:00
Naxess
3a5912e35e Add new checks to verifiers 2021-07-13 10:53:25 +02:00
Naxess
6da2a3d51f Add zero-length objects check and tests 2021-07-13 10:50:11 +02:00
Dean Herbert
60e17fc2b7 Fix disconnected-from-server multiplayer exit sequence being blocked by confirmation dialog 2021-07-13 17:12:35 +09:00
Gagah Pangeran Rosfatiputra
1c69da09d3
Merge branch 'master' into autolink-md 2021-07-13 15:04:36 +07:00
Dean Herbert
481e4dedb0 Move PopoverContainer to OsuGameBase 2021-07-13 16:51:31 +09:00
Dean Herbert
6409a518db Focus password text box on popover display 2021-07-13 16:35:37 +09:00
Dean Herbert
5cffaf4d3b Add extra explanatory comment to avoid any confusion 2021-07-13 14:34:56 +09:00
Dean Herbert
c7c691078a Merge branch 'master' into fix-multiplayer-create-game-failure-crash 2021-07-13 14:34:42 +09:00
Dean Herbert
5a2667ae89 Merge branch 'master' into add-password-support 2021-07-13 14:27:59 +09:00
Dean Herbert
125bd36ab1 Send password in request ctor directly 2021-07-13 14:27:07 +09:00
Dean Herbert
35b5f0462c Merge branch 'master' into add-password-support 2021-07-13 14:26:56 +09:00
Dean Herbert
35841fa4f7
Merge branch 'master' into fix-difficulty-bindable-bind-order 2021-07-13 13:42:53 +09:00
Dean Herbert
5cff379cd9
Merge pull request #13860 from smoogipoo/fix-bindable-ctor
Fix DifficultyBindable not binding correctly and not having default ctor
2021-07-13 13:42:44 +09:00
Dean Herbert
5af2190246 Merge branch 'master' into fix-bindable-ctor 2021-07-13 12:46:01 +09:00
Dean Herbert
ac15dae930 Update framework 2021-07-13 12:35:25 +09:00
Dan Balasescu
351a46b379
Merge pull request #13823 from ekrctb/catch-editor-tests
Add some tests for catch editor blueprints
2021-07-13 08:27:41 +09:00
Bartłomiej Dach
cce4a4dc31 Fix incorrect value copy order in BindTo() 2021-07-12 22:27:36 +02:00
Salman Ahmed
821c1b5335 Update hue of green colour scheme 2021-07-12 19:11:40 +03:00
Salman Ahmed
62a00a82de Revert completely irrelevant changes
This reverts commit b2b966463a.
2021-07-12 19:11:28 +03:00
Salman Ahmed
b2b966463a Update hue of green colour scheme 2021-07-12 19:05:36 +03:00
Salman Ahmed
c96a76df67 Update specified link 2021-07-12 18:21:10 +03:00
Salman Ahmed
1437772711 Update hue of orange colour scheme 2021-07-12 18:11:51 +03:00
Salman Ahmed
9869986c59 Remove duplicated colour definitions 2021-07-12 17:55:29 +03:00
Salman Ahmed
1deaefacb7 Add "basic" lime colour theme 2021-07-12 17:53:15 +03:00
Dean Herbert
c6bd58ea4b Exit match sub screen when a room goes away
Closes #13847.

I think we can probably get some test coverage of this if required, but
needs a bit of thought (basically an error needs to be thrown during the
multiplayer client portion of the join procedure, after `CurrentRoom` is
non-null but before the join completes).

Manual testing on password branch (#13861) is possible since it
currently errors due to missing method on the live/dev servers.

- Create game, which will fail with `MethodNotExists`.
- Note the fields on the settings screen are emptied.
- Fill fields again and press create game (crash).
2021-07-12 19:20:41 +09:00
Dean Herbert
4dea2d9778 Dismiss popovers on returning to lounge 2021-07-12 18:54:17 +09:00
Dean Herbert
c5319c06c2 Add password attributes to CopyFrom to make testing work better 2021-07-12 18:54:07 +09:00
Dean Herbert
bbc3a013c8 Use BasicPopover for now 2021-07-12 18:29:50 +09:00
Dean Herbert
413f8adb36 Update framework 2021-07-12 18:25:04 +09:00
Dean Herbert
947460c3c5 Add test flow for joining passworded rooms via UI 2021-07-12 18:25:04 +09:00
Dean Herbert
b4ca6b6188 Update popover logic to take advantage of new explicit popup functionality 2021-07-12 18:25:04 +09:00
Dean Herbert
a3e0168a46 Update tests 2021-07-12 18:25:04 +09:00
Dean Herbert
e25b3518dc Make password popover display inside RoomsContainer rooms 2021-07-12 18:25:04 +09:00
Dean Herbert
9f9d7f9125 Add remaining pieces of password flow (for osu-web join request) 2021-07-12 18:22:52 +09:00
Dean Herbert
3c49b46c5f Add lock overlay for rooms which are password protected 2021-07-12 18:22:52 +09:00
smoogipoo
4b393209ec Implement UnbindFrom() 2021-07-12 17:33:29 +09:00
smoogipoo
242982730f Fix incorrect DifficultyBindable binding implementation 2021-07-12 17:09:09 +09:00
Dan Balasescu
36dd2c36de
Merge pull request #13859 from peppy/update-realm-win-81-fix
Update realm libraries to fix windows 8.1 incompatibility
2021-07-12 16:40:35 +09:00
Dean Herbert
f35d55c32f Fix HasPassword not being in sync with Password value for client-side rooms 2021-07-12 15:49:19 +09:00
Dean Herbert
08c40938db Add support for updating a room's password 2021-07-12 15:49:19 +09:00
Dean Herbert
84b0a3290c Add multiplayer lounge test coverage 2021-07-12 15:49:19 +09:00
Dean Herbert
5148069efe Update signatures in line with no-overload methods (unsupported by signalr) 2021-07-12 15:49:19 +09:00
Dean Herbert
2ca11d458a Add password to room settings and multiplayer lounge interface 2021-07-12 15:49:19 +09:00
Dean Herbert
6a74fde082 Add has_password flag and region post only parameters 2021-07-12 15:49:19 +09:00
Dean Herbert
4fd6f2101c Add password textbox input 2021-07-12 15:49:19 +09:00
Dean Herbert
24f330e5c1 Avoid MatchSettingsOverlay base class potentially accessing an uninitialised field 2021-07-12 15:49:19 +09:00
Dean Herbert
0db316d644 Add password scaffolding 2021-07-12 15:49:19 +09:00
Dean Herbert
d5d7dd0e74
Merge pull request #13701 from frenzibyte/consume-bindable-current-factory
Fix `RestoreDefaultValueButton` not behaving correctly on number types
2021-07-12 14:49:00 +09:00
Dean Herbert
f548ba4f69 Update realm libraries to fix windows 8.1 incompatibility 2021-07-12 14:07:17 +09:00
Dan Balasescu
0c52b26d23
Merge pull request #13824 from peppy/da-mod-refactor
Refactor `ModDifficultyAdjust` to more elegantly track user override status
2021-07-12 12:03:45 +09:00
Dean Herbert
a6258d705e Make CurrentNumber internal 2021-07-12 11:26:30 +09:00
Bartłomiej Dach
32b4f5fbd6 Do not store direct references to original bindable
`DifficultyAdjustSettingsControl` and its inner `SliderControl` were
holding different references to `DifficultyBindable`s from the
difficulty adjust mod, therefore leading to bindings being lost to the
framework-side automatic unbind logic if the mod was toggled off and
back on in rapid succession.

Resolve by adding a shadowed implementation of `GetBoundCopy()` and
using it to isolate the controls from the mod bindable.
2021-07-11 15:28:13 +02:00
Salman Ahmed
f21ea3b790 Update player test scene Ruleset bindable from creation method 2021-07-11 03:46:19 +03:00
Salman Ahmed
07ede7a147 Disallow custom rulesets from score submission 2021-07-11 03:34:57 +03:00
Salman Ahmed
c44558e3c8 Add back LoadComplete override 2021-07-10 17:57:52 +03:00
Bartłomiej Dach
1bd5b1a8b9
Merge branch 'master' into fix-access-denied-test-failures 2021-07-10 13:00:27 +02:00
Gagah Pangeran Rosfatiputra
e4f13e311e
override add auto link in text flow container 2021-07-10 17:58:00 +07:00
Gagah Pangeran Rosfatiputra
45ff28f83b
add autolink constructor 2021-07-10 17:57:33 +07:00
Bartłomiej Dach
6f89f8e572 Merge branch 'master' into da-mod-refactor 2021-07-10 11:41:54 +02:00
Dean Herbert
6a5f0e8237 Move handling of replay seek operations out of progress bar
This is in order to avoid using the now obsoleted property
`SliderBar.AllowKeyboardInputWhenNotHovered`
(see https://github.com/ppy/osu-framework/pull/4579).
2021-07-09 14:28:59 +09:00
Dean Herbert
741062a6da Simplify bindable update methods 2021-07-09 13:58:44 +09:00
Dean Herbert
e0277763d0 Refactor DifficultyAdjustSettingsControl to help with readability 2021-07-09 13:50:07 +09:00
Dean Herbert
f9cd7f10d8 Allow null values for ReadCurrentFromDifficulty
As long as this isn't a constructor parameter it feels best to
gracefully handle omission. Realistically having it in the ctor is the
best move, but it doesn't feel great in line with the other parameters
passed in via object initalisers.
2021-07-09 13:26:01 +09:00
Dean Herbert
90326f8864 Standardise variables 2021-07-09 13:24:26 +09:00
Dean Herbert
df4bd86cfc Fix storage wrapping logic setting logger too early in startup sequence 2021-07-09 13:18:49 +09:00
Dean Herbert
f3b68a4fbf Fix storage wrapping logic setting logger too early in startup sequence 2021-07-09 13:17:25 +09:00
Dean Herbert
9f7c6adb58 Fix test failures due to logger pollution
As seen at
https://github.com/ppy/osu/pull/13831/checks?check_run_id=3025050307. I
can't confirm that this will fix the issue but it looks like the only
plausible reason. I have confirmed that the logging is not coming from
the local (first logging is guaranteed to be after `SetupForRun`).
2021-07-09 12:15:30 +09:00
Dean Herbert
dbfeea9880
Merge pull request #13831 from nekodex/add-dropdown-sound-to-profile
Change profile section expansion button to use dropdown sounds
2021-07-09 11:58:48 +09:00
Jamie Taylor
2eb12a59b7
Rename function to be more accurate 2021-07-09 11:16:47 +09:00
Salman Ahmed
0223c569df Remove no longer necessary method definitions 2021-07-09 00:49:05 +03:00
Salman Ahmed
a7be632770
Improve documentation
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-07-09 00:39:09 +03:00
Bartłomiej Dach
3e21eeb7c2
Merge branch 'master' into fix-mod-select-cross-talk 2021-07-08 19:53:50 +02:00
Salman Ahmed
f5166d8dd5
Merge branch 'master' into consume-bindable-current-factory 2021-07-08 18:13:48 +03:00
Dean Herbert
b7803b889e Rename control class to be more descriptive 2021-07-08 20:37:38 +09:00
Jamie Taylor
8746ef0ba9
Avoid double playback of sample 2021-07-08 20:36:25 +09:00
Jamie Taylor
546f55d341
Change profile section expansion to use dropdown sounds 2021-07-08 20:23:11 +09:00
Jamie Taylor
93eb385dd4
Add sound for switching between volume controls 2021-07-08 20:01:39 +09:00
Dean Herbert
af270cccc4 Fix cross talk between ModSelectOverlays 2021-07-08 17:59:04 +09:00
Dean Herbert
ba939c0b65 Simplify serialisation edge case by moving to Value override 2021-07-08 17:49:00 +09:00
Dean Herbert
52ea62e3b2 Add more comments and xmldoc 2021-07-08 17:49:00 +09:00
Dean Herbert
88b00123f6 Use existing reflection methods to avoid manual binding of ExtendedLimits 2021-07-08 17:49:00 +09:00
Dean Herbert
bd7c334588 Avoid the need for per-settings control classes 2021-07-08 17:49:00 +09:00
Dean Herbert
a6e94dd491 Add back extended limits support 2021-07-08 17:49:00 +09:00
Dean Herbert
c4313d6e96 Initial implementation of new flow (only working for approach rate) 2021-07-08 17:48:08 +09:00
Dean Herbert
fcee69ffe6 Fix ShowsDefaultIndicator not actually being consumed 2021-07-08 17:48:08 +09:00
ekrctb
4ac7d629d7 Expose current placement blueprint 2021-07-08 16:36:41 +09:00
ekrctb
8da1335e5f Add catch placement blueprint visual test scenes (without tests) 2021-07-08 15:51:46 +09:00
ekrctb
bd4b3f5268 Add catch selection blueprint visual test scene (without tests) 2021-07-08 15:42:29 +09:00
Dean Herbert
0e4f4a6fde Initial storage changes 2021-07-08 14:28:13 +09:00
ekrctb
663ffae42f Fix hit object selection blueprint potential null reference 2021-07-08 14:19:00 +09:00
Dean Herbert
e612d7568c
Merge pull request #13771 from LumpBloom7/volume-meter-switch
Add ability to navigate between volume meters via Alt+Left/Right arrows
2021-07-07 21:50:44 +09:00
Dean Herbert
7d405f04fb Fix selected volume control not updating correctly on mouse move 2021-07-07 21:17:31 +09:00
Dean Herbert
cbe4114e90 Adjust visuals and make base opacity 100% 2021-07-07 21:07:00 +09:00
Dean Herbert
e42609f092
Merge pull request #8038 from thewildtree/adjust-rankings-overlay
Adjust rankings overlay elements to better match osu-web
2021-07-07 20:24:11 +09:00
Dean Herbert
f7dc689832
Merge pull request #13804 from bdach/migrate-directory-selector
Migrate file/directory selectors to use framework component instead of local implementation
2021-07-07 20:10:26 +09:00
Derrick Timmermans
4d7c744101
Fix failing test 2021-07-07 12:59:31 +02:00
Derrick Timmermans
f53f6690e3
Remove extra blank line 2021-07-07 12:01:47 +02:00
Derrick Timmermans
8b1876bc2a
Disallow removing items from SelectionCycleFillFlowContainer 2021-07-07 11:43:54 +02:00
Dan Balasescu
066d0a1ef1
Merge branch 'master' into migrate-directory-selector 2021-07-07 15:57:34 +09:00
Dan Balasescu
d2722f1523
Merge branch 'master' into ruleset-shaders 2021-07-07 15:44:30 +09:00
Salman Ahmed
28adb43a4a Add detailed explaination for the reason of using old binding method 2021-07-07 09:26:17 +03:00
Dean Herbert
bb58a9412b
Merge branch 'master' into consume-bindable-current-factory 2021-07-07 15:16:02 +09:00
Dan Balasescu
34a867a335
Merge branch 'master' into fix-skin-providing-container 2021-07-07 15:00:35 +09:00
Dean Herbert
b08fece2d4 Update framework 2021-07-07 14:30:47 +09:00
Dean Herbert
c18b8ca86c Add missing ToArray() call 2021-07-07 14:08:29 +09:00
Dean Herbert
ca791c2afa Remove unused using statement 2021-07-07 13:53:00 +09:00
Dean Herbert
35d4b12a4f Remove single local usage of AllSources 2021-07-07 13:52:52 +09:00
Dean Herbert
eb8b14a931 Reorder methods to make more sense 2021-07-07 13:51:51 +09:00
Dean Herbert
ddb1da5a66 Tidy up class (although it's not in a good state logically) 2021-07-07 13:48:35 +09:00
Bartłomiej Dach
e94e283ee4 Move shared inner classes to separate files 2021-07-06 22:11:54 +02:00
Bartłomiej Dach
f45418dde7 Replace game-side directory/file selector with framework extensions 2021-07-06 22:11:54 +02:00
Dean Herbert
523546d8b6 Use List to guarantee lookup order 2021-07-06 22:51:56 +09:00
Dean Herbert
12afdbdf57
Merge pull request #13791 from peppy/remove-resx-files
Remove all `.resx` files from osu project
2021-07-06 22:29:28 +09:00
Derrick Timmermans
4451598bcf
Fix remaining quality complaints 2021-07-06 15:17:19 +02:00
Derrick Timmermans
4b1b5a88fe
Add null check to supress quality errors 2021-07-06 14:39:53 +02:00
Derrick Timmermans
ffe18ebe51
Resolve build errors 2021-07-06 14:11:46 +02:00
Derrick Timmermans
07d54d261a
Let selection container handle manual selection changes 2021-07-06 13:24:18 +02:00
Dean Herbert
06d2c6f0a1 Update resources 2021-07-06 19:51:57 +09:00
Derrick Timmermans
c5a0672277
Use IStateful<SelectionState> instead of ISelected 2021-07-06 12:07:25 +02:00
Derrick Timmermans
32ef2405c4
Use null instead of -1 2021-07-06 11:30:56 +02:00
Dean Herbert
d75d67577a Fix regressed tests 2021-07-06 17:37:34 +09:00
Dean Herbert
cd4885e450 Add xmldoc and remove any question of how the intitial flow is being run 2021-07-06 17:18:45 +09:00
Dean Herbert
032c285ede Move private downwards 2021-07-06 17:07:29 +09:00
Dean Herbert
1232925f93 Make source manipulation methods protected 2021-07-06 17:06:00 +09:00
Dean Herbert
b4240d3ca4 Simplify lookups to avoid a second dictionary fetch 2021-07-06 17:04:59 +09:00
Dean Herbert
ec1224218c Localise source changed flow for better clarity 2021-07-06 16:57:19 +09:00
Dean Herbert
935fbe7cc6 Remove double fetch/binding of parent source 2021-07-06 16:51:29 +09:00
Dean Herbert
93ef783339 Remove BindableList usage 2021-07-06 16:40:23 +09:00
Dan Balasescu
32e6c9c5d3
Merge pull request #13786 from peppy/multiplayer-test-fixes
Fix multiplayer test failures due to leaderboard load process
2021-07-06 16:33:41 +09:00
smoogipoo
1beb85a26f Bump localisation analyser packages 2021-07-06 14:56:52 +09:00
Dean Herbert
0658cfb986 Throw exceptions rather than silently failing if attempting to add a clock for a non-tracked user 2021-07-06 14:56:00 +09:00
smoogipoo
402b527903 Add .editorconfig for localisation analyser 2021-07-06 14:54:56 +09:00
Dean Herbert
1a6b8b2c73 Populate UserScores as early as possible to avoid weird ordering requirements 2021-07-06 14:53:31 +09:00
Dean Herbert
0ecda98b39 Update prefixes to match new resx locations 2021-07-06 14:28:52 +09:00
Dean Herbert
7f2baef998 Remove all .resx files from osu project 2021-07-06 14:24:17 +09:00
Bartłomiej Dach
686dd2b5ce Remove unused constant 2021-07-05 20:35:14 +02:00
Derrick Timmermans
d495196b66
Share item cycling logic with GameplayMenuOverlay 2021-07-05 19:22:55 +02:00
Dean Herbert
f5ddd2a53b Fix critical failure causing scores to not update on the leaderboard 2021-07-06 01:15:30 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00