234 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	c0ea061bd4	Update framework; amend ToolbarButton to use padding and Children initialiser.	2016-10-12 12:24:07 +09:00
Dean Herbert	cb5e4287e2	Post-merge fixes.	2016-10-09 22:21:44 +09:00
Dean Herbert	25de055802	Merge branch 'master' into stateful-drawables ... Conflicts: osu.Game/GameModes/Menu/Intro.cs	2016-10-09 22:08:32 +09:00
Dean Herbert	de24c86c81	Merge pull request #55 from Tom94/better-addtarget ... Better addtarget	2016-10-09 20:13:30 +09:00
Thomas Müller	dd04b33232	Use AddInternal instead of AddTopLevel.	2016-10-09 20:06:23 +09:00
Thomas Müller	bcb5a02221	Don't rely on return value of Container.Add.	2016-10-09 20:06:20 +09:00
Thomas Müller	36bb4a3988	Don't call Container.Add within KeyCounterCollection.Reset.	2016-10-09 20:06:15 +09:00
Dean Herbert	0a10bf9a51	Update framework.	2016-10-09 20:06:07 +09:00
Dean Herbert	76f1653090	Merge pull request #53 from Tom94/use_drawable_scheduler ... Use drawable scheduler	2016-10-09 15:25:22 +09:00
Thomas Müller	9d54d4f9bb	Update framework version.	2016-10-09 08:16:51 +02:00
Dean Herbert	926c46dbd4	Code formatting and slight changes to transitions.	2016-10-08 23:27:53 +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	97c2dcf590	Use PaddingContainer for better layout.	2016-10-08 23:25:38 +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
Dean Herbert	1e9e52aecc	osuLogo handles less keys.	2016-10-08 19:23:21 +09:00
Dean Herbert	adba72d293	Toolbar stores its current state locally (just for conformity).	2016-10-08 19:23:21 +09:00
Dean Herbert	3067c890ce	General improvements to chat querying and logic organisation.	2016-10-08 19:23:21 +09:00
Thomas Müller	965cd6539f	Merge pull request #48 from peppy/general-fixes ... General fixes	2016-10-08 12:21:17 +02:00
Dean Herbert	5ff3767038	Fix typo in comment.	2016-10-08 19:18:50 +09:00
Dean Herbert	5a507838d6	Fix event not being unbound.	2016-10-08 19:12:31 +09:00
Thomas Müller	0c793dfe69	Use own Scheduler instead of Game.Scheduler.	2016-10-08 11:33:24 +02:00
Dean Herbert	556420ee58	Add proper toolbar state handling.	2016-10-08 15:54:09 +09:00
Dean Herbert	27a26cfaaf	Ensure the correct background state is restored when skipping multiple levels	2016-10-08 15:54:09 +09:00
Dean Herbert	93f326bb9b	Fix welcome sound being played twice.	2016-10-08 15:54:08 +09:00
Dean Herbert	243d2cdec5	Block window closing while intro is playing.	2016-10-08 15:54:07 +09:00
Dean Herbert	f2f3b69eee	BackgroundModes shouldn't handle the escape key themselves.	2016-10-08 15:54:07 +09:00
Dean Herbert	08728b84d1	Make sure intro can't be exited unless the main menu has displayed once.	2016-10-08 15:54:06 +09:00
Dean Herbert	c5228b63cb	Unify and smiplify exit logic. Now only OsuGame calls the final Exit.	2016-10-08 15:54:05 +09:00
Dean Herbert	c5ac851ba9	Add the ability to exit the game using escape.	2016-10-08 15:54:05 +09:00
Dean Herbert	b2d899feb5	Add basic intro sequence.	2016-10-08 15:54:04 +09:00
Dean Herbert	656aee41e2	Never Prefer32bit.	2016-10-08 15:54:04 +09:00
Dean Herbert	4f2bb25853	Remove "Deploy" configuration.	2016-10-08 15:54:03 +09:00
Dean Herbert	a5adbc0615	Update namespace references.	2016-10-08 15:54:02 +09:00
Dean Herbert	065b193b15	Fix the initial state of VolumeControl being wrong.	2016-10-08 15:54:01 +09:00
Dean Herbert	bdb72d7b82	Add basic VolumeControl and saving of volume to config.	2016-10-08 15:54:00 +09:00
Dean Herbert	e25e7319e9	Add sample usage of PlayMode bindable.	2016-10-08 15:54:00 +09:00
Dean Herbert	5ff9d828eb	Add KeyCounter to Player for fun.	2016-10-08 15:53:59 +09:00
Dean Herbert	10468a566c	Add some comments about future usage.	2016-10-08 15:53:58 +09:00
Dean Herbert	d1dfa120d1	Move BackgroundModes to their own files.	2016-10-08 15:53:57 +09:00
Dean Herbert	d6042bd689	Add intro and begin to create central logic nest.	2016-10-08 15:53:56 +09:00
Dean Herbert	9b76a0ffb8	Expose CursorContainer.	2016-10-08 15:53:55 +09:00
Dean Herbert	a23ca25e7d	Remove unusable "tests" button from main menu system.	2016-10-08 15:53:54 +09:00
Dean Herbert	75c97a62e3	Add main menu music back.	2016-10-08 15:53:53 +09:00
Dean Herbert	e5dc8bad2f	Bring up-to-date with latest framework.	2016-10-08 15:53:52 +09:00
Dean Herbert	9ed4da556e	Update framework version.	2016-10-08 15:50:46 +09:00
Dean Herbert	eca76c2a81	Merge pull request #46 from peppy/background-stack ... Game Mode Backgrounds & More	2016-10-07 23:29:15 +09:00
Dean Herbert	2ca7a74e63	Bring framework up-to-date.	2016-10-07 22:54:37 +09:00
Dean Herbert	b588f28856	Make play modes display playfield.	2016-10-05 20:49:31 +09:00
Dean Herbert	c0f25a2683	Improve white-boxed game modes.	2016-10-05 20:08:58 +09:00
Dean Herbert	4eb310c3a5	Remove unused button state.	2016-10-05 20:07:15 +09:00