1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 22:22:55 +08:00
Commit Graph

802 Commits

Author SHA1 Message Date
Dean Herbert
b0a113a36b Merge branch 'master' into localisation-proof-of-concept 2021-05-21 17:57:54 +09:00
Dean Herbert
2958b9adf4 Merge branch 'master' into import-from-stable-select-location 2021-05-21 17:37:34 +09:00
Dean Herbert
5acb708939 Remove customisation of hit error via standard settings 2021-05-18 15:50:50 +09:00
Dean Herbert
c71d53a0f9 Fix text and button layout 2021-05-18 13:40:26 +09:00
Lucas A
e2018f81f3 Use equality check for nullable types. 2021-05-17 19:54:21 +02:00
Lucas A
5ca4fd5ab4 Block overlays to prevent getting into a bad state. 2021-05-17 13:28:59 +02:00
Lucas A
a38fc1a2e0 Override text header. 2021-05-17 13:04:49 +02:00
Lucas A
db255e6814 Mark StableImportManager as potentially null in tests.
(StableImportManager is added to the DI in OsuGame and not in the OsuGameBase)
2021-05-17 12:55:59 +02:00
Lucas A
bec06cfac7 Reword StableDirectoryLocationDialog header
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-05-17 12:55:58 +02:00
Lucas A
f60dbbfbbd Reword import dialogs.
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-17 12:55:58 +02:00
Lucas A
e15e8068d3 Reword StableDirectoryLocationDialog.
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-17 12:55:58 +02:00
Lucas A
dabe8bd4c7 Fix code inspections and remove now unused code. 2021-05-17 12:55:58 +02:00
Lucas A
481b0a0125 Add StableDirectoryLocationDialog 2021-05-17 12:55:57 +02:00
Lucas A
851e33fd15 Hook up StableImportManager. 2021-05-17 12:55:57 +02:00
Lucas A
5d5b1e1f0e Add StableImportManager 2021-05-17 12:55:56 +02:00
Dean Herbert
baa4089364 Expose method to adjust header text, not whole drawable 2021-05-17 16:41:46 +09:00
Swords
304caf8bdf Adding Requested changed 2021-05-15 11:24:08 +10:00
Swords
1603b92211 Reformatting 2021-05-15 01:30:54 +10:00
Swords
753bdf2083 Fixed formatting 2021-05-15 01:04:15 +10:00
Swords
0725088fde Well it works, just pretty ugly looking. 2021-05-15 01:01:17 +10:00
Lucas A
6f248db519 Merge conditional expression. 2021-05-13 19:31:10 +02:00
Lucas A
0caba57945 Make screen properties local to MigrationSelectScreen. 2021-05-13 19:28:23 +02:00
Lucas A
09a5b9c872 Add XMLDoc to protected members. 2021-05-13 16:28:03 +02:00
Lucas A
eee3cd7c57 Disallow selecting storage root as a valid directory. 2021-05-13 11:14:05 +02:00
Lucas A
d3cc418961 Privatize DirectorySelector. 2021-05-13 11:08:04 +02:00
Lucas A
4bb0e6b7d5 Create InitialPath property. 2021-05-13 11:07:52 +02:00
Lucas A
9a061ad80b Extract directory selection logic of migration screen to DirectorySelectScreen. 2021-05-13 11:07:26 +02:00
smoogipoo
cd25d76dbe Merge branch 'master' into localisation-proof-of-concept 2021-05-08 18:11:07 +09:00
Joseph Madamba
d4658c609b Fix warning text of bg source setting not being updated when user with supporter signs in/out 2021-05-05 22:54:35 -07:00
Dean Herbert
08a45e9fc2 Remove dead code 2021-05-05 16:26:41 +09:00
Dean Herbert
19ffcd00c2 Initialise warning text flow lazily as most items will not use it 2021-05-05 16:26:41 +09:00
Dean Herbert
1288f69fad Rename to WarningText 2021-05-05 16:16:49 +09:00
Dean Herbert
6178f38c95 Reword unlimited frame rate warning a bit 2021-05-05 16:15:06 +09:00
Joseph Madamba
23b9d8c260
Fix alpha not being zero when string is set to empty and use inequality on supporter condition
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-05-04 14:02:12 -07:00
Joseph Madamba
a584213002 Use vertical padding instead of relative height for default button 2021-05-04 09:32:38 -07:00
Joseph Madamba
0a64922738 Add supporter note to background source setting 2021-05-04 01:15:59 -07:00
Joseph Madamba
796bd8e47e Add existing setting notes from stable 2021-05-04 01:15:59 -07:00
Joseph Madamba
acc9258eb2 Implement notes for settings 2021-05-04 01:15:59 -07:00
Dean Herbert
ab2a8b5c89 Fix initial rotation not being set 2021-04-21 16:12:09 +09:00
Dean Herbert
eb20865c02 Show tablet preview with physical tablet counter-rotated for supplied user area selection
Closes https://github.com/ppy/osu/issues/12399.

