1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 17:32:54 +08:00
Commit Graph

491 Commits

Author SHA1 Message Date
Bartłomiej Dach
e4b4c3c5c4
Merge branch 'master' into offset-ui-improvements 2022-03-05 16:10:18 +01:00
Bartłomiej Dach
346cec3577
Merge branch 'add-offset-adjust-tooltip-text' into combine-time-slider-implementation 2022-03-05 14:58:56 +01:00
Dean Herbert
c1c9482077 Add note about how global audio offset is currently applied 2022-03-04 12:44:02 +09:00
Dean Herbert
8115a4bb8f Fix potential crash in tests when attempting to lookup key bindings in cases the lookup is not available 2022-03-04 12:44:02 +09:00
Dean Herbert
ac914878b8 Move default function specifications to OsuConfigManager
This ensures that running tests in release configuration will not fail
due to the same issue being fixed in this PR.
2022-03-04 12:31:58 +09:00
Dean Herbert
7854a0a913 Use double instead of float for UIHoldActivationDelay configuration value
All times use double, so let's also use double here.
2022-03-04 12:22:56 +09:00
Dean Herbert
f09a4e9c5b Fix potential crash in tests when attempting to lookup key bindings in cases the lookup is not available 2022-03-03 16:29:37 +09:00
Dean Herbert
6eb2c28e41 Rename RealmContextFactory to RealmAccess 2022-01-24 20:38:07 +09:00
Dean Herbert
623d6d6d2d Add migration of positional hitsounds setting to new level based setting 2022-01-03 12:46:20 +09:00
Dean Herbert
5dd024aab7 Remove outdated settings migration 2022-01-03 12:46:02 +09:00
Dean Herbert
bb54f438aa Merge branch 'master' into positional-sounds-strength-adjustment 2022-01-03 12:40:56 +09:00
Bartłomiej Dach
979624160f
Do not reset last hover sound playback time on inactivity 2021-12-21 08:47:41 +01:00
Bartłomiej Dach
cd10af633c
Remove unused private method 2021-12-21 08:47:26 +01:00
Dean Herbert
981158ed88 Rename method and simplify SetDefault calling code 2021-12-21 15:34:32 +09:00
dekrain
9344897542
Split session statics reset method to prevent unloading seasonal backgrounds while idle 2021-12-20 16:51:51 +01:00
Dean Herbert
8d9c37a825 Merge branch 'master' into primary-key-consistency 2021-12-08 21:34:38 +09:00
Dean Herbert
fb2310f826 Specify config file default as DEFAULT_SKIN's guid 2021-12-01 12:45:47 +09:00
Dean Herbert
3db5646fa8 Create Guid constants for system skins (and store skin choice to configuration as guid) 2021-11-29 18:28:25 +09:00
mk-56
c3fb793762 Fixed the problems that were brought up and deleted the old bind logic 2021-11-28 14:06:53 +01:00
mk-56
e83115ad5e Binding logic fix, nullification of unnecessary path 2021-11-28 03:25:11 +01:00
mk-56
eaa464e548 Initial implementation of adjustable positional hitobject audio strength 2021-11-28 02:58:08 +01:00
Dean Herbert
f264b128c2 Merge branch 'master' into realm-ruleset-setting-short-name 2021-11-23 14:55:36 +09:00
Dean Herbert
329bae50b0 Switch realm ruleset configuration to use ruleset's ShortName as key 2021-11-22 18:52:00 +09:00
Dean Herbert
f1926c6d27 Store preferred ruleset to configuration using ShortName instead of ID 2021-11-22 17:45:31 +09:00
Dean Herbert
eecf6ad558 Add IsManaged helper method to EF classes to match realm implementation 2021-11-19 21:56:06 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Joseph Madamba
1ae6621c85 Fix a missed toast shortcut string not localising correctly 2021-10-22 15:45:48 -07: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
59202d27c7 Add some missing labels 2021-10-12 15:09:59 +09:00
Joseph Madamba
4fc84e71cd Localise more toast related strings 2021-10-11 01:02:26 -07:00
Joseph Madamba
4b01c23c11 Track ui scale setting 2021-10-10 19:55:02 -07:00
Joseph Madamba
545cfc7bf1 Localise tracked setting toasts 2021-10-10 19:35:25 -07:00
Dean Herbert
4f1db5af40 Attach migration memo to DatabasedSetting class for visibility 2021-09-15 17:25:07 +09:00
Dean Herbert
a1d325cb22 Mark key and value non-nullable (at realm end) and simplify Value logic 2021-09-15 17:16:05 +09:00
Dean Herbert
a150fb2996 Add nullability directive and make variant non-nullable 2021-09-15 17:16:05 +09:00
Dean Herbert
dcfe9c67e3 Make ruleset id non-nullable 2021-09-15 17:12:04 +09:00
Dean Herbert
80ecf81be3 Rename all databased setting classes to be specific to rulesets for now 2021-09-15 17:12:04 +09:00
Dean Herbert
520e550764 Bring back SettingsStore to avoid changing ruleset API for now
Also fixes some remaining test failures due to locally constructed
rulesets that are not being tracked by the game.
2021-09-15 17:12:02 +09:00
Dean Herbert
ac377a2e3c Remove unused SettingsStore 2021-09-15 16:31:13 +09:00
Dean Herbert
a2f1752344 Make settings works with current caching structure
Will likely pull out that `RulesetConfigCache` next, but this is an
"everything works" state.
2021-09-15 16:31:13 +09:00
Dean Herbert
187c557ea8 Begin migrating settings implementation across to realm 2021-09-15 16:22:14 +09:00
Dean Herbert
41a2e6eeeb Fix cache not actually caching anything 2021-09-09 14:56:39 +09:00
Dean Herbert
a622a0b660 Use a more traditional method of caching 2021-09-08 23:18:17 +09:00
Dean Herbert
81c9d831f4 Cache reflection portion of SettingSource lookups
Fixes the mod-related overhead portion of https://github.com/ppy/osu/issues/14638. There's still a significant performance issue that will be addressed separately.
2021-09-08 13:26:11 +09:00
Dean Herbert
71fab416d8 Add a note against OsuSetting 2021-08-16 16:59:59 +09:00
Dean Herbert
fc89f2bac4 Revert "Rename element in OsuSettings enum"
This reverts commit c2bbe17562.
2021-08-16 16:56:48 +09:00
kj415j45
c2bbe17562
Rename element in OsuSettings enum
`ShowProgressGraph` -> `ShowDifficultyGraph`
2021-08-14 22:35:15 +08:00
Bartłomiej Dach
50c27d2635 Update usages of IHasTooltip in line with framework localisation changes 2021-06-25 19:10:04 +02:00
aitani9
93edb25ace Override CreateMenu instead of using a property 2021-06-24 14:32:43 -07:00
Dean Herbert
bae42a8908 Add inline comment explaining why the height is set lower 2021-06-23 14:07:37 +09:00
aitani9
59928a7d91 Decrease the max height of dropdown menus in mod settings 2021-06-22 13:32:45 -07:00
Dean Herbert
17347401cf Remove unused RankingType enum
We have `BeatmapLeaderboardScope` instead.
2021-06-14 11:27:46 +09:00
Dean Herbert
20759657de Rename configuration variables and refactor lots more 2021-06-11 16:37:31 +09:00
Craftplacer
39c3b08fc7
Merge remote-tracking branch 'upstream/master' into chat-mention 2021-06-05 11:18:06 +02:00
Nathan Alo
5b436ee436 add beatmap with storyboard source 2021-06-02 15:50:33 +08:00
Dean Herbert
88bdd8a7b7 Update some out of date code pieces 2021-05-26 16:01:21 +09:00
Dean Herbert
52ca2f4797 Merge branch 'master' into chat-mention 2021-05-26 16:00:26 +09:00
Dean Herbert
5acb708939 Remove customisation of hit error via standard settings 2021-05-18 15:50:50 +09:00
smoogipoo
05bd6ee50c Add back ctor doc 2021-04-28 03:54:42 +09:00
smoogipoo
04454062b7 Fix up xmldoc 2021-04-28 03:52:59 +09:00
smoogipoo
4e3ee77396 Add support for custom controls to SettingSourceAttribute 2021-04-28 02:51:24 +09:00
Dean Herbert
9d8f0c854d Setup configuration item for editor hit animations 2021-04-21 18:05:40 +09:00
Dean Herbert
2b6caf9b65 Fix duplicate code in setting default logic 2021-04-19 11:25:43 +09:00
jvyden
6773162f17
Implicitly set defaults when resetting values 2021-04-17 08:47:27 -04:00
jvyden
a4e3e53a63
Revert back to hardcoded SessionStatics reset values 2021-04-16 06:34:57 -04:00
jvyden
ec0211809f
Apply peppy's suggestions 2021-04-16 05:53:27 -04:00
jvyden
7d23973ef8
Reset SessionStatics on activity
Closes #12424
2021-04-16 05:01:58 -04:00
Dean Herbert
5b06a68b93
Merge pull request #12330 from Cublibre/master
Send a warning notification if device is unplugged and at low battery
2021-04-15 19:21:04 +09:00
Dean Herbert
b41e3a2e7a Remove unused using statement 2021-04-13 17:38:32 +09:00
Dean Herbert
0932daeaa8 Force the new default on update 2021-04-13 16:50:03 +09:00
Dean Herbert
5a06db8a11 Change default editor waveform opacity to 25%
The previous setting felt way too high.
2021-04-13 16:48:06 +09:00
Dean Herbert
b5954a55ad Remove empty <returns> xmldoc 2021-04-12 17:46:14 +09:00
Christine Chen
08311abc5e Remove setters, cache CreatePowerStatus() and use a dummy LocalPowerStatus class in test scene 2021-04-10 00:00:21 -04:00
Christine Chen
0a6baf670e Send a warning notification if device is unplugged and low battery
- Uses Xamarin.Essentials in osu.Game.PlayerLoader to check battery level
- Encapsulated battery checking in the public BatteryManager class so battery level and plugged in status can be accessed and edited in TestPlayerLoader
- When checking battery level, catch NotImplementedException thrown by Xamarin.Essentials.Battery on non-mobile platforms
- Added visual unit tests for battery notification
  To mock battery status and level, we had to define a batteryManager object in TestPlayerLoader and add a new function ResetPlayerWithBattery()

