1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 17:32:55 +08:00
Commit Graph

556 Commits

Author SHA1 Message Date
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
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
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
Dean Herbert
93fd913876 Add setting to allow automatically downloading during a spectating session 2020-10-28 19:43:06 +09:00
Dean Herbert
9753dab93b Remove IOnlineComponent and change existing components to use bindable flow 2020-10-22 14:19:12 +09:00
Dean Herbert
8273715bde
Merge pull request #9484 from FlashyReese/visible-playfield-boundary 2020-10-20 19:43:41 +09:00
Dean Herbert
80b1f816c7 Merge branch 'master' into hide-hud-during-break-time 2020-10-20 14:19:04 +09:00
Bartłomiej Dach
bca0539735 Move setting to osu! ruleset subsection 2020-10-19 21:05:21 +02:00
Bartłomiej Dach
053c7a69a6 Fix code style issues & compilation failures 2020-10-19 20:22:48 +02:00
Dean Herbert
22bde43106
Merge branch 'master' into visible-playfield-boundary 2020-10-19 18:05:28 +09:00
Dean Herbert
e3b47083fc Add "scoring" as keyword to more easily find score display mode setting 2020-10-19 14:05:41 +09:00
Bartłomiej Dach
c867fb4985
Merge branch 'master' into update-check-improvements 2020-10-08 21:32:26 +02:00
Shane Woolcock
ec12a21088 Merge branch 'master' into confine-during-gameplay
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
2020-10-07 11:07:00 +10:30
Dean Herbert
b2dad67ade Fix unresolvable dependency in settings test scene 2020-10-06 21:28:59 +09:00
Dean Herbert
e8b34ba4ac
Fix incorrectly committed testing change 2020-10-06 20:57:39 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dean Herbert
22b0105d62 Show a notification if checking for updates via button and there are none available 2020-10-06 13:00:02 +09:00
Shane Woolcock
4b6f893408 Merge branch 'master' into confine-during-gameplay
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Screens/Play/Player.cs
2020-10-05 10:23:37 +10:30
Dean Herbert
61e62929ee Apply changes in line with framework event logic update 2020-10-01 13:06:01 +09:00
Dean Herbert
937d5870b3 Add a basic file selector with extension filtering support 2020-09-24 20:54:25 +09:00
smoogipoo
1a023d2c88 Fix a few more tests 2020-09-09 16:33:48 +09:00
smoogipoo
4ddf5f054b Rename BeatmapCollectionManager -> CollectionManager 2020-09-09 15:31:08 +09:00
smoogipoo
06328e0000 Add import/deletion progress notifications 2020-09-08 17:59:27 +09:00
smoogipoo
6cc4517600 Merge branch 'master' into collection-database 2020-09-07 20:03:11 +09:00
Yao Chung Hu
96f39dd350 Merge remote-tracking branch 'upstream/master' into visible-playfield-boundary 2020-09-05 01:50:13 -05:00
smoogipoo
345fb9d8e0 Rename classes 2020-09-05 03:55:43 +09:00
Dean Herbert
ab057e6c65 Remove unnecessary string interpolation 2020-09-04 16:28:35 +09:00
Dean Herbert
644f3375ac Also catch exceptions in the construction call 2020-09-04 16:28:19 +09:00
Dean Herbert
a15653c77c Fix potential hard crash if ruleset settings fail to construct 2020-09-04 16:15:57 +09:00
smoogipoo
a56f9d6770 Implement collection import 2020-09-03 00:08:33 +09:00
Dean Herbert
d45a1521a1 Update BindableList usages 2020-09-01 11:56:23 +09:00
Shane Woolcock
322d179076 Replace settings item with osu! confine cursor mode 2020-08-16 11:04:28 +09:30
Salman Ahmed
2190e6443a Apply height constraints to all settings dropdown 2020-08-01 10:02:46 +03:00
Dean Herbert
dfcd26be2d
Merge pull request #9439 from Game4all/gameplay-disable-winkey 2020-07-24 19:34:48 +09:00
Dean Herbert
fea6389f69 Hide HUD elements during break time by default 2020-07-22 12:41:06 +09:00
Andrei Zavatski
81d95f8584 Implement UserBrickPanel component 2020-07-18 20:24:38 +03:00
Yao Chung Hu
d40f209f4b Move Playfield Border to OsuPlayfield Ruleset 2020-07-10 07:36:21 -05:00
Yao Chung Hu
321815f535 Add playfield bounds box with toggle and dim slider 2020-07-09 14:01:28 -05:00
Lucas A
022e4b6335 Apply review suggestions. 2020-07-06 11:15:56 +02:00
Lucas A
641ea5b950 Make the disabling of the win key during gameplay a toggleable setting. 2020-06-30 13:12:33 +02:00
Dean Herbert
97067976f7 Add null check 2020-06-15 22:23:06 +09:00
Dean Herbert
53b7057ee0 Don't show update button when updates are not feasible 2020-06-15 22:19:11 +09:00
Dean Herbert
4f809767a5 Disable button while update check is in progress 2020-06-12 18:36:36 +09:00
Craftplacer
101604e741 Redesign classes and generally improve code 2020-06-08 00:39:33 +02:00
Craftplacer
e95ffcb528 Merge remote-tracking branch 'upstream/master' into update-button 2020-06-07 22:51:03 +02:00
Craftplacer
4e56981554 Merge remote-tracking branch 'upstream/master' into update-button
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
2020-06-07 22:43:53 +02:00
Dean Herbert
f989f1aa00 Change event flow to avoid firing store delete events on update 2020-05-27 16:08:47 +09:00
Dean Herbert
8ab65e4c5d Move implementation into own class 2020-05-24 23:15:24 +09:00
Dean Herbert
c071fe6140 Add the ability to export skins 2020-05-24 13:44:11 +09:00
Dean Herbert
052ad79fc6 Convert dangerous events to IBindables 2020-05-19 16:44:22 +09:00
Dan Balasescu
533010f168
Merge branch 'master' into avoid-host-disable 2020-05-17 15:59:39 +09:00
Dean Herbert
9d3df14179 Remove unused variable 2020-05-16 11:03:27 +09:00
Dean Herbert
c47f02c3b7 Update second instance of disabling bindable 2020-05-16 08:24:02 +09:00
Dean Herbert
aec2520ef4 Avoid disabling a host-level bindable from osu! code 2020-05-15 17:31:06 +09:00
Dean Herbert
155e918ca3 Remove unused parameter 2020-05-14 21:40:28 +09:00
Dean Herbert
42f446faa9 Fix remaining test failure 2020-05-14 21:10:04 +09:00
Dean Herbert
a582611647 Add test coverage 2020-05-14 19:05:35 +09:00
Dean Herbert
4e4a779d68 Improve overall UI 2020-05-14 17:41:55 +09:00
Dean Herbert
0b73063a89 Add basic (working) migration UI 2020-05-14 17:41:55 +09:00
Craftplacer
0d6f531183 Merge branch 'update-button' of https://github.com/Craftplacer/osu into update-button 2020-05-08 02:56:33 +02:00
Craftplacer
ebd1df8c28 Change property name to CanCheckForUpdate 2020-05-08 02:50:58 +02:00
Craftplacer
7f61f27be1
Use null-conditional operator when checking against UpdateManager
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-05-08 02:33:12 +02:00
Craftplacer
e6ad28a1cb Use property instead of type checking 2020-05-08 02:09:37 +02:00
Craftplacer
a7792070bc Final changes to DI fields and values 2020-05-08 01:08:17 +02:00
Craftplacer
477bd7fa61 Change to Resolved attribute 2020-05-08 00:35:27 +02:00
Craftplacer
72b6bb25a5 Allow nulls and hide if missing dependencies 2020-05-08 00:33:33 +02:00
Craftplacer
92872496b8 Convert to method groups
because Inspector said so.
2020-05-07 23:27:28 +02:00
Craftplacer
c025814f40 Finalize changes 2020-05-07 23:04:18 +02:00
Craftplacer
836efe3f7c Initial commit 2020-05-07 08:07:22 +02:00
Shane Woolcock
9477a5373c
Merge branch 'master' into display-modes 2020-04-28 12:04:20 +09:30
Bartłomiej Dach
a436f8e6d4 Trim other leftover RelativeSizeAxes 2020-04-26 22:54:01 +02:00
Lucas A
801968ed51 Remove un-needed RelativeSizeAxes specifications. 2020-04-26 21:17:40 +02:00
Lucas A
a756486a4d Make settings section icons actual drawables. 2020-04-25 20:35:46 +02:00
Dan Balasescu
ac8a3efc46
Merge branch 'master' into low-hp-red-layer 2020-04-14 14:47:01 +09:00
Endrik Tombak
d9c91fb943 Merge branch 'master' of https://github.com/ppy/osu into no-video-option
 Conflicts:
	osu.Game/Overlays/Direct/PanelDownloadButton.cs