Rotation animation is intentionally delayed slightly to give a better sense of what is going on (or maybe just look cool).
2021-04-21 15:55:15 +09:00
Dean Herbert
31c8586dac Add localisation support to overlay header title/description 2021-04-21 14:37:29 +09:00
Dean Herbert
623eae1576 Add basic language switching ability 2021-04-20 17:06:01 +09:00
smoogipoo
8293b06c0a Remove obsolete code 2021-04-09 13:56:58 +09:00
Dean Herbert
1dfd08eded Add tablet rotation configuration 2021-03-30 13:01:48 +09:00
Dean Herbert
8dfff999f9 Add rotation slider 2021-03-30 12:40:50 +09:00
Dean Herbert
8a0fcf20ed Move offset settings up for more logical ordering 2021-03-30 12:32:42 +09:00
Bartłomiej Dach
86b569f5f7 Fix typo in identifier 2021-03-20 12:37:51 +01:00
Bartłomiej Dach
d28bed6ed2 Schedule adding transforms on tablet changes
Fixes `InvalidThreadForMutationException`s that pop up when
disconnecting/reconnecting tablets during the game's operation. In those
cases the value change callback executes from  an OpenTabletDriver
thread.
2021-03-20 12:37:48 +01:00
Dean Herbert
63cbac3bd0 Ensure aspect ratio slider gets an initial value 2021-03-19 20:15:29 +09:00
Dean Herbert
6f32c302eb Add checkbox to optionally disable tablet handling 2021-03-19 20:13:51 +09:00
Dean Herbert
86b229b1c9 Increase maximum usable aspect ratio to account for ultrawide monitors 2021-03-19 20:05:18 +09:00
Dean Herbert
fefb007805 Remove no longer relevant comment 2021-03-19 19:01:32 +09:00
Dean Herbert
1e82033c84 Move bindings to LoadComplete to avoid cross-thread issues 2021-03-19 19:01:32 +09:00
Dean Herbert
c624aa9397 Only update tablet values on commit 2021-03-19 19:01:32 +09:00
Dean Herbert
6285dcd1a1 Add arbitrary value to fix FP contains check failures 2021-03-19 19:01:32 +09:00
Dean Herbert
e8c20bdcb1 Add centre crosshair 2021-03-19 19:01:32 +09:00
Dean Herbert
fb7d095e4a Show aspect ratio for current usable area 2021-03-19 19:01:32 +09:00
Dean Herbert
196f95ae54 Update to use new bindables and centered area offset 2021-03-19 19:01:32 +09:00
Dean Herbert
9d0c8902a6 Fix margins and spacing between sub flowed items 2021-03-19 19:01:32 +09:00
Dean Herbert
d422a65900 Fix initial tablet size not being initialised 2021-03-19 19:01:32 +09:00
Dean Herbert
9a6a0f3df5 Add test coverage and better UI handling of no tablet connected scenario 2021-03-19 19:01:32 +09:00
Dean Herbert
bba25a0182 Tidy up draw hierarchy and bindable logic 2021-03-19 19:01:31 +09:00
Dean Herbert
932745e5c4 Fix remaining feedback loops 2021-03-19 19:01:31 +09:00
Dean Herbert
e3bed4c97d Simplify aspect ratio application, add window conforming and direct adjustment 2021-03-19 19:01:31 +09:00
Dean Herbert
43359553c1 Add aspect ratio display and limiting 2021-03-19 19:01:31 +09:00
Dean Herbert
9b70f0ee1f Tidy up visual appearance of settings and add a reset button 2021-03-19 19:01:31 +09:00
Dean Herbert
2dc2cb04c3 Fix bounds check becoming false when using full area 2021-03-19 19:01:31 +09:00
Dean Herbert
464702182d Consume device name 2021-03-19 19:01:31 +09:00
Dean Herbert
94f184d113 Add feedback when area extends beyond tablet size 2021-03-19 19:01:31 +09:00
Dean Herbert
0a6525baee Fix slider bars reloading each time the tablet size is changed 2021-03-19 19:01:31 +09:00
Dean Herbert
926e40925e Add exclude rule to fix dynamic compilations issues with settings sections 2021-03-19 19:01:31 +09:00
Dean Herbert
3b7edf1333 Make tablet display always fit to size of settings area 2021-03-19 19:01:31 +09:00
Dean Herbert
d026c8da85 Initial pass of configuration interface 2021-03-19 19:01:31 +09:00
Dean Herbert
a8cc3a3b44 Implement enable state changes locally for InputHandlers which should be toggleable 2021-03-18 21:17:04 +09:00
Dean Herbert
fccd495f27 Remove obsoleted setting for now 2021-03-17 18:07:51 +09:00
Dean Herbert
3458dcc33a Use whitelist to avoid exposing settings to user that shouldn't be 2021-03-12 18:40:38 +09:00
Dean Herbert
03230edcb1 Update bindings settings to handle the new structure and show all handlers 2021-03-12 18:38:16 +09:00
Dean Herbert
3c21c83cc8 Rename KeyboardSection to BindingSection 2021-03-12 18:36:28 +09:00
Dean Herbert
e7707eee94 Switch RestoreDefaultsValueButton to use HasPendingTasks to avoid tooltip always showing 2021-03-12 15:23:11 +09:00
Salman Ahmed
132fcda089 Force config sensitivity value to local setting bindable
Re-enable the local bindable to update the sensitivity value then change back to whatever state it was in previously.
2021-03-04 17:00:44 +03:00
Dean Herbert
534e16237a Remove unnecessary intial construction of bindable 2021-03-03 20:36:41 +09:00
Dean Herbert
002646370c Move bindable logic in MouseSettings to LoadComplete 2021-03-03 16:47:42 +09:00
Bartłomiej Dach
3b125a26a8 Add test coverage 2021-03-02 19:21:03 +01:00
Bartłomiej Dach
40a28367c6 Fix restore-to-default buttons never showing if initially hidden 2021-03-02 18:50:33 +01:00
Dean Herbert
6372a0265a Fix confine mode dropdown becoming visible again after filtering
Changes from a hidden to a disabled state, with a tooltip explaining
why.

