Merge branch 'master' into BoxModelCollision

2016-02-01 16:17:10 +01:00
parent 3cfbbbbf54 ca8b7cbee8
commit 30ad238697
15 changed files with 251 additions and 73 deletions
@@ -15,10 +15,6 @@ Space=Jump
 LeftControl=Crouch
 LeftShift=Sprint
 F1=ToggleEditor
-1=EditorToolMove
-2=EditorToolRotate
-3=EditorToolScale
-X=EditorToggleTransformSpace
 C=ConnectToServer
 N=SwitchToServer
 M=SwitchToClient