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

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

Browse Source 
# Conflicts:
#	src/Game/Game.cpp
This commit is contained in:
stiffly
2016-01-15 09:52:31 +01:00
parent b80ecc29d8 a8f7d5f6b9
commit e248b37ea8
47 changed files with 837 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/SoundTestLevel.xml
+14 -15
View File
@@ -8,21 +8,9 @@
<Children>
<Entity>
<Components>
<c:Listener/>
<c:Model>
<Resource>Models/Core/UnitCube.obj</Resource>
<Color A="1" B="0.176470593" G="0.105882354" R="1"/>
</c:Model>
<c:Transform>
<Position X="-1.52600002" Y="0" Z="0"/>
<Scale X="0.5" Y="0.5" Z="0.5"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:SoundEmitter/>
<c:SoundEmitter>
<FilePath></FilePath>
</c:SoundEmitter>
<c:Model>
<Resource>Models/Core/UnitCube.obj</Resource>
<Color A="1" B="1" G="0.58431375" R="0.43921569"/>
@@ -31,6 +19,17 @@
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:Camera/>
<c:Listener/>
<c:Transform>
<Position X="-1.81944144" Y="1.960464" Z="8.79182625"/>
<Orientation X="-0.261799812" Y="-0.261786997" Z="-8.48482742e-08"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>