Closes #11851.
2021-03-02 17:44:58 +09:00
Bartłomiej Dach
52e81385a6 Fix restore default button mutating transforms during load 2021-02-27 11:39:18 +01:00
Dean Herbert
8a97e2e28d Update LocalisedString usages to RomanisedString 2021-02-22 19:01:42 +09:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
Dean Herbert
9fb41dc0b6 Move property to a better place in the class 2021-02-11 16:41:21 +09:00
Dean Herbert
dddd776802 Add the ability for settings items to have tooltips 2021-02-11 16:38:17 +09:00
Dean Herbert
18e6afbec0 Ensure the item is present before trying to select it 2021-01-29 19:17:12 +09:00
Dean Herbert
1ce383fc20 Merge branch 'master' into fix-skin-dropdown-update-crash 2021-01-29 19:16:20 +09:00
Bartłomiej Dach
3b49b7461e Schedule entire operation for safety
Also removes a redundant list copy.
2021-01-19 19:35:53 +01:00
Bartłomiej Dach
78e590d25d Refactor skin sorting method
* Rename to `sortUserSkins` to convey meaning better.
* Sort in-place instead of slicing the list.
* Change to `void` to avoid misleading users that the method returns
  a new list instance.
* Fix typo in comment.
2021-01-19 18:36:42 +01:00
Bartłomiej Dach
b00c6a1d60 Make first non-default skin index a property
The previous code was very brittle - it was not always updating
properly, and seems to have worked either by a carefully crafted set of
circumstances, or just plain coincidence.

