Merge remote-tracking branch 'origin/master' into Menu

# Conflicts: # resources/Schema/Entities/Player.xml
2016-01-24 22:23:53 +01:00
parent 7e92d6f53f 47d2fb6a9b
commit d03b3fb071
23 changed files with 506 additions and 296 deletions
@@ -21,4 +21,5 @@ F1=ToggleEditor
 X=EditorToggleTransformSpace
 C=ConnectToServer
 N=SwitchToServer
-M=SwitchToClient
+M=SwitchToClient
+P=SwitchToPlayer
@@ -19,6 +19,7 @@
      </Team>
    </c:Team>
    <c:Transform/>
+      <Position X="-0.246963501" Y="0.0265000071" Z="3.01600003"/>
  </Components>

  <Children>