RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
osu/osu.Game
History
Dean Herbert 3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum 
# Conflicts:
#	osu.Game.Modes.Mania/ManiaMod.cs
#	osu.Game.Modes.Osu/OsuMod.cs
#	osu.Game/Modes/Mod.cs
 		2017-03-07 13:42:50 +09:00
..
Beatmaps Fix most warnings. 2017-03-07 13:05:57 +09:00
Configuration KeyCounter visibility 2017-03-01 13:22:01 +03:00
Database Fix most warnings. 2017-03-07 13:05:57 +09:00
Graphics Fix most warnings. 2017-03-07 13:05:57 +09:00
IPC Fix most warnings. 2017-03-07 13:05:57 +09:00
Input Fix GlobalHotkeys not working (regression due to masking rules). 2017-02-20 15:31:15 +09:00
Modes Merge remote-tracking branch 'upstream/master' into less-mods-enum 2017-03-07 13:42:50 +09:00
Online Fix most warnings. 2017-03-07 13:05:57 +09:00
Overlays Merge remote-tracking branch 'upstream/master' into less-mods-enum 2017-03-07 13:42:50 +09:00
Properties Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Screens Fix a few regressions. 2017-03-07 13:30:36 +09:00
Users Fix some license headers. 2017-03-02 18:45:20 +09:00
OsuGame.cs Fix most warnings. 2017-03-07 13:05:57 +09:00
OsuGameBase.cs Fix most warnings. 2017-03-07 13:05:57 +09:00
osu.Game.csproj Fix most warnings. 2017-03-07 13:05:57 +09:00
packages.config Update nuget packages. 2017-02-27 20:38:30 +09:00