Co-Authored-By: Marlina José <marlina@umich.edu>
2021-04-07 15:56:50 -04:00
Dean Herbert
c694deb7d6 Revert changes to SettingsSourceAttribute class 2021-03-18 21:16:50 +09:00
Dean Herbert
e0c0107461 Merge branch 'update-config-usages' into input-handler-configuration 2021-03-17 18:08:13 +09:00
smoogipoo
7fa5fd5647 Update usages of config with framework changes 2021-03-17 16:10:16 +09:00
Dean Herbert
8635abbc4a Add the ability to not get controls for disabled bindables 2021-03-12 18:37:55 +09:00
Dean Herbert
4374e7da81 Convert bindable names to human readable sentences 2021-03-12 18:34:22 +09:00
Dean Herbert
a33ffd56b8 Allow CreateSettingsControls to work with all bindables in target class 2021-03-12 18:34:22 +09:00
Bartłomiej Dach
7e17c5ab71 Trim yet another array copy 2021-02-27 15:46:18 +01:00
Bartłomiej Dach
1e56d2cbba Make SettingSourceAttribute implement IComparable 2021-02-27 15:30:08 +01:00
Bartłomiej Dach
528de5869e Fix multiple enumerations when ordering setting sources
This was not spotted previously, because the base `Attribute` overrides
`Equals()` to have semantics similar to structs (per-field equality) by
using reflection. That masked the issue when strings were used, and
migrating to `LocalisableString` revealed it, as that struct's
implementation of equality currently uses instance checks.

