73 Commits

Author	SHA1	Message	Date
Dean Herbert	b4c9dca54b	Merge remote-tracking branch 'upstream/master' into api-channels-messages ... Conflicts: osu.Game/Online/Chat/Message.cs	2016-09-29 23:54:33 +09:00
Dean Herbert	2db962dc33	Add basic tweening mouse cursor. ... # Conflicts: # osu-framework	2016-09-29 23:46:33 +09:00
Dean Herbert	ae6fb0553d	Add contains override to allow correct rendering by CursorContainer on window bounds.	2016-09-29 23:46:30 +09:00
Dean Herbert	a69c5b4fc0	Fix a few warnings.	2016-09-29 23:46:27 +09:00
Dean Herbert	7dcf2c6269	Add TestCase for main menu ButtonSystem.	2016-09-29 23:46:24 +09:00
Dean Herbert	7c98ef1b3d	Move initialisation of ChatLine to Load.	2016-09-28 16:33:20 +09:00
Dean Herbert	8650e951e5	Merge branch 'refs/heads/master' into api-channels-messages ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2016-09-28 16:30:00 +09:00
Dean Herbert	67652a6d8e	Improve formatting of chat lines.	2016-09-27 20:45:26 +09:00
Dean Herbert	754d9c78bd	Simple chat message display functionality.	2016-09-27 19:22:22 +09:00
Dean Herbert	154b914a3a	Fix API scheduling.	2016-09-27 19:22:08 +09:00
Dean Herbert	28045b7136	Add back basic API support for channel/message retrieval.	2016-09-27 18:33:52 +09:00
Huo Yaoyuan	25fecfca06	Relative size and position for text layer.	2016-09-26 16:56:39 +08:00
Huo Yaoyuan	bb13da2b32	Add ResetCount method for Counter.	2016-09-26 14:23:22 +08:00
Huo Yaoyuan	b4bb3d6317	Update private methods implementation.	2016-09-26 14:21:40 +08:00
Huo Yaoyuan	756e7a6a67	Add missing lincense header, remove unnecessary comment and field.	2016-09-26 14:21:25 +08:00
Huo Yaoyuan	63535df6dc	Fix typo and missnaming.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	ec2bc4720d	Comma seperator in numbers.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	ed4fae53cb	Add FadeTime and allow setting custom styles directly from container.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	f4ac1f630d	Adjust visual tree of counter.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	0da0d4f35e	Avoid accessing container in each counter.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	c70bf53486	Rename counter classes to avoid confusing.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	16f1dff849	Make counter public.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	d8666deaa0	IsLit Adjustment.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	ba19fe1b97	Move IsCounting to KeyCounter.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	409bb0d068	Counter animation.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	81f269ee69	MouseCount and KeyBoardCount, input handling.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	e5ef3e1d02	Adjust children position of Counter.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	55a1a3827a	Implement KeyCounter and base Count class.	2016-09-24 19:46:10 +08:00
Dean Herbert	7bdb2fcfc7	Add basic implementation of VisualTest framework for osu! project. ... Comes with one complimentary test.	2016-09-24 15:47:17 +09:00
Dean Herbert	9891e72114	Fix indentation.	2016-09-24 15:35:27 +09:00
Dean Herbert	c64dfca82e	Remove silly textboxes.	2016-09-24 00:09:59 +09:00
Dean Herbert	f936618156	Add back TextAwesome and osu!font.	2016-09-24 00:05:09 +09:00
Dean Herbert	997c6f45f6	Update framework again.	2016-09-21 17:37:33 +09:00
Dean Herbert	b2e7f290f2	Fix window size.	2016-09-20 16:26:07 +09:00
Dean Herbert	b9de26aa26	Framework updates.	2016-09-20 14:41:55 +09:00
Remie Richards	3b1ef0b991	Reverts a small bandaid fix that's no longer necessary relating to the order in which osulogo is initialised.	2016-09-19 01:57:15 +01:00
Remie Richards	3c297064b6	Fixes invalid button scaling, Fixes invalid button location (they were oddly shifted to the right)	2016-09-19 01:47:14 +01:00
Remie Richards	320f76d860	Fixes over-scaling, Brings osu! logo back to the front	2016-09-19 01:35:50 +01:00
Remie Richards	80dfad9af9	Missed an extra set of () on an object initialiser	2016-09-18 20:49:01 +01:00
Remie Richards	314b0dfc04	Replaced all Add() calls in Load()s with direct Children = new Drawable[] {} settings, for consistency	2016-09-18 20:41:53 +01:00
Remie Richards	4732a4db19	An AddProcessing() call was left behind, AddProcessing() is now gone on the framework end.	2016-09-18 16:42:59 +01:00
Remie Richards	f2fa9f611a	Replaced osu.Game.Graphics.Cursor.CursorContainer.cs with osu.Framework.Graphics.Cursor.CursorContainer.cs	2016-09-17 22:11:27 +01:00
Remie Richards	4754c0e2d1	Clears out old tests (use the framework tests!), Replaces osu.Game.Graphics.UserInterface references with osu.Framework.Graphics.UserInterface	2016-09-17 21:54:52 +01:00
Remie Richards	1a5c2b5221	Updates to latest osu-framework, Updates existing Load() methods to use Children = new Drawable[]{} syntax	2016-09-17 21:33:46 +01:00
Dean Herbert	375406bc97	Bring framework up-to-date.	2016-09-11 17:23:43 +09:00
Dean Herbert	4a85d8627d	Update to latest framework version.	2016-09-11 03:04:47 +09:00
Dean Herbert	7e3d2ebe80	Update nuget packages and framework reference once more.	2016-09-06 20:41:18 +09:00
Dean Herbert	49a0e3d9ac	Framework namespace rename.	2016-09-04 18:32:19 +09:00
Dean Herbert	7254c31a92	Drawable is abstract, let's not instantiate it.	2016-09-04 18:32:14 +09:00
Dean Herbert	23111821f5	Update naming conventions.	2016-09-04 18:31:58 +09:00