2020-04-13 17:40:28 +03:00
Endrik Tombak
633b969017 Apply review suggestions 2020-04-12 21:57:35 +03:00
Endrik Tombak
df76636ffc Implement "prefer no video" option 2020-04-11 14:08:16 +03:00
Fire937
2201e9b4ae Add stereo shifted hitsound playback support
There is now a setting in the general settings called "Positional
hitsounds". If the setting is enabled, the hitsounds playback will be
shifted according to their position on the beatmap.
2020-04-09 18:12:15 +02:00
Dean Herbert
52c9762651 Remove pointless keywords 2020-04-09 14:36:04 +09:00
Shane Woolcock
2fec8b7b85 Use DisplayModes rather than AvailableResolutions 2020-04-05 13:01:10 +09:30
Lucas A
ab01111c36 Fix merge conflicts. 2020-03-30 17:39:11 +02:00
Lucas A
3cae0cedee Add a game setting to disable the layer 2020-03-30 12:59:39 +02:00
Dean Herbert
5be8934c8c
Merge pull request #8407 from peppy/disable-raw-input
Disable raw input toggle on all but windows
2020-03-27 21:10:02 +09:00
Dean Herbert
997ce397ef Disable raw input toggle on all but windows 2020-03-23 12:48:05 +09:00
Dean Herbert
729e006c3a
Merge branch 'master' into video-offset 2020-03-21 20:03:46 +09:00
Joehu
f7ea20a926 Limit font weight to bold 2020-03-16 16:32:25 -07:00
voidedWarranties
c27751050b Switch back to strings and update setting labels 2020-03-12 23:29:11 -07:00
voidedWarranties
48282dea8b Remove individual setting to disable videos, fix tests 2020-03-07 22:08:38 -08:00
Andrei Zavatski
6631b07442 Refactor to replace existing panels 2020-03-04 14:58:15 +03:00
Dean Herbert
394b88aa65 Add thread mode dropdown 2020-02-28 22:17:45 +09:00
Dean Herbert
4ad2d0cfb6 Remove deprecated debug setting 2020-02-28 22:17:45 +09:00
Dean Herbert
92f6f0207c Rename LoadingAnimation to LoadingSpinner 2020-02-21 15:33:31 +09:00
recapitalverb
ee14a275a2 Make IAPIProvider instances nullable 2020-02-14 22:02:44 +07:00
recapitalverb
10798aeab3 Fix code formatting 2020-02-14 20:30:27 +07:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
unknown
894642d588 add xmldoc and formatting 2020-01-28 18:04:00 +08:00
unknown
aa264cd2a8 allow tooltip to show as percentage as needed 2020-01-28 12:32:30 +08:00
Dean Herbert
bc75290655 Ensure min and max stars are correctly ordered 2020-01-25 00:11:20 +09:00
smoogipoo
d1684a3c92 Duplicate keywords for better UX 2020-01-24 19:50:16 +09:00
smoogipoo
75d0fd0bab Rename class 2020-01-24 19:43:23 +09:00
smoogipoo
2643b6fca3 Add additional keywods 2020-01-24 19:12:48 +09:00
smoogipoo
62fa619ad4 Display "no limit" for maximum stars 2020-01-24 19:08:14 +09:00
Dean Herbert
da65fff48e Merge remote-tracking branch 'upstream/master' into collapse-graph-option 2020-01-24 13:55:42 +09:00
Revel
a86fb2113e fix tooltip capitalization 2020-01-14 14:26:54 -05:00
Joehu
19033e0ef8 Fix user status dropdown having no padding around items 2020-01-10 19:25:33 -08:00
Salman Ahmed
b93bbf81aa Add lighten background during breaks setting 2019-12-10 15:10:35 +03:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
1fd5ed3c0f Change login placeholder text to ask for username 2019-11-25 21:35:25 +09:00
Dean Herbert
d0002cc1c2 Update performance logging setting 2019-11-22 19:50:30 +09:00
Dean Herbert
ab42fac43a Improve naming 2019-11-22 02:38:31 +09:00
Dean Herbert
a97d760afa Merge remote-tracking branch 'upstream/master' into menu-background-modes 2019-11-22 02:23:02 +09:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert
d7cb23a909 Remove redundant keyword 2019-11-21 22:51:00 +09:00
Dean Herbert
8b1fb2d5a1 Standardise keyword specifications 2019-11-21 22:35:15 +09:00
Andrei Zavatski
f066d8434c Apply suggestions 2019-11-21 00:26:39 +03:00
Andrei Zavatski
6b3010535f Simplify Keywords usage for SettingsSubsection 2019-11-20 21:03:31 +03:00
Andrei Zavatski
f3d9abc84a Capitalize Bar for consistency 2019-11-20 19:57:02 +03:00
Andrei Zavatski
e820ddd3e8 Implement settings keywords 2019-11-20 19:27:34 +03:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Ganendra Afrasya
5c2917d303 Place sign in button inside ShakeContainer 2019-10-30 00:50:04 +07:00
Roman Kapustin
e00992dfd8 Remove FollowPlayback setting 2019-10-07 19:44:22 +03:00
Roman Kapustin
eda4a27b45 Move FollowPlayback setting to User Interface subsection 2019-10-06 15:06:25 +03:00
Roman Kapustin
bdea75b995 Autoscroll playlist on song change 2019-10-05 23:53:05 +03:00
HDragonHR
faf8fe132e Change bindable int to float 2019-10-02 12:26:46 +08:00
LeNitrous
b8d147a3b4 introduce main menu background modes 2019-09-24 17:42:06 +08:00