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

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

Browse Source
This commit is contained in:
Jocke
2016-03-09 19:43:48 +01:00
parent 5a7034dfcd fce6e90f3c
commit ad49af2f8c
5 changed files with 11971 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: 2bf82ffb6e...3af64d8b1f
resources/Schema/Entities/CP_Rocky2.xml
+11874
View File
File diff suppressed because it is too large Load Diff
resources/Schema/Entities/FloatingBridgePillar.xml
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
<Components>
<c:Collidable/>
<c:Model>
<Resource>Models/Props/Bridges/SciFi_Bridge_Support_Top_Red.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0" Y="-6.44986534" Z="-6.68222857"/>
<Scale X="1.10000002" Y="1.10000002" Z="1.10000002"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:Collidable/>
<c:Model>
<Resource>Models/Props/Bridges/SciFi_Bridge_Support_Bot_Red.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0" Y="0.215699792" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:FloatingEffect>
<Period>12</Period>
<Time>513.93462028501312</Time>
<Axis X="0" Y="0.100000001" Z="0"/>
</c:FloatingEffect>
<c:Transform>
<Position X="-0" Y="-0.0882625133" Z="-0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:Collidable/>
<c:Model>
<Resource>Models/Props/Bridges/SciFi_Bridge_Support_Middle_Red.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0" Y="0.121641584" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
resources/Schema/Entities/ShinyStoneCrystalBlueLights.xml
+39
View File
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Entity name="ShinyStoneCrystalBlueLights" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
<Components>
<c:Transform/>
</Components>
<Children>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="0" R="0"/>
<Radius>5</Radius>
<Intensity>2</Intensity>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="-0.030024644" Y="1.9786495" Z="-0.242380202"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="0.454901963" R="0"/>
<Radius>5</Radius>
<Intensity>2</Intensity>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="-0.030024644" Y="0.980793118" Z="-0.242380202"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
resources/Schema/Entities/WeaponAssaultBlueView.xml
+1 -1
View File
@@ -72,7 +72,7 @@
<Entity name="Idle">
<Components>
<c:Animation>
<AnimationName>IdelF</AnimationName>
<AnimationName>IdleF</AnimationName>
<Play>true</Play>
<Additive>true</Additive>
</c:Animation>