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

163 Commits

Author SHA1 Message Date
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Dean Herbert
9e5000d448 Remove (soon-to-be) redundant labels. 2017-01-31 18:40:18 +09:00
Dean Herbert
6ca974bf0c Re-namespace options, adjust font sizes + more. 2017-01-31 18:37:11 +09:00
Dean Herbert
20ee1872b4 Broaden invalidation. 2017-01-31 17:15:46 +09:00
Dean Herbert
62c5ad907a Merge remote-tracking branch 'upstream/master' into login-updates
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-31 17:05:33 +09:00
Dean Herbert
3476abc38b Add proper masking support to the login overlay. 2017-01-31 16:42:46 +09:00
Dean Herbert
74366c620b Move login screen to toolbar and update design (still not fully implemented).
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
#	osu.Game/Overlays/Toolbar/Toolbar.cs
2017-01-30 22:55:35 +09:00
Dean Herbert
bdbe8501d3 Merge branch 'master' into add-flash-effects
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-30 21:47:05 +09:00
Dean Herbert
26e9533ff0 Add custom implementation of TextBox. 2017-01-30 20:29:04 +09: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
7ee6a50404 Fix checkbox design regressions. 2017-01-27 00:16:02 +09: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
Drew DeVault
f5f545df62 Refactor OsuColour into injected instance class
Which should allow you to change the color palette in the future for
skinning purposes.
2017-01-12 23:49:05 -05:00
Drew DeVault
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
Andrey Zavadskiy
63fcfdbbde Fixed checkboxes state and better code 2017-01-11 10:28:24 +03:00
Drew DeVault
c222be05c0 Add Color4.Opacity and OsuColor.Gray 2017-01-10 13:44:40 -05:00
Drew DeVault
70ecf48ca7 Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
2017-01-09 17:20:31 -05:00
Andrey Zavadskiy
c0980437a6 Removed unnecessary api reference 2017-01-07 00:55:04 +03:00
Drew DeVault
4899d88d19 Update framework 2017-01-05 02:10:05 -05:00
Drew DeVault
b27139c2bd Simplify layout of dropdown menu item 2017-01-05 00:57:19 -05:00
Drew DeVault
af4aeeab09 Update following framework changes 2017-01-04 01:14:25 -05:00
Drew DeVault
a1f8c0df64 Style dropdown to match osu!stable 2017-01-03 23:00:28 -05:00
Andrey Zavadskiy
eabfa11614 Minor fix 2016-12-24 10:04:43 +03:00
Andrey Zavadskiy
ba1d0b3a84 Added Events for checkboxes 2016-12-24 09:09:01 +03:00
Andrey Zavadskiy
9f202ecba8 fix 2016-12-23 23:49:42 +03:00
Andrey Zavadskiy
70c8250021 Revert "Dependent checkboxes"
This reverts commit 70dc3bae4a.
2016-12-23 23:05:44 +03:00
Andrey Zavadskiy
70dc3bae4a Dependent checkboxes 2016-12-23 20:24:28 +03:00
Andrey Zavadskiy
1c79ebff9f Fix loggining on start even after logout and exit 2016-12-21 01:51:01 +03:00
Andrey Zavadskiy
bba4c46ae3 TODO comment and deleted repeating lines 2016-12-21 01:05:10 +03:00
Andrey Zavadskiy
d519e28dda PasswordTextBox fix 2016-12-20 17:52:16 +03:00
Andrey Zavadskiy
21c6c23189 Login improvements 2016-12-20 17:28:27 +03:00
Andrey Zavadskiy
e23a1b8e92 Remove unnecessary items from OptionsOverlay 2016-12-19 19:17:04 +03:00
Drew DeVault
67d748f677 Adjust padding on sliders 2016-12-16 01:27:57 -05:00
Drew DeVault
796858f86f Fix transparency issues 2016-12-16 00:37:37 -05:00
Drew DeVault
96a6e30a21 Drop complicated type constraints 2016-12-16 00:27:06 -05:00
Drew DeVault
80574423cb Drop SliderBarEventSource 2016-12-16 00:27:06 -05:00
Drew DeVault
abc6db18b3 Add license header 2016-12-16 00:27:06 -05:00
Drew DeVault
a751cfcba3 Update SliderOption implementation
Per @Tom94's suggestion, the bars track the nub in Update instead of
animating seperately. Also only animates when the event source is the
keyboard.
2016-12-16 00:27:06 -05:00
Drew DeVault
10cc6f7885 Move where clause to next line 2016-12-16 00:27:06 -05:00
Drew DeVault
9e75ecab4f Fix up slider bugs 2016-12-16 00:27:06 -05:00
Drew DeVault
22c2a4757c Play slider sample as the value changes in 1/10ths 2016-12-16 00:27:06 -05:00
Drew DeVault
c642f6c34f Add sliderbar L+F 2016-12-16 00:27:06 -05:00
Drew DeVault
bf7ec397dd Wire dropdowns back to bindables 2016-12-07 09:42:53 -05:00
Drew DeVault
bf33bded24 Update star min/max type, just use sliders for now 2016-12-07 09:42:53 -05:00
Drew DeVault
b06f412ffb Use styled dropdown 2016-12-07 09:42:53 -05:00
Drew DeVault
0e07ce26bc Remove Height from dropdown 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
5456e0102c s/OptionsDropdown/DropdownOption/g 2016-12-07 09:42:52 -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
ff7ec88e66 s/OptionsSlider/SliderOption/g 2016-12-07 09:42:37 -05:00
Drew DeVault
b97902d006 Add missing sliders 2016-12-07 09:42:37 -05:00
Drew DeVault
92cf841589 Add and wire up all sliderbar-based options 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
Drew DeVault
a350e95e40 Add OptionsSlider and wire up volume sliders 2016-12-07 09:41:28 -05:00
Dean Herbert
f356640cb7 Add missing licence headers. 2016-12-06 19:07:15 +09:00
Dean Herbert
590ca3108c Add checkbox sound effects. 2016-12-05 19:45:54 +09: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
0b0fe2a857 Remove incorrect verbatim string specifications. 2016-12-01 16:04:58 +09:00
Dean Herbert
13d26d0601 Tidy up options login section code; fix incorrect flow logic for online state. 2016-12-01 13:07:19 +09:00
Dean Herbert
ed879f33df Add logout button and check for inputs before allowing login. 2016-11-30 19:43:03 +09:00
Dean Herbert
11f726ad45 Add basic login flow. 2016-11-30 18:30:15 +09:00
Huo Yaoyuan
53deaf2a00 Merge branch 'master' 2016-11-16 10:51:39 +08:00
Thomas Müller
e049f8582a Fix option checkbox losing its glow incorrectly in certain cases. 2016-11-15 19:11:36 +01:00
Dean Herbert
f415e5820f Add an implementation of the new design of checkboxes. 2016-11-15 19:35:01 +09:00
Dean Herbert
5b1711f797 Update some colour palette discrepancies in options. 2016-11-15 19:34:58 +09:00
Dean Herbert
a92404413c Adjust padding and fonts of options. 2016-11-15 19:34:53 +09:00
Huo Yaoyuan
f2f6fe8e00 Set option object to members. 2016-11-15 01:49:06 +08:00
Dean Herbert
75be78752b Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking
# Conflicts:
#	osu.Game/osu.Game.csproj
2016-11-12 22:30:15 +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
Dean Herbert
8d56a881d0 Merge pull request #157 from SirCmpwn/string-options
Add TextBoxOption and wire it up
2016-11-12 16:11:09 +09:00
Dean Herbert
a39d28efe2 Merge pull request #159 from SirCmpwn/platform-options
Remove certain options when not running on Windows
2016-11-12 16:05:47 +09:00
Drew DeVault
00cc4278da Split off SidebarButton 2016-11-12 01:53:20 -05:00
Drew DeVault
32196c57af Track the visible section in options 2016-11-12 01:44:11 -05:00
Dean Herbert
27542d9747 Merge pull request #151 from SirCmpwn/options-sidebar
Expand the options sidebar on hover
2016-11-11 13:33:10 +09:00
Drew DeVault
d36c8e9203 Remove certain options when not running on Windows 2016-11-10 21:54:01 -05:00
Drew DeVault
e2365cfad2 s/internalText/InternalText/g 2016-11-10 18:25:20 -05:00
Drew DeVault
a81f099d40 Add TextBoxOption and wire it up 2016-11-10 18:17:15 -05:00
Drew DeVault
0d4560a054 Update to latest DI stuff 2016-11-10 17:40:42 -05:00
Drew DeVault
ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Dean Herbert
904d258dc3 Fix checkbox not updating correctly. 2016-11-09 20:13:13 +09:00
Drew DeVault
676cdc44b2 Add expanding options sidebar 2016-11-08 23:36:06 -05:00
Drew DeVault
3ad633f363 Wire up all of the boolean options 2016-11-08 23:17:08 -05:00
Dean Herbert
d70e8806b4 Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes 2016-11-09 11:41:36 +09:00
Dean Herbert
3ef26a6bf0 Fix paddings, transitions, const variable names. 2016-11-08 20:23:18 +09:00
Dean Herbert
89b11ed099 Handle sidebar buttons onClick not onMouseDown. 2016-11-08 19:18:31 +09:00
Dean Herbert
8c68f9ba93 OptionsSideNav -> OptionsSidebar. 2016-11-08 19:17:09 +09:00
Dean Herbert
3b0114671e Max sidebar draggable. 2016-11-08 19:16:39 +09:00
Dean Herbert
a851d7b44f Updates. 2016-11-08 18:33:31 +09:00
Dean Herbert
c36b54b35a Merge remote-tracking branch 'refs/remotes/upstream/master' into generic-container 2016-11-08 18:29:21 +09:00
Drew DeVault
743c1bde58 Wire up alternative chat font 2016-11-07 22:37:21 -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
fbbd05e606 Remove unnecessary TODO 2016-11-07 22:28:02 -05:00
Drew DeVault
a6593505b3 Say NO to RelativeSizeAxes = Both 2016-11-07 22:19:02 -05:00
Drew DeVault
4d04eb6fb1 Rearrange some options a bit, update framework 2016-11-07 22:15:48 -05:00
Drew DeVault
cbbac0565f Remove unused using statements 2016-11-07 21:28:06 -05:00