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

Merge remote-tracking branch 'origin/Importer' into Animations

Browse Source 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/RenderingWorld.xml
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/Skeleton.cpp
This commit is contained in:
viktorljung
2016-02-09 22:50:19 +01:00
parent 3c22dcc165 060e674a6f
commit c09c2f4783
115 changed files with 4572 additions and 930 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/AnimatedArmy.xml
+5 -5
View File
@@ -20,7 +20,7 @@
<Entity>
<Components>
<c:Model>
<Resource>models/dummyscene.mesh</Resource>
<Resource>Models/Test/DummyScene.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0" Y="-0" Z="0"/>
@@ -31,7 +31,7 @@
<Entity>
<Components>
<c:Model>
<Resource>models/animtest.</Resource>
<Resource>Models/Test/AnimTest.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="-0.0966923237" Y="1.2939688" Z="0.399702221"/>
@@ -42,7 +42,7 @@
<Entity>
<Components>
<c:Model>
<Resource>models/animTest.mesh</Resource>
<Resource>Models/Test/AnimTest.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0" Y="1.31816244" Z="1.1888907"/>
@@ -53,7 +53,7 @@
<Entity>
<Components>
<c:Model>
<Resource>models/animTest.mesh</Resource>
<Resource>Models/Test/AnimTest.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0.708824873" Y="1.30000007" Z="0"/>
@@ -64,7 +64,7 @@
<Entity>
<Components>
<c:Model>
<Resource>models/animTest.mesh</Resource>
<Resource>Models/Test/AnimTest.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="1.36948848" Y="1.20000005" Z="0"/>