Having this be a get-only property avoids potential error in the future
caused by not updating the index properly, at the expense of an added
linear lookup.
2021-01-19 18:31:37 +01:00
rednir
206a0b8bac Fix firstNonDefault staying as -1 2021-01-19 16:55:50 +00:00
rednir
a880b8d21d Satisfy AppVeyor 2021-01-19 16:11:16 +00:00
rednir
b265d2dab4 Remove another whitespace 2021-01-19 14:16:22 +00:00
rednir
1d4c813ff6 Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically 2021-01-19 14:03:31 +00:00
rednir
31e61326e1 Only user skins are sorted 2021-01-19 14:00:17 +00:00
rednir
f1894a8bac fixed itemUpdated() 2021-01-19 12:17:56 +00:00
rednir
0b65c0cd25 Remove whitespace 2021-01-18 20:17:42 +00:00
rednir
da89426a3b Merge branch 'master' of https://github.com/ppy/osu into sort-skins-alphabetically 2021-01-18 20:09:15 +00:00
rednir
7476cb3047 Sort SkinSection in alphabetical order 2021-01-18 19:51:42 +00:00
Dean Herbert
1364de1166
Merge branch 'master' into beatmap-colour-setting 2021-01-18 16:07:46 +09:00
Dean Herbert
5278cad393 Reword setting to make more sense 2021-01-17 22:42:48 +09:00
Dean Herbert
5fd644fc57 Unify variable names 2021-01-17 22:42:48 +09:00
Dean Herbert
b5e784ed42 Fix possibility of crash when selecting a random skin during skin import 2021-01-15 16:34:28 +09:00
Mysfit
5f10bcce02 Added beatmap colour settings checkbox and associated tests. 2021-01-13 00:09:22 -05:00
Salman Ahmed
24c1839739 Add global web setting for allowing explicit content 2021-01-12 11:10:25 +03:00
Dean Herbert
866fb28d6c
Merge pull request #11411 from LavaDesu/feature/discord-presence-toggle
Add ability to toggle discord rich presence
2021-01-07 00:52:38 +09:00
Dean Herbert
15dd7a87a6 Move gameplay preview event binding to LoadComplete 2021-01-06 15:19:12 +09:00
Dean Herbert
d0d2e41b28 Fix display settings binding to configuration bindables in async load 2021-01-05 18:19:28 +09:00
LavaDesu
2e5c67be3f
Add ability to toggle discord rich presence
There are 3 modes: enabled, limited, and disabled.

