Merged branch new-netcode into new-netcode

2016-10-08 19:14:52 -03:00
parent fc8eab688d 54f3d09af4
commit a1d319d0df
27 changed files with 550 additions and 474 deletions
@@ -165,6 +165,7 @@
    <Compile Include="Source\Screens\BlurEffect.cs" />
    <Compile Include="Source\Screens\NetLobbyVoting.cs" />
    <Compile Include="Source\Screens\ServerListScreen.cs" />
+    <Compile Include="Source\Timing.cs" />
    <Compile Include="Source\Utils\MTRandom.cs" />
    <Compile Include="Source\Utils\Rand.cs" />
    <Compile Include="Source\Events\PropertyTask.cs" />