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

2016-02-01 18:30:30 +01:00
parent 782c1a388a ca8b7cbee8
commit c708f1582c
22 changed files with 273 additions and 126 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