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

Merge remote-tracking branch 'origin/Networking'

Browse Source 
# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Game/Systems/WeaponSystem.cpp
This commit is contained in:
sippeangelo
2016-01-24 17:18:39 +01:00
parent 235b26ad61 2eaad2aa00
commit b4081b3e45
13 changed files with 280 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/DefaultInput.ini
+2 -1
View File
@@ -21,4 +21,5 @@ F1=ToggleEditor
X=EditorToggleTransformSpace
C=ConnectToServer
N=SwitchToServer
M=SwitchToClient
M=SwitchToClient
P=SwitchToPlayer