[Orxonox-commit 6149] r10807 - in code/branches/explosionChunksHS15: data/levels data/levels/templates src/orxonox/worldentities src/orxonox/worldentities/pawns
vaydin at orxonox.net
vaydin at orxonox.net
Mon Nov 16 14:44:10 CET 2015
Author: vaydin
Date: 2015-11-16 14:44:09 +0100 (Mon, 16 Nov 2015)
New Revision: 10807
Modified:
code/branches/explosionChunksHS15/data/levels/HeavyCruiser.oxw
code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw
code/branches/explosionChunksHS15/data/levels/iiiJohnVane_EscapeTheBastards.oxw
code/branches/explosionChunksHS15/data/levels/kecks.oxw
code/branches/explosionChunksHS15/data/levels/missionOne.oxw
code/branches/explosionChunksHS15/data/levels/templates/FPS.oxt
code/branches/explosionChunksHS15/data/levels/templates/FPS_HS14.oxt
code/branches/explosionChunksHS15/data/levels/templates/HeavyCruiser.oxt
code/branches/explosionChunksHS15/data/levels/templates/HeavyCruiserBody.oxt
code/branches/explosionChunksHS15/data/levels/templates/ModularSpaceShipTest.oxt
code/branches/explosionChunksHS15/data/levels/templates/bigship.oxt
code/branches/explosionChunksHS15/data/levels/templates/enemyInvader.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff2.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipCollateralDamage.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipDodgeRace.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipEscort.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipFS15.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipGhost.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipH2.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipHXY.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipHXYSL.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipHeartAttack.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipInvader.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipPirate.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipRace.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipRing.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipSpacecruiser.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipSwallow.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipTransporter.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipTransporterSL.oxt
code/branches/explosionChunksHS15/data/levels/templates/spaceshipTurret.oxt
code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc
code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc
code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.h
Log:
added explosioneffects to the xml files
Modified: code/branches/explosionChunksHS15/data/levels/HeavyCruiser.oxw
===================================================================
--- code/branches/explosionChunksHS15/data/levels/HeavyCruiser.oxw 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/HeavyCruiser.oxw 2015-11-16 13:44:09 UTC (rev 10807)
@@ -552,6 +552,11 @@
All Pawns can easily be included into a level using the lua file "HeavyCruiserParts" -->
<Pawn team=1 health=1000 initialhealth=1000 maxhealth=1000 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=10000 name=HeavyCruiser_body radarname = "HeavyCruiser" >
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<attached>
<Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_body.mesh" scale="40" />
@@ -718,6 +723,12 @@
<Pawn team=1 health=300 initialhealth=300 maxhealth=300 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmL radarname = "HIDDEN" >
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
+
<attached>
<Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_sidearmL.mesh" scale="40" />
</attached>
@@ -757,6 +768,13 @@
</Pawn>
<Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmLfront radarname = "HIDDEN" >
+
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
+
<attached>
<Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_sidearmLfront.mesh" scale="40" />
</attached>
@@ -771,6 +789,11 @@
</Pawn>
<Pawn team=1 health=300 initialhealth=300 maxhealth=300 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmR radarname = "HIDDEN" >
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<attached>
<Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_sidearmR.mesh" scale="40" />
</attached>
@@ -810,6 +833,11 @@
</Pawn>
<Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=sidearmRfront radarname = "HIDDEN" >
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<attached>
<Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_sidearmRfront.mesh" scale="40" />
</attached>
@@ -824,6 +852,11 @@
</Pawn>
<Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_frontL radarname = "HIDDEN" >
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<attached>
<Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_frontL.mesh" scale="40" />
</attached>
@@ -835,6 +868,11 @@
</Pawn>
<Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_frontR radarname = "HIDDEN" >
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<attached>
<Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_frontR.mesh" scale="40" />
</attached>
@@ -846,6 +884,11 @@
</Pawn>
<Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_partL radarname = "HIDDEN" >
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<attached>
<Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_partL.mesh" scale="40" />
</attached>
@@ -857,6 +900,11 @@
</Pawn>
<Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_partR radarname = "HIDDEN" >
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<attached>
<Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_partR.mesh" scale="40" />
</attached>
Modified: code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw 2015-11-16 13:44:09 UTC (rev 10807)
@@ -64,10 +64,6 @@
<ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
<ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
<ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
- <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
- <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
- <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
- <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
</explosion>
</SpaceShip>
@@ -80,6 +76,8 @@
</templates>
<explosion>
+ <ExplosionPart mesh="WingDebris1.mesh" />
+ <ExplosionPart mesh="WingDebris2.mesh" />
</explosion>
Modified: code/branches/explosionChunksHS15/data/levels/iiiJohnVane_EscapeTheBastards.oxw
===================================================================
--- code/branches/explosionChunksHS15/data/levels/iiiJohnVane_EscapeTheBastards.oxw 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/iiiJohnVane_EscapeTheBastards.oxw 2015-11-16 13:44:09 UTC (rev 10807)
@@ -287,6 +287,11 @@
<WaypointController team=1>
</WaypointController>
</controller>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
</Pawn>
<Billboard position="0,0,-1540" amplitude=1 material="Flares/lensflare" colour="0,0.8,0.1">
Modified: code/branches/explosionChunksHS15/data/levels/kecks.oxw
===================================================================
--- code/branches/explosionChunksHS15/data/levels/kecks.oxw 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/kecks.oxw 2015-11-16 13:44:09 UTC (rev 10807)
@@ -347,7 +347,7 @@
<!-- Boxen um Flotte zu befreien -->
- <Pawn health=20 position="0, 112900, 0" direction="0,-1,0" name="boxDestroyed" collisionType=dynamic mass=100000 radarname = "Gravitation Box" >
+ <Pawn health=20 position="0, 112900, 0" direction="0,-1,0" name="boxDestroyed" collisionType=dynamic mass=100000 radarname = "Gravitation Box" explosionchunks=0 >
<attached>
<Model position="0,0,0" scale="10" mesh="CuboidBody.mesh" />
</attached>
@@ -358,6 +358,11 @@
<WaypointController team=1>
</WaypointController>
</controller>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
</Pawn>
Modified: code/branches/explosionChunksHS15/data/levels/missionOne.oxw
===================================================================
--- code/branches/explosionChunksHS15/data/levels/missionOne.oxw 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/missionOne.oxw 2015-11-16 13:44:09 UTC (rev 10807)
@@ -525,6 +525,11 @@
<WaypointController team=1>
</WaypointController>
</controller>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
</Pawn>
<Pawn health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box radarname = "Box 3">
@@ -543,6 +548,11 @@
<WaypointController team=1>
</WaypointController>
</controller>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
</Pawn>
<Pawn health=30 position="0,200,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box radarname = "Box 2">
@@ -561,6 +571,11 @@
<collisionShapes>
<BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
</Pawn>
<Pawn health=30 position="0,300,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box radarname = "Box 1">
@@ -579,6 +594,11 @@
<WaypointController team=1>
</WaypointController>
</controller>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
</Pawn>
<!-- @Triggers: boxtrigger1 <-> one box destroyed
Modified: code/branches/explosionChunksHS15/data/levels/templates/FPS.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/FPS.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/FPS.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -23,6 +23,11 @@
<collisionShapes> <!-- old values: position="0,-20,0" halfExtents="15,25,15" -->
<BoxCollisionShape position="0,-25,0" halfExtents="15,20,15" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<camerapositions>
<CameraPosition position="-1,1,2.2" drag=false mouselook=true />
Modified: code/branches/explosionChunksHS15/data/levels/templates/FPS_HS14.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/FPS_HS14.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/FPS_HS14.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -28,6 +28,11 @@
<camerapositions>
<CameraPosition position="-1,1,2.2" drag=false mouselook=true />
</camerapositions>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<?lua
include("../includes/weaponSettingsFPS_HS14.oxi")
Modified: code/branches/explosionChunksHS15/data/levels/templates/HeavyCruiser.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/HeavyCruiser.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/HeavyCruiser.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -382,6 +382,11 @@
<BoxCollisionShape position="-11,18,58" halfExtents="10,10,10" info="HOOK, frontL"/>
<BoxCollisionShape position="11,18,58" halfExtents="10,10,10" info="HOOK, frontR"/> -->
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<?lua
include("../includes/weaponSettingsHeavyCruiser.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/HeavyCruiserBody.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/HeavyCruiserBody.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/HeavyCruiserBody.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -209,6 +209,11 @@
<BoxCollisionShape position="-11,18,58" halfExtents="10,10,10" info="frontL, HOOK"/>
<BoxCollisionShape position="11,18,58" halfExtents="10,10,10" info="frontR, HOOK"/> -->
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<?lua
include("../includes/weaponSettingsHeavyCruiserBody.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/ModularSpaceShipTest.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/ModularSpaceShipTest.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/ModularSpaceShipTest.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -115,6 +115,12 @@
<collisionShapes>
<BoxCollisionShape position="0,0,0" halfExtents="30,30,30" />
</collisionShapes>
+
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
<?lua
include("../includes/weaponSettingsAssff.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/bigship.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/bigship.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/bigship.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -82,6 +82,18 @@
<BoxCollisionShape position="0,0,-18" halfExtents="6, 2, 18" />
</collisionShapes>
+
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsbigship.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/enemyInvader.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/enemyInvader.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/enemyInvader.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -54,6 +54,17 @@
<BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
<BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/invaderWeapon.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -55,6 +55,17 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsAssff.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff2.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff2.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff2.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -54,6 +54,17 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsAssff2.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipCollateralDamage.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipCollateralDamage.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipCollateralDamage.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -62,8 +62,20 @@
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
+
+
<?lua
include("../includes/weaponSettingsCollateral.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipDodgeRace.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipDodgeRace.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipDodgeRace.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -59,6 +59,17 @@
<BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
<BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/invaderWeapon.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipEscort.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipEscort.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipEscort.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -55,6 +55,17 @@
<BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
<BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsEscort.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipFS15.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipFS15.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipFS15.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -62,6 +62,18 @@
<BoxCollisionShape position="5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
<BoxCollisionShape position="-5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
</collisionShapes>
+
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsFS15.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipGhost.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipGhost.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipGhost.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -51,6 +51,17 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsGhost.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipH2.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipH2.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipH2.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -40,7 +40,18 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
+
</SpaceShip>
</Template>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipHXY.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipHXY.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipHXY.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -34,7 +34,18 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
+
<?lua
include("../includes/weaponSettingsHXY.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipHXYSL.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipHXYSL.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipHXYSL.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -33,7 +33,18 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
+
<?lua
include("../includes/weaponSettingsHXY.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipHeartAttack.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipHeartAttack.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipHeartAttack.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -62,6 +62,17 @@
<BoxCollisionShape position="5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
<BoxCollisionShape position="-5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsHeartAttack.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipInvader.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipInvader.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipInvader.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -58,6 +58,17 @@
<BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
<BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/invaderWeapon.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipPirate.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipPirate.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipPirate.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -52,7 +52,18 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
+
<?lua
include("../includes/weaponSettingsPirate.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipRace.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipRace.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipRace.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -56,6 +56,17 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsAssff.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipRing.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipRing.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipRing.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -52,6 +52,17 @@
<BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
<BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsRing.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipSpacecruiser.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipSpacecruiser.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipSpacecruiser.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -65,6 +65,17 @@
<BoxCollisionShape position="0,4,-59" halfExtents="18,1,16" pitch=-30/>
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsSpacecruiser.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipSwallow.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipSwallow.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipSwallow.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -48,6 +48,17 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsSwallow.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipTransporter.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipTransporter.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipTransporter.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -33,7 +33,18 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
+
<?lua
include("../includes/weaponSettingsTransporter.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipTransporterSL.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipTransporterSL.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipTransporterSL.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -33,7 +33,18 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
+
<?lua
include("../includes/weaponSettingsTransporter.oxi")
?>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipTurret.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipTurret.oxt 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipTurret.oxt 2015-11-16 13:44:09 UTC (rev 10807)
@@ -43,6 +43,17 @@
<collisionShapes>
<SphereCollisionShape radius="10" position = "0,0,0"/>
</collisionShapes>
+ <explosion >
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
<?lua
include("../includes/weaponSettingsTurret.oxi")
?>
Modified: code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc
===================================================================
--- code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc 2015-11-16 13:44:09 UTC (rev 10807)
@@ -119,7 +119,7 @@
if (GameMode::isMaster())
{
- this->destroyTimer_.setTimer(rnd(2, 3), false, createExecutor(createFunctor(&ExplosionPart::stop, this)));
+ this->destroyTimer_.setTimer(rnd(2, 4), false, createExecutor(createFunctor(&ExplosionPart::stop, this)));
}
}
Modified: code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc 2015-11-16 13:44:09 UTC (rev 10807)
@@ -373,7 +373,6 @@
}
if (GameMode::isMaster())
{
- //this->deatheffect();
this->goWithStyle();
}
}
@@ -394,97 +393,16 @@
explosionPartList_.pop_back();
}
- this->explosionSound_->setPosition(this->getPosition());
- this->explosionSound_->play();
- }
- void Pawn::deatheffect()
- {
- orxout() << "deatheffect" << endl;
- // play death effect
- /*{
- ParticleSpawner* effect = new ParticleSpawner(this->getContext());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("Orxonox/explosion2b");
- effect->setLifetime(4.0f);
- }
- {
- ParticleSpawner* effect = new ParticleSpawner(this->getContext());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("Orxonox/smoke6");
- effect->setLifetime(4.0f);
- }
- {
- ParticleSpawner* effect = new ParticleSpawner(this->getContext());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("Orxonox/sparks");
- effect->setLifetime(4.0f);
- }*/
-
-
- {
- ParticleSpawner* effect = new ParticleSpawner(this->getContext());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("orxonox/explosion_flash2");
- effect->setLifetime(5.0f);
- }
- {
- ParticleSpawner* effect = new ParticleSpawner(this->getContext());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("orxonox/explosion_flame2");
- effect->setLifetime(5.0f);
- }
- {
- ParticleSpawner* effect = new ParticleSpawner(this->getContext());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("orxonox/explosion_shockwave2");
- effect->scale(20);
- effect->setLifetime(5.0f);
- }{
- ParticleSpawner* effect = new ParticleSpawner(this->getContext());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("orxonox/explosion_sparks2");
- effect->setLifetime(5.0f);
- }
- {
- ParticleSpawner* effect = new ParticleSpawner(this->getContext());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("orxonox/explosion_streak2");
- effect->setLifetime(5.0f);
- }
- {
- ParticleSpawner* effect = new ParticleSpawner(this->getContext());
- effect->setPosition(this->getPosition());
- effect->setOrientation(this->getOrientation());
- effect->setDestroyAfterLife(true);
- effect->setSource("orxonox/explosion_afterglow");
- effect->scale(20);
- effect->setLifetime(5.0f);
- }
-
-
for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
{
ExplosionChunk* chunk = new ExplosionChunk(this->getContext());
chunk->setPosition(this->getPosition());
}
- }
+ this->explosionSound_->setPosition(this->getPosition());
+ this->explosionSound_->play();
+ }
+
void Pawn::fired(unsigned int firemode)
{
if (this->weaponSystem_)
Modified: code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.h 2015-11-16 13:16:49 UTC (rev 10806)
+++ code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.h 2015-11-16 13:44:09 UTC (rev 10807)
@@ -208,7 +208,6 @@
virtual bool hasSlaves();
virtual Controller* getSlave();
virtual void goWithStyle();
- virtual void deatheffect();
virtual void spawneffect();
//virtual void damage(float damage, Pawn* originator = 0);
More information about the Orxonox-commit
mailing list