1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 13:17:26 +08:00
Commit Graph

484 Commits

Author SHA1 Message Date
Roman Kapustin
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
smoogipoo
aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
smoogipoo
f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
Roman Kapustin
b4809f4417 External link warning code cleanup 2018-11-01 23:52:07 +03:00
Roman Kapustin
805f8d98c4 Implement warn about opening external links option 2018-10-22 23:57:37 +03:00
Hanamuke
e7d78b94ae Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
Hanamuke
e3cc25a96a Implement ConstantScrollingSpeedVisualiser 2018-09-18 20:21:10 +02:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
smoogipoo
22e8a0bb6e Make ruleset config manager variants nullable 2018-06-11 13:13:36 +09:00
Dean Herbert
0b4f5af52e Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
smoogipoo
d4ada3000c Add keybind to disable mouse buttons 2018-05-02 19:37:47 +09:00
Dean Herbert
76e58a51b9 Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting 2018-04-25 17:28:21 +09:00
Dean Herbert
4f53185d43 Invert logic to match existing toggles 2018-04-25 16:18:55 +09:00
TocoToucan
1ce38c7fc6 Visual settings: Ignore beatmap hitsounds 2018-04-20 18:30:41 +03:00
TocoToucan
606e088713 Visual settings: Ignore beatmap skin 2018-04-20 18:17:57 +03:00
Dean Herbert
e395a47112 Changes to naming and text 2018-04-18 19:47:13 +09:00
Dean Herbert
bd834dd487 Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling 2018-04-18 19:46:59 +09:00
smoogipoo
733f70cbd5 Merge remote-tracking branch 'origin/master' into instant-hide-screenshot 2018-04-13 21:13:09 +09:00
Dean Herbert
81f0649e44 Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling 2018-04-13 19:50:44 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
tgi74000
e3cd0ef200 Add right click scrolling in song select (and its option) 2018-04-13 11:09:49 +02:00
TocoToucan
dd5cc59250 Introduce 'Capture menu cursor' setting 2018-03-23 22:53:06 +03:00
TocoToucan
25f738c4ae Do not support bmp screenshots 2018-03-14 12:57:55 +03:00
Vidalee
eed0f3a1de Added setting to not hide the first object in Hidden mod 2018-03-11 21:02:14 +01:00
TocoToucan
e6c22e2287 Taking screenshot support initial commit 2018-03-10 21:59:20 +03:00
Dean Herbert
402d71a8d9 Add user skin setting storage 2018-02-22 16:29:05 +09:00
Dean Herbert
edc3638175 DatabaseWriteUsage 2018-02-12 17:55:11 +09:00
Dean Herbert
335f0d577c Add the ability to duck volume when the game is inactive 2018-01-31 18:16:55 +09:00
Dan Balasescu
81c759f1e1
Make field readonly 2018-01-26 15:17:56 +09:00
Dean Herbert
7a2420ead2 Fix a couple of regressions 2018-01-26 08:21:09 +09:00
Dean Herbert
03154dbc63 Fix incorrect initial migration
Also adds variant to settings
2018-01-25 23:41:03 +09:00
Dean Herbert
53c6526b22 Remove unused code file 2018-01-24 18:04:54 +09:00
Dean Herbert
29e98a58f2 Combine Setting and DatabasedSetting 2018-01-24 17:59:49 +09:00
Dean Herbert
5a00ae36d1 Add database-based configuration for rulesets 2018-01-24 17:45:28 +09:00
smoogipoo
441e8aced5 Better namings for the speed change "algorithms" 2018-01-12 17:18:34 +09:00
smoogipoo
712d586d41 Revert "Add OSD + config value for scroll speed"
This reverts commit a6d8b28221.
2018-01-12 12:28:43 +09:00
smoogipoo
a6d8b28221 Add OSD + config value for scroll speed 2018-01-11 13:40:46 +09:00
smoogipoo
6a5a3b01b2 Fix license headers 2018-01-11 12:39:06 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur 2018-01-09 21:20:05 +09:00
smoogipoo
c4d1922c8b Add scrolling algorithm to global settings 2018-01-08 11:34:37 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
ColdVolcano
044e4d0acd Add blur to background in Player 2017-12-25 19:11:49 -06:00
Dean Herbert
48e53a76b0 Fix incorrect line endings 2017-12-15 14:44:11 +09:00
Dean Herbert
b9298325a3 Rename weird config setting 2017-12-15 14:36:51 +09:00
Dean Herbert
99b00143eb More clean-ups and event bindings 2017-12-15 14:36:51 +09:00
Dean Herbert
473eba9776 Remove precision limitation on chat height to allow pixel-perfect dragging 2017-11-28 12:09:44 +09:00
Dean Herbert
09facdc838 Add a setting to toggle showing converted beatmaps 2017-11-24 18:34:20 +09:00
EVAST9919
4b21c83f35 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-11-10 17:24:26 +03:00
Shane Woolcock
a7c7f7d690 Add precision values to some of the config bindables 2017-11-06 16:58:17 +10:30
EVAST9919
c34cc07fda Remove default bindable from the config manager 2017-10-02 18:09:00 +03:00
Damnae
2c245f4c22 Merge branch 'master' into storyboard_integration
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
#	osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
2017-09-22 12:45:34 +02:00
gabixdev
e8462ac134 Add option to disable cursor rotation. 2017-09-17 00:47:55 +02:00
Damnae
cb8029af9e Add a setting to hide storyboards. 2017-09-15 09:16:56 +02:00
Dean Herbert
9f69aa9082 Show a notification after a successful update
Allows access to the github changelog
2017-08-22 19:41:39 +09:00
John Neijzen
23a7045eef More Clean UP 2017-06-07 20:07:18 +08:00
Dean Herbert
0cb1df35e9 Merge remote-tracking branch 'upstream/master' into ingame_options 2017-06-05 14:53:37 +09:00
Patrick Andersson
94294e4b45 Changed default selection type and added suggestions from PR feedback 2017-06-01 08:54:48 +02:00
Patrick Andersson
1dd85b5986 Add alternative for random beatmap selection
"Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button
2017-05-31 20:11:26 +02:00
EVAST9919
1e029d05a8 Added bindable to adjust playback speed 2017-05-17 16:10:49 +03:00
EVAST9919
e0625a9b30 More overlays and overall fixes 2017-05-17 15:39:26 +03:00
Dean Herbert
e09f1c7c91 Remove AudioDevice from game-level setting
Should be (and is already)  in FrameworkConfig.
2017-05-16 12:59:47 +09:00
Dean Herbert
3b87a938db Merge branch 'master' into cursor_size. 2017-05-15 12:23:49 +09:00
Dean Herbert
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
EVAST9919
ca6df533bd Automatic gameplay cursor size 2017-05-13 03:46:37 +03:00
Dean Herbert
9cf4998701 Make chat resizable via drag, save user set size 2017-05-12 15:36:37 +09:00
Dean Herbert
489f586887 Add FPS display toggling.
Kinda temporary but better than nothing.
2017-05-03 20:34:53 +09:00
Dean Herbert
a036b059e8 Use provided parameters to avoid a second lookup. 2017-05-02 21:40:06 +09:00
Dean Herbert
691742b828 Remove most options which have not yet been implemented. 2017-05-02 19:40:30 +09:00
Dean Herbert
d4045ee2c0 We only have one release stream, so let's unlock it. 2017-05-02 18:40:30 +09:00
Dean Herbert
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
Dean Herbert
bef15fe637 Improve organisation of some options and config code. 2017-05-02 17:45:22 +09:00
Huo Yaoyuan
ad92e6d732 Remove OsuConfig.Language too. 2017-04-27 12:42:56 +08:00
Huo Yaoyuan
cf3e83ca62 Save ShowUnicode in framework config. 2017-04-26 19:48:46 +08:00
Dean Herbert
30e2e7bfe4 Merge branch 'master' into slider-stuff 2017-04-25 19:42:46 +09:00
ColdVolcano
51c577624b Remove BeatmapInfo field 2017-04-24 22:59:33 -05:00
ColdVolcano
1df50adc3a Post-merge fixes (and CodeFactor fixes) 2017-04-24 22:48:25 -05:00
Dean Herbert
6aa6e5eef7 Store and restore the selected details tab at song select. 2017-04-24 19:25:27 +09:00
Jorolf
1d2f19b5a2 change background dim from integer to double 2017-04-22 18:34:03 +02:00
Dean Herbert
5fdc9819cf
Add basic UO support (now called Audio Offset). 2017-04-21 16:20:05 +09:00
smoogipooo
0333e1a050 Remove unused usings. 2017-04-15 05:57:18 +09:00
smoogipooo
6dbc75283c Re-implement config value. 2017-04-15 05:52:58 +09:00
smoogipooo
0a1376c2db Remove PlayMode game-wide. 2017-04-15 05:22:41 +09:00
Dean Herbert
ba03a98992
Add missing config set. 2017-04-10 16:39:10 +09:00
Dean Herbert
fba72b9a9e
Snaking out on by default. 2017-04-07 09:28:13 +09:00
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
Andrey Zavadskiy
c4c8604afd A little change to woke up AppVeyor 2017-04-04 19:06:53 +03:00
Andrey Zavadskiy
009909dd4b Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility 2017-04-04 17:39:53 +03:00
Dean Herbert
7c74951454
Update bindables.
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
Andrey Zavadskiy
d7c39a00b4 Hud Visibility 2017-03-31 16:43:31 +03:00
Andrey Zavadskiy
2d75c60463 Fix checkbox dependency in LoginOptions 2017-03-22 17:21:24 +03:00
Jorolf
82d6129063 renamed CursorSize to MenuCursorSize 2017-03-21 17:16:23 +01:00
Jorolf
8568e1536c Separated menu and gameplay cursor size 2017-03-17 18:40:03 +01:00
Andrey Zavadskiy
cc92459ee1 KeyCounter visibility 2017-03-01 13:22:01 +03:00
Jorolf
8b3477820f Disable mousewheel while playing 2017-02-28 00:08:34 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Jorolf
a48e4a31a7 Parallax Option works now 2017-02-18 21:34:21 +01:00
Dean Herbert
4f9d1a6c39 Visually disable options which aren't yet wired up. 2017-02-14 00:36:50 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
756fd78a88
Fix incorrect line endings. 2017-02-07 13:52:19 +09:00
Andrey Zavadskiy
72bc7f8786 Simplify checking 2017-01-28 17:01:11 +03:00
Andrey Zavadskiy
e25b8bb298 Removed explicit methods 2017-01-28 16:56:05 +03:00
Andrey Zavadskiy
f12a8ace3f Moved Config logic to OsuConfigManager 2017-01-28 13:10:05 +03:00
EVAST9919
ac7feafe9a Merge branch 'master' into login_fix 2017-01-28 11:24:08 +02:00
Dean Herbert
25da8a53dc Fix incorrect configuration retrievals. 2017-01-26 23:08:39 +09:00
Dean Herbert
1853bbdda8 Move window/volume configuration to framework level. 2017-01-25 18:44:51 +09:00
Andrey Zavadskiy
cd3ab33d08 Remove the password field from game.ini 2016-12-23 00:43:43 +03:00
Andrey Zavadskiy
bba4c46ae3 TODO comment and deleted repeating lines 2016-12-21 01:05:10 +03:00
Drew DeVault
9db8e63f83 Make star display min/max a double 2016-12-07 09:42:53 -05:00
Drew DeVault
cf60c52f00 Switch to System.ComponentModel.Description 2016-12-07 09:42:53 -05:00
Drew DeVault
4757a1c433 Wire up enum-backed dropdowns 2016-12-07 09:42:52 -05:00
Drew DeVault
0378de8346 Add DisplayName 2016-12-07 09:42:37 -05:00
Drew DeVault
9daf524120 Add OptionsDropdown<T> and wire up one example 2016-12-07 09:42:37 -05:00
Drew DeVault
3aefa4d6a5 Wire up remaining sliders, except for ints 2016-12-07 09:42:37 -05:00
Thomas Müller
b81bf7085f Add missing licence headers and fixup using statements. 2016-12-03 13:56:35 +01:00
Thomas Müller
c43b47da2a Add option toggles and configuration for snaking in and out sliders. 2016-12-03 13:56:19 +01:00
Dean Herbert
01dc7cb5c2 Thread safety, username saving correctly etc. 2016-11-30 19:22:36 +09:00
Dean Herbert
06f4f93918 Move play modes to Modes namespace. 2016-11-14 18:03:20 +09:00
Dean Herbert
0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Dean Herbert
cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
Drew DeVault
d49b418449 Implement ShowUnicode option behavior 2016-11-10 21:35:58 -05:00
Drew DeVault
1bca78f4b6 Wire up one of the settings to the config
One step at a time, right
2016-11-07 22:36:24 -05:00
Drew DeVault
40e667b2d8 Add default values from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault
89d3f4c2be Import enum from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault
dd0cb5da01 Add options from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault
2aaff01675 Implement config persistence through BasicStorage 2016-11-03 19:06:22 -04:00
Dean Herbert
bdb72d7b82 Add basic VolumeControl and saving of volume to config. 2016-10-08 15:54:00 +09:00
Dean Herbert
11403a922a Make Home, Settings and PlayMode buttons work. 2016-10-04 17:15:03 +09:00
Dean Herbert
cb3dfe094e Add minimum resolution settings. 2016-09-01 22:47:48 +09:00
Dean Herbert
8870935a4b Add basic online API support. 2016-08-31 20:14:01 +09:00
Dean Herbert
81f9ce657f License -> Licence. 2016-08-26 17:27:49 +09:00
Dean Herbert
6cbbeaaac0 Initial commit. 2016-08-26 14:41:47 +09:00