Whether `LocalisableString.Equals()` is the correct implementation may
still be up for discussion, but allowing multiple enumeration is wrong
anyway, since the underlying enumerables are live (one especially is a
yield iterator, causing new object instances to be allocated).
2021-02-27 14:58:01 +01:00
Dean Herbert
3802cb29a4 Fix failing tests doing reference comparisons between string and LocalisedString 2021-02-25 17:49:54 +09:00
Salman Ahmed
a01896a652 Fix misordered hit error in score meter types 2021-02-18 13:04:22 +03:00
Dan Balasescu
ca091431f4
Merge pull request #11739 from peppy/settings-item-tooltips
Display descriptions in tooltips of mod settings adjustments
2021-02-12 00:18:16 +09:00
Dean Herbert
dddd776802 Add the ability for settings items to have tooltips 2021-02-11 16:38:17 +09:00
smoogipoo
169acb42de Xmldoc + cleanup 2021-02-10 20:12:29 +09:00
smoogipoo
4a405bb859 Split ModSettingChangeTracker into separate file 2021-02-10 20:04:16 +09:00
smoogipoo
7827e991b2 Also clear event on dispose 2021-02-10 19:43:39 +09:00
smoogipoo
393cd6c74a Add helper class for tracking changes to mod settings 2021-02-10 19:40:07 +09:00
Dean Herbert
1364de1166
Merge branch 'master' into beatmap-colour-setting 2021-01-18 16:07:46 +09:00
Dean Herbert
5fd644fc57 Unify variable names 2021-01-17 22:42:48 +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
Bartłomiej Dach
d507a08951 Start with null last hover playback time 2021-01-08 18:16:03 +01:00
Dean Herbert
11801d61c1 Use nullable doubule to better represent initial playback case 2021-01-08 14:05:22 +09:00
Dean Herbert
8f52a83b29 Share hover sound debounce across all instances via SessionStatics 2021-01-07 18:47:20 +09:00
LavaDesu
7c9f345cd2
Use better naming for DiscordRichPresenceMode 2021-01-03 16:46:25 +07: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
eb795a2127 Move all endpoint information to a configuration class 2020-12-24 17:58:38 +09:00
Ryan Zmuda
3994cf082d add keybind for in game overlay 2020-11-29 20:59:02 -05:00
Joehu
1fd4b04767 Just set music shortcut text locally 2020-11-23 20:43:46 -08:00
Joehu
52f5473cc0 Set global action as a parameter in toast 2020-11-23 15:13:58 -08:00
Joehu
2071cba944 Add music bindings to on screen display 2020-11-13 13:16:36 -08:00
Dean Herbert
8d38d9cc93 Add hotkey to select random skin 2020-11-11 13:05:03 +09:00
Dean Herbert
6014751e29 Add the ability for the game OSD to display user bindings
Adds binding display for mouse button toggle / HUD toggle keys.

