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

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

Browse Source 
# Conflicts:
#	include/Engine/Common.h
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/DrawScenePass.h
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/Renderer.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	resources/Shaders/ForwardPlus.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
This commit is contained in:
stiffly
2016-01-25 01:21:15 +01:00
parent 382e00cff4 04f6233d99
commit 44baa47bba
251 changed files with 11834 additions and 3294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/Test.xml
+5 -4
View File
@@ -6,15 +6,14 @@
<Orientation X="0" Y="0" Z="0"/>
</c:Transform>
<c:Model>
<Resource>Models/DummyScene.obj</Resource>
<Resource>Models/DummyScene.mesh</Resource>
</c:Model>
</Components>
</Entity>
<Children>
<Entity>
<Components>
<c:Transform>
<Position X="0" Y="-0"/>
<Position X="0" Y="0" Z="-2"/>
<Scale X="1" Y="1" Z="1"/>
</c:Transform>
<c:Camera>
@@ -37,8 +36,10 @@
<ExponentialAccelaration>0</ExponentialAccelaration>
</c:ExplosionEffect>
<c:Model>
<Resource>Models/Camera.obj</Resource>
<Resource>Models/Camera.mesh</Resource>
</c:Model>
</Components>
</Entity>
<EntityRef file="Schema/Entities/EditorWidget.xml"/>
</Children>
</Entity>