19 Commits

Author	SHA1	Message	Date
Thomas Müller	b12b82fdd3	Fix depth values.	2016-11-29 20:50:12 +01:00
Dean Herbert	51235343fd	Fix ChatConsole regression.	2016-11-15 14:46:57 +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	ee24cd310c	Convert everything to DI pattern	2016-11-10 16:41:18 -05:00
Dean Herbert	a61fb5ef5d	Initial updates to make generic containers work.	2016-11-07 21:13:56 +09:00
Dean Herbert	b86f308af6	Add async workflow.	2016-11-01 23:24:14 +09:00
Thomas Müller	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
Thomas Müller	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
Thomas Müller	7751a85e14	Update framework.	2016-10-16 14:10:06 +02:00
Huo Yaoyuan	f4c381f745	Use OverlayContainer in framework.	2016-10-16 17:14:17 +08:00
Huo Yaoyuan	1c97edaac2	Base class for overlays.	2016-10-13 23:04:57 +08:00
Huo Yaoyuan	acd54d1ebc	Single Visibility enum type.	2016-10-13 22:22:27 +08:00
Dean Herbert	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
Dean Herbert	24771a62cf	Remove upwards reference.	2016-10-12 15:23:22 +09:00
Dean Herbert	9276244d6a	getter on single line.	2016-10-12 15:22:03 +09:00
Dean Herbert	05031d18ef	Fix some display regressions in ChatConsole.	2016-10-12 13:35:21 +09:00
Dean Herbert	cb5e4287e2	Post-merge fixes.	2016-10-09 22:21:44 +09:00
Dean Herbert	9594b7193c	Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem	2016-10-08 23:27:46 +09:00
Dean Herbert	47faf8f40d	Add in-game chat display, along with a global hotkey handling method.	2016-10-08 19:23:21 +09:00