Thomas Müller
|
20947623d5
|
Merge pull request #210 from peppy/online-improvements
Add login support, better API state change handling.
|
2016-12-01 18:50:54 +01:00 |
|
Dean Herbert
|
511dab32ef
|
Remove masking from Triangles to simplify OsuLogo masking hierarchy.
|
2016-12-01 21:12:37 +09:00 |
|
Dean Herbert
|
858a79c402
|
Merge pull request #211 from huoyaoyuan/enhancement
Minor enhancements
|
2016-12-01 20:01:39 +09:00 |
|
Dean Herbert
|
918a3bc74f
|
Add glow and bling to game mode selector.
|
2016-12-01 19:15:34 +09:00 |
|
Dean Herbert
|
3a5c41b970
|
Restore additive blending for toolbar button backgrounds.
|
2016-12-01 18:54:32 +09:00 |
|
Dean Herbert
|
11f958030f
|
Make Triangles more flexible and more random.
|
2016-12-01 18:53:13 +09:00 |
|
Dean Herbert
|
6554a4ea58
|
Fix shadow not displaying around avatar.
|
2016-12-01 17:45:32 +09:00 |
|
Dean Herbert
|
25d3818e7a
|
Fix game mode selector line regression.
|
2016-12-01 17:45:21 +09:00 |
|
Dean Herbert
|
6ccce88a0e
|
Add proper user data retrieval on connect.
|
2016-12-01 16:44:24 +09:00 |
|
Dean Herbert
|
d7ab74363d
|
Simplify toolbar width/padding calculations. Add avatar display (incorrect user id).
|
2016-12-01 16:05:54 +09:00 |
|
Dean Herbert
|
0b0fe2a857
|
Remove incorrect verbatim string specifications.
|
2016-12-01 16:04:58 +09:00 |
|
Dean Herbert
|
167b559a95
|
Move toolbar to own namespace.
|
2016-12-01 14:22:29 +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
|
9d05c132e8
|
Make Toolbar an IOnlineComponent to tidy up state change logic.
|
2016-12-01 13:03:40 +09:00 |
|
Dean Herbert
|
c6b7e90739
|
Merge branch 'refs/heads/master' into online-improvements
|
2016-12-01 12:51:45 +09:00 |
|
Huo Yaoyuan
|
3a4fb2ffed
|
IsEnabled property for drag bar of music controller.
|
2016-12-01 08:20:24 +08:00 |
|
Thomas Müller
|
579b8328dc
|
Revert "Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack."
This reverts commit 27a13eec97.
|
2016-11-30 20:50:41 +01:00 |
|
Thomas Müller
|
27a13eec97
|
Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack.
|
2016-11-30 20:22:23 +01:00 |
|
Dean Herbert
|
ed879f33df
|
Add logout button and check for inputs before allowing login.
|
2016-11-30 19:43:03 +09:00 |
|
Dean Herbert
|
01dc7cb5c2
|
Thread safety, username saving correctly etc.
|
2016-11-30 19:22:36 +09:00 |
|
Dean Herbert
|
a980671c54
|
Add basic ChatOverlay state handling.
|
2016-11-30 18:30:19 +09:00 |
|
Dean Herbert
|
11f726ad45
|
Add basic login flow.
|
2016-11-30 18:30:15 +09:00 |
|
Dean Herbert
|
88748499fa
|
Register chat overlay with API.
|
2016-11-30 18:30:10 +09:00 |
|
Dean Herbert
|
18509e6a60
|
ChatConsole -> ChatOverlay. Namespace tidying.
|
2016-11-30 18:30:06 +09:00 |
|
Dean Herbert
|
481b9d3208
|
Make opening options shift the rest of the screen as per design.
|
2016-11-30 18:28:18 +09:00 |
|
Dean Herbert
|
6809e2ce0a
|
Use DI to get api for ChatConsole.
|
2016-11-30 17:07:36 +09:00 |
|
Dean Herbert
|
d65a275e32
|
Improve transition of toolbar when hovering.
|
2016-11-30 13:50:30 +09:00 |
|
Thomas Müller
|
b12b82fdd3
|
Fix depth values.
|
2016-11-29 20:50:12 +01:00 |
|
Dean Herbert
|
60d939f323
|
Use FillMode in more cases.
|
2016-11-23 13:18:22 +09:00 |
|
Dean Herbert
|
b3b7fb90c5
|
Add shadows to toolbar tooltips.
|
2016-11-23 11:35:52 +09:00 |
|
Dean Herbert
|
3bc38268a0
|
Make MusicController more async.
|
2016-11-22 20:47:28 +09:00 |
|
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 |
|
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
|
788c11de10
|
Merge pull request #103 from huoyaoyuan/music-controller
Music controller
|
2016-11-10 12:54:56 +09:00 |
|
Dean Herbert
|
904d258dc3
|
Fix checkbox not updating correctly.
|
2016-11-09 20:13:13 +09:00 |
|
Dean Herbert
|
a5dcae859c
|
Give OptionsOverlay an offset to make up for toolbar possibly being present.
|
2016-11-09 15:24:27 +09:00 |
|
Dean Herbert
|
9d1d5a5cea
|
Modify toolbar tooltips to be closer to design.
|
2016-11-09 15:24:19 +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
|
04fa1f897e
|
Use margin instead of padding so mouseDown events on the sidebar buttons don't interrupt scrolling.
|
2016-11-09 12:32:38 +09:00 |
|
Dean Herbert
|
d41d7b8e9a
|
Don't derive ScrollContainer unnecessarily.
|
2016-11-09 12:10:22 +09: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
|
28a94e2df1
|
Remove unused constant.
|
2016-11-08 20:35:21 +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
|
30323876a8
|
Use preload for options (fix icons).
|
2016-11-08 18:49:20 +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 |
|