Commit Graph

7039 Commits

Author SHA1 Message Date
d2495e34fb Query from beatmap database. 2016-10-27 13:34:47 +08:00
303bd41765 Background scale. 2016-10-27 13:34:46 +08:00
b0d72c5f84 Button and text. 2016-10-27 13:34:45 +08:00
0f2b5e8370 Layers. 2016-10-27 13:34:44 +08:00
e1f6ab1a42 Create MusicController UI class and visual test. 2016-10-27 13:34:43 +08:00
28a41dcca6 Fix FlowContainers. 2016-10-22 18:05:46 +09:00
cdef75c98b Fix AutoSize references. 2016-10-22 17:50:42 +09:00
68476eafb9 Use DrawSize instead of Size whereever Size was previously read due to framework changes.
Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)
2016-10-18 18:53:31 +02:00
8e47d72f93 Reorder ToolbarButton instantiation for consistency
Might as start good standards now rather than later
2016-10-16 18:42:40 -05:00
fec127eb8c Merge branch 'master' of github.com:ppy/osu into unified_shader
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options.cs
2016-10-16 15:17:24 +02:00
7751a85e14 Update framework. 2016-10-16 14:10:06 +02:00
f4c381f745 Use OverlayContainer in framework. 2016-10-16 17:14:17 +08:00
8c7ff58310 Fix regressions caused by overlay class. 2016-10-14 12:50:03 +09:00
254cc87578 Use name ToggleVisibility. 2016-10-14 05:02:13 +08:00
1c97edaac2 Base class for overlays. 2016-10-13 23:04:57 +08:00
c93a440d3b Make Options:IStateful. 2016-10-13 22:27:37 +08:00
acd54d1ebc Single Visibility enum type. 2016-10-13 22:22:27 +08:00
aa96d98822 Merge branch 'master' into limit-game-access
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
	osu.Game/GameModes/Menu/ButtonSystem.cs
	osu.Game/Online/Chat/Display/ChatLine.cs
	osu.Game/OsuGame.cs
	osu.Game/Overlays/ToolbarButton.cs
2016-10-12 20:44:33 +09:00
b2c31d3047 Updates post-master-merge. 2016-10-12 16:01:23 +09:00
4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
24771a62cf Remove upwards reference. 2016-10-12 15:23:22 +09:00
9276244d6a getter on single line. 2016-10-12 15:22:03 +09:00
05031d18ef Fix some display regressions in ChatConsole. 2016-10-12 13:35:21 +09:00
c0ea061bd4 Update framework; amend ToolbarButton to use padding and Children initialiser. 2016-10-12 12:24:07 +09:00
cb5e4287e2 Post-merge fixes. 2016-10-09 22:21:44 +09:00
926c46dbd4 Code formatting and slight changes to transitions. 2016-10-08 23:27:53 +09:00
9594b7193c Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem 2016-10-08 23:27:46 +09:00
47faf8f40d Add in-game chat display, along with a global hotkey handling method. 2016-10-08 19:23:21 +09:00
adba72d293 Toolbar stores its current state locally (just for conformity). 2016-10-08 19:23:21 +09:00
556420ee58 Add proper toolbar state handling. 2016-10-08 15:54:09 +09:00
698c1ef1ae Fix width of toolbar buttons with text. 2016-10-05 20:07:10 +09:00
3891f467a3 Fix being able to click two toolbar buttons at once. 2016-10-04 20:00:55 +09:00
836083667f Clean up a bit. 2016-10-04 19:57:32 +09:00
cc52580568 Implement mode selector highlight line. 2016-10-04 19:41:18 +09:00
11403a922a Make Home, Settings and PlayMode buttons work. 2016-10-04 17:15:03 +09:00
ddcd5ec286 Add basic layout for toolbar. 2016-10-03 20:39:32 +09:00
ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
d93718d953 Add template toolbar. 2016-09-30 18:45:27 +09:00
154226b9a3 Basic white-boxing of all game modes. 2016-09-29 23:51:17 +09:00