1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 13:37:25 +08:00
osu-lazer/osu.Game
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
..
Configuration Add minimum resolution settings. 2016-09-01 22:47:48 +09:00
GameModes/Menu Fix a few warnings. 2016-09-29 23:46:27 +09:00
Graphics Add basic tweening mouse cursor. 2016-09-29 23:46:33 +09:00
Online Merge remote-tracking branch 'upstream/master' into api-channels-messages 2016-09-29 23:54:33 +09:00
Properties License -> Licence. 2016-08-26 17:27:49 +09:00
osu.Game.csproj Merge remote-tracking branch 'upstream/master' into api-channels-messages 2016-09-29 23:54:33 +09:00
OsuGame.cs Add back basic API support for channel/message retrieval. 2016-09-27 18:33:52 +09:00
OsuGameBase.cs Merge remote-tracking branch 'upstream/master' into api-channels-messages 2016-09-29 23:54:33 +09:00
packages.config Update nuget packages and framework reference once more. 2016-09-06 20:41:18 +09:00