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

Merge branch 'master' of github.com:teamfisk/TacticalZ

Browse Source 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Engine/Network/Server.cpp
This commit is contained in:
sippeangelo
2016-01-24 21:21:51 +01:00
parent 382eff169f d4797b0808
commit 0c56a05144
72 changed files with 3182 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/Player.xml
+5 -5
View File
@@ -50,7 +50,7 @@
<Entity name="CameraModel">
<Components>
<c:Model>
<Resource>Models/Camera.obj</Resource>
<Resource>Models/Camera.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
@@ -65,7 +65,7 @@
<Components>
<c:Camera/>
<c:Model>
<Resource>Models/Camera.obj</Resource>
<Resource>Models/Camera.mesh</Resource>
<Visible>false</Visible>
</c:Model>
<c:Transform>
@@ -78,7 +78,7 @@
<Entity name="PlayerModel">
<Components>
<c:Model>
<Resource>Models/AssaultHeadless.obj</Resource>
<Resource>Models/AssaultHeadless.mesh</Resource>
<Color A="1" B="0" G="0" R="1"/>
</c:Model>
<c:Transform>
@@ -90,7 +90,7 @@
<Entity name="AABBStanding">
<Components>
<c:Model>
<Resource>Models/Core/UnitCube.obj</Resource>
<Resource>Models/Core/UnitCube.mesh</Resource>
<Color A="0.427450985" B="1" G="1" R="1"/>
<Visible>false</Visible>
</c:Model>
@@ -104,7 +104,7 @@
<Entity name="AABBCrouching">
<Components>
<c:Model>
<Resource>Models/Core/UnitCube.obj</Resource>
<Resource>Models/Core/UnitCube.mesh</Resource>
<Color A="0.745098054" B="1" G="0" R="1"/>
<Visible>false</Visible>
</c:Model>