BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	include/Game/Systems/PlayerMovementSystem.h
This commit is contained in:
verysecrethero
2016-02-11 15:19:01 +01:00
parent a53ab7f745 bbbab7b287
commit a8ab49f202
183 changed files with 9539 additions and 2017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/DefaultInput.ini
+2
View File
@@ -18,6 +18,8 @@ Space=Jump
LeftControl=Crouch
RightShift=Sprint
LeftShift=SpecialAbility
1=SelectWeapon,1
2=SelectWeapon,2
F1=ToggleEditor
C=ConnectToServer
N=SwitchToServer