The limited mode hides identifiable information such as username, rank, and
(if participating in one) multiplayer lobby name.
2021-01-03 10:37:28 +07:00
Dean Herbert
4f02928601 Change sorting to better handle portrait screens 2020-12-22 17:36:56 +09:00
Dean Herbert
3d5783a0ea Improve variable names 2020-12-22 17:34:51 +09:00
Dean Herbert
a1d67f0cf6
Merge branch 'master' into fix-resolution-dropdown 2020-12-22 17:26:53 +09:00
Salman Ahmed
dab5924a63 Fix resolution dropdown not respecting current display changes 2020-12-22 08:02:42 +03:00
Dean Herbert
7c5964fad8 Revert window modes to previous code to correctly apply framework restrictions 2020-12-22 13:04:39 +09:00
Joehu
5b8e35c98c Make settings dropdown abstract 2020-12-19 19:04:14 -08:00
Joehu
b87f89986a Fix selected item not being highlighted on some setting dropdowns 2020-12-19 19:04:13 -08:00
Dean Herbert
26fa010fed Merge branch 'master' into import-screen 2020-12-15 12:37:27 +09:00
ekrctb
f4eb17d398
Update osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
Set mouse confine mode at initialization

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-12-07 16:09:14 +09:00
ekrctb
2469608c10 Fix possible null reference due to bindable change before variable is initialized 2020-12-07 15:19:18 +09:00
Bartłomiej Dach
71edada623 Hide confine setting entirely in fullscreen 2020-12-05 22:15:41 +01:00
PercyDan
60d8102a77
Merge branch 'master' into import-screen 2020-12-04 21:20:14 +08:00
Bartłomiej Dach
7fd385efe6 Remove unused using directive 2020-12-02 20:01:58 +01:00
Leon Gebler
a2a10d4e13 Don't use nameof(MouseHandler) 2020-12-02 19:45:59 +01:00
Leon Gebler
bbde1f6b9c Fix MouseHandler not being ignored when raw input is enabled 2020-12-02 18:56:59 +01:00
Dean Herbert
285e62be9a Bring code in line with SDL2 defaults 2020-12-01 17:47:07 +09:00
Dean Herbert
965cc1f511 Remove unnecessary usings #2 2020-11-30 17:57:25 +09:00
Dean Herbert
fe48b2279c Adjust various paddings and spacings in settings to make them easier to visually parse 2020-11-30 17:50:35 +09:00
Dean Herbert
a3dd22f5c2 Merge branch 'master' into settings-remove-transparency 2020-11-30 17:50:26 +09:00
Dean Herbert
bf2c6dc241 Remove unused usings rider couldn't see 2020-11-30 17:49:55 +09:00
Dean Herbert
a4e061cb11 Remove semi-transparent backgrounds from settings and notifications overlays
I tried also updating the colours to the "new" versions from designs but
they don't match due to colour profile differences (so I'm not yet sure
if they are correct or not) and also don't look great without all the UI
elements also being updated.
2020-11-30 17:19:55 +09:00
Dean Herbert
4e1e45f3e7 Move hold-to-confirm back to UI section 2020-11-30 16:15:35 +09:00
Dean Herbert
55c8aa5d5f Move menu cursor size to UI section 2020-11-30 16:14:15 +09:00
Bartłomiej Dach
e0a84ff1dc Move hold-to-confirm setting back to gameplay section 2020-11-29 22:07:34 +01:00
Bartłomiej Dach
a5c4a8d2e9 Create "User Interface" settings section 2020-11-29 22:07:33 +01:00
PercyDan
579e61eab9
Allow null 2020-11-28 16:31:24 +08:00
PercyDan54
9a3dd12f30
Move to debug settings 2020-11-18 18:15:56 +08:00
Bartłomiej Dach
610ed99ae3 Add null checks to unguarded resolved-as-null fields 2020-11-14 14:52:58 +01:00
Dean Herbert
a2c81a3a52 Add back setting to toggle "always play first combo break" 2020-11-13 13:42:00 +09:00
Dean Herbert
8d38d9cc93 Add hotkey to select random skin 2020-11-11 13:05:03 +09:00
Dean Herbert
6674628bc7 Only include user skins in random choices 2020-11-11 12:03:38 +09:00
Dean Herbert
6b548ef5e4 Split out SkinInfo ID constants and fix random logic 2020-11-11 11:54:40 +09:00
Dean Herbert
a5e13e4d2c Merge branch 'master' into shuffle-skin 2020-11-11 11:34:48 +09:00
Dean Herbert
f0b80d245e Merge branch 'master' into spectator-listing 2020-10-31 16:22:49 +09:00
Max Hübner
4e3fb615d2 Rename "SeasonalBackgrounds" to "SeasonalBackgroundMode" 2020-10-30 15:54:10 +01:00
Max Hübner
76c0a790b4 Add separate Seasonal Backgrounds setting (Always, Sometimes, Never) 2020-10-29 17:28:04 +01:00