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

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

Browse Source 
# Conflicts:
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Game/Game.cpp
This commit is contained in:
viktorljung
2015-12-17 11:17:58 +01:00
parent 0f1b06f74e 1a9b765d47
commit aeca1dec18
20 changed files with 540 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components/Transform.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<c:Transform>
<Position X="0" Y="0" Z="0"/>
<Orientation X="0" Y="0" Z="0" W="0"/>
<Orientation X="0" Y="0" Z="0"/>
<Scale X="1" Y="1" Z="1"/>
</c:Transform>