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

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

Browse Source 
Conflicts:
	src/Engine/Rendering/CubeMapPass.cpp
	src/Engine/Rendering/DrawFinalPass.cpp
This commit is contained in:
Teejoon
2016-03-01 12:11:27 +01:00
parent df7ace6626
commit 77eaa45702
60 changed files with 1481 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components/Player.xml
+2
View File
@@ -2,5 +2,7 @@
<Player xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Player.xsd">
<MovementSpeed>3</MovementSpeed>
<CrouchSpeed>1.5</CrouchSpeed>
<JumpSpeed>4.0</JumpSpeed>
<CurrentWishDirection X="0" Y="0" Z="0"/>
<CurrentWeapon></CurrentWeapon>
</Player>