- [ ] Depends on #10786 for ease-of-merge
2020-11-11 12:56:10 +09:00
Dean Herbert
9caa56c64f Display skin changes via on-screen display overlay 2020-11-11 12:19:01 +09:00
Dean Herbert
9dc2ca666d
Merge branch 'master' into spectator-listing 2020-11-04 09:30:15 +09:00
Dean Herbert
7e4314684b Add editor waveform opacity selection to menu 2020-11-03 16:01:14 +09:00
Dean Herbert
f0b80d245e Merge branch 'master' into spectator-listing 2020-10-31 16:22:49 +09:00
Dean Herbert
a088151e58 Merge branch 'spectator-replay-watcher' into spectator-listing 2020-10-31 16:22:10 +09:00
Bartłomiej Dach
cf0e8e0a62 Document nullability of seasonal backgrounds 2020-10-30 20:00:59 +01:00
Bartłomiej Dach
aeab2be5d1 Add xmldoc to SeasonalBackgroundMode 2020-10-30 19:56:52 +01:00
Bartłomiej Dach
20c27c6943 Rename lookup & field 2020-10-30 19:55:22 +01:00
Max Hübner
f6eb5680ec Save full api response in SessionStatics 2020-10-30 16:43:18 +01:00
Max Hübner
4e3fb615d2 Rename "SeasonalBackgrounds" to "SeasonalBackgroundMode" 2020-10-30 15:54:10 +01:00
Dean Herbert
1db8dfd03e
Merge branch 'master' into seasonal-backgrounds 2020-10-30 22:53:51 +09:00
Max Hübner
f27ce7521d Make "Sometimes" setting depend on season end date, rather than chance 2020-10-30 10:27:43 +01:00
Dean Herbert
c72017a7db Remove "hide during breaks" option
Probably wouldn't be used anyway.
2020-10-30 13:49:45 +09:00
Dean Herbert
18f92818da Show current HUD visibility mode as a tracked setting 2020-10-30 13:09:13 +09:00
Max Hübner
907e1921c7 Make SeasonalBackgroundLoader read from SessionStatics 2020-10-29 17:31:42 +01:00
Max Hübner
76c0a790b4 Add separate Seasonal Backgrounds setting (Always, Sometimes, Never) 2020-10-29 17:28:04 +01:00
Max Hübner
7d523fee28 Revert "Set BackgroundSource.Seasonal as default setting"
This reverts commit cdb2d23578.
2020-10-29 14:31:07 +01:00
Max Hübner
0c540537c9 Revert "Add BackgroundSource.Seasonal"
This reverts commit 2871001cc2.
2020-10-29 14:30:50 +01:00
Dean Herbert
93fd913876 Add setting to allow automatically downloading during a spectating session 2020-10-28 19:43:06 +09:00
Max Hübner
cdb2d23578 Set BackgroundSource.Seasonal as default setting 2020-10-22 18:23:03 +02:00
Max Hübner
2871001cc2 Add BackgroundSource.Seasonal 2020-10-22 18:21:28 +02:00
Dean Herbert
4f8a755518 Add "hide during gameplay" mode 2020-10-20 14:20:44 +09:00
Dean Herbert
024009e174 Change default to "always visible" 2020-10-20 14:19:15 +09:00
Dean Herbert
80b1f816c7 Merge branch 'master' into hide-hud-during-break-time 2020-10-20 14:19:04 +09:00
Dean Herbert
70806deba1 Add support for bottom-anchored hit error display 2020-10-15 19:14:02 +09: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
Shane Woolcock
478f2dec96 Maintain the current gameplay state in OsuGame 2020-10-06 22:39:35 +10:30
Shane Woolcock
1877312a91 Rename DuringGameplay 2020-10-06 20:27:35 +10:30
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +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
Joehu
c6386ea605 Remember leaderboard mods filter selection in song select 2020-09-15 21:53:35 -07:00
Dean Herbert
4680728b9c Merge branch 'master' into update-dcc-exclusions 2020-09-07 18:01:44 +09:00
smoogipoo
1143d5d992 Update class exclusion for dynamic compilation 2020-09-04 20:41:08 +09:00
Lucas A
589d4eeb52 Remove setting. 2020-08-16 17:18:40 +02:00
Shane Woolcock
322d179076 Replace settings item with osu! confine cursor mode 2020-08-16 11:04:28 +09:30
Lucas A
4522564668 Add GameplayDisableOverlays setting. 2020-08-01 19:50:57 +02:00
Dean Herbert
dfcd26be2d
Merge pull request #9439 from Game4all/gameplay-disable-winkey 2020-07-24 19:34:48 +09:00
Lucas A
4102dae999 Revert commit 939441ae 2020-07-23 11:56:46 +02:00
Dean Herbert
fea6389f69 Hide HUD elements during break time by default 2020-07-22 12:41:06 +09:00
Lucas A
939441ae40 Disable the windows key only when in gameplay. 2020-07-16 14:50:11 +02:00