1162 Commits

Author	SHA1	Message	Date
Dean Herbert	ac16bffe49	Bring framework and resources up-to-date.	2016-10-01 19:05:26 +09:00
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	a69c5b4fc0	Fix a few warnings.	2016-09-29 23:46:27 +09:00
Dean Herbert	7c98ef1b3d	Move initialisation of ChatLine to Load.	2016-09-28 16:33:20 +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
Dean Herbert	997c6f45f6	Update framework again.	2016-09-21 17:37:33 +09:00
Dean Herbert	7d2f303e61	Update font logic to override framework default. ... # Conflicts: # osu.Game/OsuGame.cs	2016-09-01 22:47:48 +09:00
Dean Herbert	013cf1cf3f	Fix broken namespaces.	2016-08-31 20:16:05 +09:00
Dean Herbert	8870935a4b	Add basic online API support.	2016-08-31 20:14:01 +09:00