RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
289 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

11 Commits

Author SHA1 Message Date
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 b2c31d3047 Updates post-master-merge. 2016-10-12 16:01:23 +09:00
Dean Herbert 4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
Dean Herbert cb5e4287e2 Post-merge fixes. 2016-10-09 22:21:44 +09:00
Dean Herbert 3067c890ce General improvements to chat querying and logic organisation. 2016-10-08 19:23:21 +09:00
Dean Herbert ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
Dean Herbert 3755ca0501 Add missing SizeMode. 2016-09-28 14:40:27 +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 b4e65e7011 Add clear to ensure no pile-up of messages. 2016-09-27 18:41:58 +09:00
Dean Herbert 28045b7136 Add back basic API support for channel/message retrieval. 2016-09-27 18:33:52 +09:00