RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
867 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

182 Commits

Author SHA1 Message Date
Dean Herbert 42d2d39ade Merge pull request #171 from huoyaoyuan/improvements 
Various improvements
 2016-11-16 12:00:55 +09:00
Huo Yaoyuan 53deaf2a00 Merge branch 'master' 2016-11-16 10:51:39 +08:00
Dean Herbert 89bb87a6f3 Merge pull request #176 from Tom94/simpler-gradient 
Use gradient helper function to create toolbar tooltip gradient.
 2016-11-16 11:18:31 +09:00
Thomas Müller e049f8582a Fix option checkbox losing its glow incorrectly in certain cases. 2016-11-15 19:11:36 +01:00
Thomas Müller 746c28246f Use gradient helper function to create toolbar tooltip gradient. 2016-11-15 19:09:30 +01:00
Thomas Müller 696d21f762 Merge pull request #174 from peppy/general-fixes 
General fixes
 2016-11-15 18:20:48 +01:00
Dean Herbert 0b8c307549 Toolbar should block Hover events. 2016-11-15 20:55:53 +09:00
Dean Herbert a2d505af78 ToolbarButtons should still handle MouseDown events. 2016-11-15 20:55:52 +09: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 1f73bb4cf0 Set drag bar to correct orange. 2016-11-15 19:34:55 +09:00
Dean Herbert a92404413c Adjust padding and fonts of options. 2016-11-15 19:34:53 +09:00
Dean Herbert 566e09083f Add gradient overlay when hovering toolbar to make tooltips more visible. 
Also adjusts opacity of toolbar.
 2016-11-15 16:25:41 +09:00
Dean Herbert 4b6c139c3e Toolbar buttons should handle on click, not mouse down. 2016-11-15 15:31:48 +09:00
Dean Herbert 51235343fd Fix ChatConsole regression. 2016-11-15 14:46:57 +09:00
Dean Herbert abdfe42388 Merge branch 'refs/heads/master' into better-anchors 
# Conflicts:
#	osu.Game.Mode.Osu/UI/OsuComboCounter.cs
#	osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
 2016-11-15 14:33:13 +09:00
Huo Yaoyuan f2f6fe8e00 Set option object to members. 2016-11-15 01:49:06 +08:00
Tom94 c860eb25f9 Migrate to new anchor system without x/y reversal. 2016-11-14 17:22:20 +01:00
Dean Herbert 9a8003f6fa Merge remote-tracking branch 'refs/remotes/upstream/master' into project-restructure 
# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs
 2016-11-14 22:08:30 +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 dde3a68c8f Account for anchor when dragging MusicController (fixes VisualTest). 2016-11-14 16:40:13 +09:00
Dean Herbert 1d51e6af2a Merge pull request #168 from huoyaoyuan/fixes 
Fixes for music controller
 2016-11-14 16:11:31 +09:00
Dean Herbert eb32d842cc Use switch instead of if-else. 2016-11-14 16:10:07 +09:00
Dean Herbert 57c4314cae Merge remote-tracking branch 'refs/remotes/upstream/master' into options-improvements 2016-11-14 16:00:06 +09:00
Dean Herbert c37afd7a81 Merge pull request #166 from Tom94/various-improvements 
Various improvements
 2016-11-14 15:59:17 +09:00
Huo Yaoyuan 86a6c7641d Make TransformDirection more clear. 2016-11-14 04:59:41 +08:00
Huo Yaoyuan afab938794 Strongly typed TransformDirection for music controller. 2016-11-14 03:21:07 +08:00
Thomas Müller ac99e2d488 Avoid using load to construct the drawable hierarchy whereever possible. 2016-11-12 18:34:36 +01: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
Thomas Müller 6355c8bd45 Hide scrolldragger in options. 2016-11-12 13:10:53 +01:00
Thomas Müller 1c47773e0d Make sidebar behaviour feel a bit nicer. 2016-11-12 13:08:34 +01:00
Thomas Müller e923da1998 Fix lastKnownScroll never being written to. 2016-11-12 12:30:12 +01:00
Thomas Müller 98b69bc6c6 Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2016-11-12 12:24:02 +01: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 3b99a8fd06 Add a shadow and bit of elasticity to MusicController. 2016-11-12 17:09:58 +09:00
Dean Herbert b65eb33774 Fix weird artifacting when the MusicController fades in and out by using a buffered container. 2016-11-12 16:44:31 +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 12bc259071 Merge pull request #158 from SirCmpwn/implement-options 
Implement ShowUnicode option behavior
 2016-11-12 16:10:27 +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 a8bba445db Move scroll logic into Update 2016-11-12 01:44:26 -05:00
Drew DeVault 32196c57af Track the visible section in options 2016-11-12 01:44:11 -05:00
Dean Herbert ff67b77c5b Merge pull request #154 from peppy/sidebar-toolbar-coexistence 
Make options overlay coexist with toolbar.
 2016-11-11 13:34:08 +09: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
Dean Herbert a0e1513df6 Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence 
# Conflicts:
#	osu.Game/OsuGame.cs
 2016-11-11 13:30:57 +09:00
Drew DeVault d36c8e9203 Remove certain options when not running on Windows 2016-11-10 21:54:01 -05:00
Drew DeVault d49b418449 Implement ShowUnicode option behavior 2016-11-10 21:35:58 -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