[Orxonox-commit 6729] r11357 - in code/trunk: . data/levels data/levels/templates src
patricwi at orxonox.net
patricwi at orxonox.net
Thu Mar 9 16:09:27 CET 2017
Author: patricwi
Date: 2017-03-09 16:09:27 +0100 (Thu, 09 Mar 2017)
New Revision: 11357
Added:
code/trunk/data/levels/Endurancefinal.oxw
code/trunk/data/levels/templates/endurancetest_template.oxt
code/trunk/data/levels/templates/test11.oxt
code/trunk/src/test.txt
Modified:
code/trunk/
code/trunk/data/levels/HeavyCruiser.oxw
code/trunk/data/levels/emptyLevel.oxw
Log:
big ship merged
Property changes on: code/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/AI_HS15:10640-10832
/code/branches/HUD_HS16:11212-11353
/code/branches/Highscore_HS16:11226-11355
/code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/campaignHS15:10639-10973
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/clangenb:10385-10609
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/core7:10328-10623
/code/branches/cpp11:10439-10732
/code/branches/cpp11_v2:10732-11067
/code/branches/cpp11_v3:11053-11070
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/explosionChunksHS15:10641-10961
/code/branches/fabienHS15:10685-11033
/code/branches/formation:8885-8991
/code/branches/formationFS15:10320-10610
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hoverHS15:10633-10959
/code/branches/hud:8883-8986
/code/branches/hudHS14:10083-10241
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/multiplayerFS15:10324-10611
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particleEffectsHS15:10644-10962
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/pickupsFS14:10000-10259
/code/branches/planetLevelHS15:10637-10966
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationFS15:10499
/code/branches/presentationFS15merge:10595-10621
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/presentationHS14merge:10222-10257
/code/branches/presentationHS15:10959-11055
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shaders:9379-11072
/code/branches/shaders_merge:11072-11079
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/soundEffects:9382-11020
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/storymodeHS14:10085-10254
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/towerdefenseFS15:10283-10614
/code/branches/towerdefenseHS14:10086-10247
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weaponFS15:10302-10615
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
+ /code/branches/AI_HS15:10640-10832
/code/branches/BigShip_HS16:11213-11356
/code/branches/HUD_HS16:11212-11353
/code/branches/Highscore_HS16:11226-11355
/code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/campaignHS15:10639-10973
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/clangenb:10385-10609
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/core7:10328-10623
/code/branches/cpp11:10439-10732
/code/branches/cpp11_v2:10732-11067
/code/branches/cpp11_v3:11053-11070
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/explosionChunksHS15:10641-10961
/code/branches/fabienHS15:10685-11033
/code/branches/formation:8885-8991
/code/branches/formationFS15:10320-10610
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hoverHS15:10633-10959
/code/branches/hud:8883-8986
/code/branches/hudHS14:10083-10241
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/multiplayerFS15:10324-10611
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particleEffectsHS15:10644-10962
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/pickupsFS14:10000-10259
/code/branches/planetLevelHS15:10637-10966
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationFS15:10499
/code/branches/presentationFS15merge:10595-10621
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/presentationHS14merge:10222-10257
/code/branches/presentationHS15:10959-11055
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shaders:9379-11072
/code/branches/shaders_merge:11072-11079
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/soundEffects:9382-11020
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/storymodeHS14:10085-10254
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/towerdefenseFS15:10283-10614
/code/branches/towerdefenseHS14:10086-10247
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weaponFS15:10302-10615
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
Copied: code/trunk/data/levels/Endurancefinal.oxw (from rev 11356, code/branches/BigShip_HS16/data/levels/Endurancefinal.oxw)
===================================================================
--- code/trunk/data/levels/Endurancefinal.oxw (rev 0)
+++ code/trunk/data/levels/Endurancefinal.oxw 2017-03-09 15:09:27 UTC (rev 11357)
@@ -0,0 +1,42 @@
+<LevelInfo
+ name = "Endurancefinal"
+ description = "Endurance Bigship."
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+ include("templates/HeavyCruiser.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipEscort.oxt")
+ include("templates/endurancetest_template.oxt")
+?>
+
+<Level>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+ <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+
+ <ModularSpaceShip velocity= "20,0,0" position="0,0,200" lookat= "0,0,0" health="1000" maxhealth="1000" initialhealth="1000">
+ <templates>
+ <Template link=endurance />
+ </templates>
+ </ModularSpaceShip>
+
+ </Scene>
+</Level>
+
Modified: code/trunk/data/levels/HeavyCruiser.oxw
===================================================================
--- code/trunk/data/levels/HeavyCruiser.oxw 2017-03-09 14:38:58 UTC (rev 11356)
+++ code/trunk/data/levels/HeavyCruiser.oxw 2017-03-09 15:09:27 UTC (rev 11357)
@@ -33,7 +33,7 @@
>
<!-- HeavyCruiser and all its parts in one static entity -->
- <StaticEntity position="-300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
+ <!--StaticEntity position="-300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
<attached>
<Model mesh="HeavyCruiser_body.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
<Model mesh="HeavyCruiser_frontR.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
@@ -45,19 +45,18 @@
<Model mesh="HeavyCruiser_sidearmR.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
<Model mesh="HeavyCruiser_sidearmRfront.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
- <!-- bay1 lights -->
<BlinkingBillboard position="75,30,-416" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.05 frequency=0.3 phase=240 quadratic=1 />
<BlinkingBillboard position="-75,30,-416" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.05 frequency=0.3 phase=240 quadratic=1 />
<BlinkingBillboard position="74,30,-402" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.1 frequency=0.3 phase=120 quadratic=1 />
<BlinkingBillboard position="-74,30,-402" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.1 frequency=0.3 phase=120 quadratic=1 />
<BlinkingBillboard position="73,30,-388" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.15 frequency=0.3 phase=0 quadratic=1 />
<BlinkingBillboard position="-73,30,-388" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.15 frequency=0.3 phase=0 quadratic=1 />
- <!-- front position lights -->
+
<BlinkingBillboard position="67,-5,-240" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
<BlinkingBillboard position="-67,-5,-240" material="Examples/Flare" colour="0.7, 0, 0, 0.1" amplitude=0.3 frequency=0.15 phase=360 quadratic=1 />
<BlinkingBillboard position="72,51,-380" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=360 quadratic=1 />
<BlinkingBillboard position="-72,51,-380" material="Examples/Flare" colour="0.7, 0, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
- <!-- rear position lights -->
+
<BlinkingBillboard position="95,-15,483" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=360 quadratic=1 />
<BlinkingBillboard position="-95,-15,483" material="Examples/Flare" colour="0.7, 0, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
<BlinkingBillboard position="74,103,524" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
@@ -292,18 +291,11 @@
<BoxCollisionShape position="0,18,91" halfExtents="23,12,1" info="HOOKBOX, wide"/>
<BoxCollisionShape position="0,18,69" halfExtents="23,12,1" info="HOOKBOX, wide"/>
<BoxCollisionShape position="0,18,47" halfExtents="23,12,1" info="HOOKBOX, wide"/>
-
-<!-- <BoxCollisionShape position="-11,18,102" halfExtents="10,10,10" info="HOOK, sidearmL"/>
- <BoxCollisionShape position="11,18,102" halfExtents="10,10,10" info="HOOK, sidearmR"/>
- <BoxCollisionShape position="-11,18,80" halfExtents="10,10,10" info="HOOK, partL"/>
- <BoxCollisionShape position="11,18,80" halfExtents="10,10,10" info="HOOK, partR"/>
- <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>
- </StaticEntity>
+ </StaticEntity-->
<!-- Width/Height/Lenght--><!-- B=back F=front C=center-->
- <StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
+ <!--StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
<attached>
<Model position="80,33,-320" mesh="cube.mesh" scale3D="7,11,54" info="frontR"/>
<Model position="79,31,-399" mesh="cube.mesh" scale3D="3,6,26" info="frontR"/>
@@ -358,9 +350,7 @@
<Model position="153,60,-65" roll="-15" mesh="cube.mesh" scale3D="4,3,4" info="sidearmRfront, top"/>
<Model position="153,59,-41" roll="-15" mesh="cube.mesh" scale3D="8,2,11" info="sidearmRfront, top"/>
- <!--<Model position="145,21,50" mesh="cube.mesh" scale3D="10,10,20" info="sidearmRfront, HOOK"/>-->
-
<Model position="-109,47,87" mesh="cube.mesh" scale3D="29,8,26" info="sidearmL, upper connection"/>
<Model position="-99,-1,79" roll="15" mesh="cube.mesh" scale3D="40,4,9" info="sidearmL, lower connection"/>
<Model position="-151,47,115" roll="15" mesh="cube.mesh" scale3D="16,2,105" info="sidearmL, frontTop"/>
@@ -398,9 +388,7 @@
<Model position="-153,60,-65" roll="15" mesh="cube.mesh" scale3D="4,3,4" info="sidearmLfront, top"/>
<Model position="-153,59,-41" roll="15" mesh="cube.mesh" scale3D="8,2,11" info="sidearmLfront, top"/>
- <!--<Model position="-145,21,50" mesh="cube.mesh" scale3D="10,10,20" info="sidearmLfront, HOOK"/>-->
-
<Model position="60,35,-310" mesh="cube.mesh" scale3D="13,28,60" info="body, bay1, Rwall"/>
<Model position="-60,35,-310" mesh="cube.mesh" scale3D="13,28,60" info="body, bay1, Lwall"/>
<Model position="0,56,-310" mesh="cube.mesh" scale3D="65,6,60" info="body, bay1, Twall"/>
@@ -543,7 +531,7 @@
</attached>
<collisionShapes>
</collisionShapes>
- </StaticEntity>
+ </StaticEntity-->
@@ -737,7 +725,7 @@
</collisionShapes>
</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_sidearmL radarname = "HIDDEN" >
+ <!--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 offset="-140,0,115" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
@@ -751,15 +739,12 @@
<collisionShapes>
<BoxCollisionShape position="-11,18,102" halfExtents="10,10,10" info="HOOK, sidearmL"/>
- <!-- <BoxCollisionShape position="-109,47,87" halfExtents="29,8,26" info="sidearmL, upper connection"/>
- <BoxCollisionShape position="-99,-1,79" roll="15" halfExtents="40,4,9" info="sidearmL, lower connection"/>-->
<BoxCollisionShape position="-151,47,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontTop"/>
<BoxCollisionShape position="-136,-7,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontBottom"/>
<BoxCollisionShape position="-127,26,115" roll="15" halfExtents="2,28,105" info="sidearmL, frontInner"/>
<BoxCollisionShape position="-161,16,115" roll="15" halfExtents="2,28,105" info="sidearmL, frontOuter"/>
<BoxCollisionShape position="-145,21,12" roll="15" halfExtents="16,28,2" info="sidearmL, front"/>
<BoxCollisionShape position="-140,12,261" roll="15" halfExtents="22,41,43" info="sidearmL, back"/>
- <!--<BoxCollisionShape position="-145,25,5" roll="15" halfExtents="10,18,5" info="sidearmL, front break"/>-->
<BoxCollisionShape position="-133,-13,29" roll="15" halfExtents="12,6,17" info="sidearmL, bottom cylinder"/>
<BoxCollisionShape position="-165,-4,31" roll="15" halfExtents="7,21,13" info="sidearmL, box"/>
<BoxCollisionShape position="-153,59,96" roll="15" halfExtents="6,7,60" info="sidearmL, upper beam"/>
@@ -815,16 +800,12 @@
</attached>
<collisionShapes>
<BoxCollisionShape position="11,18,102" halfExtents="10,10,10" info="HOOK, sidearmR"/>
-
- <!--<BoxCollisionShape position="109,47,87" halfExtents="29,8,26" info="sidearmR, upper connection"/>
- <BoxCollisionShape position="99,-1,79" roll="-15" halfExtents="40,4,9" info="sidearmR, lower connection"/>-->
<BoxCollisionShape position="151,47,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontTop"/>
<BoxCollisionShape position="136,-7,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontBottom"/>
<BoxCollisionShape position="127,26,115" roll="-15" halfExtents="2,28,105" info="sidearmR, frontInner"/>
<BoxCollisionShape position="161,16,115" roll="-15" halfExtents="2,28,105" info="sidearmR, frontOuter"/>
<BoxCollisionShape position="145,21,12" roll="-15" halfExtents="16,28,2" info="sidearmR, front"/>
<BoxCollisionShape position="140,12,261" roll="-15" halfExtents="22,41,43" info="sidearmR, back"/>
- <!--<BoxCollisionShape position="145,25,5" roll="-15" halfExtents="10,18,5" info="sidearmR, front break"/>-->
<BoxCollisionShape position="133,-13,29" roll="-15" halfExtents="12,6,17" info="sidearmR, bottom cylinder"/>
<BoxCollisionShape position="165,-4,31" roll="-15" halfExtents="7,21,13" info="sidearmR, box"/>
<BoxCollisionShape position="153,59,96" roll="-15" halfExtents="6,7,60" info="sidearmR, upper beam"/>
@@ -929,7 +910,7 @@
<BoxCollisionShape position="94,33,-179" halfExtents="11,13,45" info="partR"/>
<BoxCollisionShape position="96,33,-230" halfExtents="13,17,22" info="partR"/>
</collisionShapes>
- </Pawn>
+ </Pawn-->
@@ -937,27 +918,6 @@
<SpawnPoint team=0 position="0,0,0" lookat="0,0,-100" spawnclass=SpaceShip pawndesign=HeavyCruiserBody />
- <?lua
- --[[
- With this lua script, the sub-parts of HeavyCruiser can easily be inserted into a level.
- Available functions are:
- To place all subparts:
- placeAllSubParts(team, posX, posY, posZ, dirX, dirY, dirZ)
- To place individual parts:
- placeFrontL(...) Use the same arguments as in placeAllSubParts
- placeFrontR(...)
- placePartL(...)
- placePartR(...)
- placeSidearmL(...)
- placeSidearmLfront(...)
- placeSidearmR(...)
- placeSidearmRfront(...)
- ]]--
-
- dofile("includes/HeavyCruiserParts.lua")
- placeAllSubParts(0, 0,0,0, 0,0,0)
- ?>
-
<!-- <SpawnPoint team=0 position="0,-200,0" lookat="0,-200,-100" spawnclass=SpaceShip pawndesign=HeavyCruiser /> -->
<!-- <SpawnPoint team=0 position="0,-100,0" lookat="0,-100,0" spawnclass=SpaceShip pawndesign=spaceshipassff /> -->
Modified: code/trunk/data/levels/emptyLevel.oxw
===================================================================
--- code/trunk/data/levels/emptyLevel.oxw 2017-03-09 14:38:58 UTC (rev 11356)
+++ code/trunk/data/levels/emptyLevel.oxw 2017-03-09 15:09:27 UTC (rev 11357)
@@ -1,5 +1,5 @@
<LevelInfo
- name = "Empty level"
+ name = "emptyLevel"
description = "A level with absolutely nothing in it."
tags = "test"
screenshot = "emptylevel.png"
@@ -9,10 +9,12 @@
include("stats.oxo")
include("HUDTemplates3.oxo")
include("templates/lodInformation.oxt")
+ include("templates/HeavyCruiser.oxt")
?>
<?lua
include("templates/spaceshipEscort.oxt")
+ include("templates/endurancetest_template.oxt")
?>
<Level>
@@ -28,6 +30,12 @@
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
<SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+
+ <ModularSpaceShip velocity= "20,0,0" position="0,0,200" lookat= "0,0,0" health="1000" maxhealth="1000" initialhealth="1000">
+ <templates>
+ <Template link=endurance />
+ </templates>
+ </ModularSpaceShip>
</Scene>
</Level>
Copied: code/trunk/data/levels/templates/endurancetest_template.oxt (from rev 11356, code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt)
===================================================================
--- code/trunk/data/levels/templates/endurancetest_template.oxt (rev 0)
+++ code/trunk/data/levels/templates/endurancetest_template.oxt 2017-03-09 15:09:27 UTC (rev 11357)
@@ -0,0 +1,813 @@
+<Template name = endurance>
+
+ <!-- Spaceship parameters -->
+
+ <ModularSpaceShip
+ name = endurance
+ collisionType= "dynamic"
+ mass = 10000000
+
+ health = 1000
+ initialhealth = 1000
+ maxhealth = 1000
+
+
+
+
+ rotationaxis = "1,0,0"
+
+
+ rotationrate = "5"
+ >
+
+ <!-- Destructible parts -->
+
+ <parts>
+
+ <ShipPart name = "tunnelsystem" initialhealth="1000" maxhealth="1000" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "mistery1" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "mistery2" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "EnduranceSmallShip1" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "EnduranceSmallShip2" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct12" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct11" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct10" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct9" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct8" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct7" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct6" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct5" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct4" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct3" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct2" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "ct1" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part1" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct12" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct11" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part2" initialhealth="10" maxhealth="10" damageabsorption="0.9" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct11" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct10" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part3" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct10" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct9" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part4" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct9" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct8" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part5" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct8" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct7" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part6" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct7" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct6" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part7" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct6" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct5" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part8" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct5" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct4" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part9" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct4" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct3" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part10" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct3" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct2" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part11" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct2" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct1" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ <ShipPart name = "part12" initialhealth="10" maxhealth="10" damageabsorption="0.5" explosionposition="0,0,0">
+ <destructionevents>
+ <PartDestructionEvent targetType="ship" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct1" operation="destroy" />
+ <PartDestructionEvent targetType="part" targetName ="ct12" operation="destroy" />
+ </destructionevents>
+ </ShipPart>
+
+ </parts>
+
+ <!-- Explosion effects -->
+
+ <explosion >
+
+
+ <ExplosionPart scale = 5 minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart scale = 5 minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart scale = 5 minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ <ExplosionPart offset="94,33,-50" delay=1 minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart offset="94,33,-50" delay=1 minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart offset="94,33,-50" delay=1 minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart scale = 2.5 mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart scale = 2.5 mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart scale = 2.5 mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart scale = 2.5 mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart scale = 2.5 mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart scale = 2.5 mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart scale = 2.5 mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart scale = 2.5 mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart delay=0.8 scale = 2.5 mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart delay=0.8 scale = 2.5 mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart delay=0.8 scale = 2.5 mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart delay=0.8 scale = 2.5 mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+
+ <ExplosionPart offset="20,13,-15" delay=1.3 minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart offset="30,13,-15" delay=1.3 minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart offset="20,13,-15" delay=1.3 minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ <ExplosionPart offset="-20,-13,-15" delay=1.8 minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart offset="-20,-13,-15" delay=1.8 minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart offset="-20,-13,-15" delay=1.8 minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+ </explosion>
+
+
+ <attached>
+
+
+
+
+ <Model mesh="Endurance_Tunnelsystem.mesh" scale="66" lookat="0,0,0" pitch="-30" yaw="0" roll="90" />
+
+
+ <!-- coordinates (0,0,0) element 0-->
+
+ <!-- Small-Ship 1/2 -->
+
+ <StaticEntity name = "EnduranceSmallShip1" collisionType=static position ="21,14.4,-9.6" pitch="60" yaw="0" roll="90" >
+ <attached>
+ <Model mesh="Endurance_Small_Ship.mesh" scale="36" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,-25,2.5" halfExtents="15,30,1" />
+ <BoxCollisionShape position ="0,5,-7" halfExtents="7,7,7" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- Small-Ship 1/2 -->
+
+ <StaticEntity name = "EnduranceSmallShip2" collisionType=static position ="21,-14.4,9.6" pitch="-120" yaw="0" roll="90" >
+ <attached>
+ <Model mesh="Endurance_Small_Ship.mesh" scale="36" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,-25,2.5" halfExtents="15,30,1" />
+ <BoxCollisionShape position ="3,5,-7" halfExtents="7,7,7" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- Tunnelsystem -->
+
+ <StaticEntity name = "tunnelsystem"collisionType=static position ="0,0,0" lookat="0,0,0" pitch="-30" yaw="0" roll="90" >
+ <attached>
+ <Model mesh="Endurance_Tunnelsystem.mesh" scale="66" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position = "30,0,0" halfExtents="65,9,9" />
+ <BoxCollisionShape position = "0,40,0" halfExtents="8,30,8" />
+ <BoxCollisionShape position = "0,-20,0" halfExtents="7,12,7" />
+ <BoxCollisionShape position = "0,0,18" halfExtents="8,8,12" />
+ <BoxCollisionShape position = "0,0,-18" halfExtents="8,8,12" />
+ <BoxCollisionShape position = "-39,0,0" halfExtents="5,5,7" />
+
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- ct12 -->
+
+ <StaticEntity name ="ct12" collisionType=static position ="0,-30,105" yaw="0" roll="90" pitch="-60" >
+ <attached>
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- 2 Mistery elements -->
+
+ <StaticEntity name = "mistery1" collisionType=static position ="0,-6,-9.6" yaw="0" roll="90" pitch="-30" >
+ <attached>
+
+ <Model mesh="Endurance_Mystery.mesh" scale="48" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,-28" halfExtents="25,32,8" />
+ <BoxCollisionShape position ="0,-30,-28" halfExtents="25,8,8" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <StaticEntity name = "mistery2" collisionType=static position ="0,3.6,7.2" yaw="0" roll="90" pitch="150" >
+ <attached>
+
+ <Model mesh="Endurance_Mystery.mesh" scale="48" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,-28" halfExtents="25,32,8" />
+ <BoxCollisionShape position ="0,-30,-28" halfExtents="25,8,8" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (100,0,0) element 1-->
+
+ <StaticEntity name= "part1" collisionType=static lookat="0,0,0" position ="0,0,120" direction="0,0,0" yaw="-90" roll="-90" pitch="0">
+
+ <attached>
+ <Model mesh="Endurance_MainEngine.mesh" scale="5" />
+
+
+ <ParticleEmitter scale=5 position= "0,-5,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ <ParticleEmitter scale=5 position= "0,3,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ <ParticleEmitter scale=5 position= "0,10,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,-5" halfExtents="14,22,30" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+
+ <!-- ct11 -->
+
+ <StaticEntity name = "ct11" collisionType=static position ="0,30,105" yaw="0" roll="90" pitch="270" >
+ <attached>
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (86,50,0) element 2 -->
+
+ <StaticEntity name = "part2" collisionType=static lookat="0,0,0" position ="0,60,103.2" direction="0,0,0" yaw="0" roll="-90">
+ <attached>
+ <Model mesh="Endurance_Habitat.mesh" scale="5" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,3" halfExtents="14,24,26" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- ct10 -->
+
+ <StaticEntity name ="ct10" collisionType=static position ="0,78,78" yaw="0" roll="90" pitch="240" >
+ <attached>
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (50,86,0) element 3 -->
+
+ <StaticEntity name="part3" collisionType=static lookat="0,0,0" position ="0,103.2,60" direction="0,0,0" yaw="-90" roll="-90">
+ <attached>
+ <Model mesh="Endurance_MainEngine.mesh" scale="5" />
+
+ <ParticleEmitter scale=5 position= "0,-5,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ <ParticleEmitter scale=5 position= "0,3,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ <ParticleEmitter scale=5 position= "0,10,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,-5" halfExtents="14,22,30" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- ct9 -->
+
+ <StaticEntity name ="ct9" collisionType=static position ="0,105,30" yaw="0" roll="90" pitch="210" >
+ <attached>
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (0,100,0) element 4 -->
+
+ <StaticEntity name ="part4" collisionType=static position ="0,120,0" lookat="0,0,0" yaw="0" roll="-90">
+ <attached>
+ <Model mesh="Endurance_Landig_Module.mesh" scale="5" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,3" halfExtents="14,25,26" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- ct8 -->
+
+ <StaticEntity name ="ct8" collisionType=static position ="0,105,-30" yaw="0" roll="90" pitch="180" >
+ <attached>
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (-50,86,0) element 5 -->
+
+ <StaticEntity name= "part5" collisionType=static position ="0,103.2,-60" lookat="0,0,0" direction="0,0,0" yaw="0" roll="-90">
+ <attached>
+ <Model mesh="Endurance_Habitat.mesh" scale="5" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,3" halfExtents="14,25,26" />
+
+ </collisionShapes>
+
+
+ </StaticEntity>
+
+ <!-- ct7 -->
+
+ <StaticEntity name ="ct7" collisionType=static position ="0,78,-78" yaw="0" roll="90" pitch="150" >
+ <attached>
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (-86,50,0) element 6 -->
+
+ <StaticEntity name="part6" collisionType=static position ="0,60,-103.2" lookat="0,0,0" yaw="0" roll="-90" >
+ <attached>
+ <Model mesh="Endurance_Landig_Module.mesh" scale="5" />
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,3" halfExtents="14,25,26" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- ct6 -->
+
+ <StaticEntity name ="ct6" collisionType=static position ="0,30,-105" yaw="0" roll="90" pitch="120" >
+ <attached>
+
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (-100,0,0) element 7 -->
+
+ <StaticEntity name= "part7" collisionType=static position ="0,0,-120" lookat="0,0,0" direction="0,0,0" yaw="90" roll="90">
+ <attached>
+ <Model mesh="Endurance_MainEngine.mesh" scale="5" />
+
+ <ParticleEmitter scale=5 position= "0,-5,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ <ParticleEmitter scale=5 position= "0,3,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ <ParticleEmitter scale=5 position= "0,10,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,-5" halfExtents="14,22,30" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- ct5 -->
+
+ <StaticEntity name ="ct5" collisionType=static position ="0,-30,-105" yaw="0" roll="90" pitch="90" >
+ <attached>
+
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+
+ <!-- coordinates (-86,-50,0) element 8 -->
+
+ <StaticEntity name ="part8" collisionType=static position ="0,-60,-103.2" lookat="0,0,0" direction="0,0,0" yaw="0" roll="-90" >
+ <attached>
+ <Model mesh="Endurance_Habitat.mesh" scale="5" />
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,2" halfExtents="14,25,26" />
+
+ </collisionShapes>
+
+
+ </StaticEntity>
+
+ <!-- ct4 -->
+
+ <StaticEntity name ="ct4" collisionType=static position ="0,-78,-78" yaw="0" roll="90" pitch="60" >
+ <attached>
+
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (-50,-86,0) element 9 -->
+
+ <StaticEntity name="part9" collisionType=static position ="0,-103.2,-60" lookat="0,0,0" direction="0,0,0" yaw="-90" roll="-90">
+ <attached>
+ <Model mesh="Endurance_MainEngine.mesh" scale="5" />
+
+ <ParticleEmitter scale=5 position= "0,-5,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ <ParticleEmitter scale=5 position= "0,3,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ <ParticleEmitter scale=5 position= "0,10,28" source="Orxonox/thruster2" lifetime=2.0 loop=1 startdelay=0.0 />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,-5" halfExtents="14,22,30" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- ct3 -->
+
+ <StaticEntity name ="ct3" collisionType=static position ="0,-105,-30" yaw="0" roll="90" pitch="30" >
+ <attached>
+
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (0,-100,0) element 10 -->
+
+ <StaticEntity name ="part10" collisionType=static position ="0,-120,0" lookat="0,0,0" yaw="0" roll="-90">
+ <attached>
+
+ <Model mesh="Endurance_Landig_Module.mesh" scale="5" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,2" halfExtents="14,25,26" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- ct2 -->
+
+ <StaticEntity name ="ct2" collisionType=static position ="0,-105,30" yaw="0" roll="90" pitch="0" >
+ <attached>
+
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (50,-86,0) element 11 -->
+
+ <StaticEntity name ="part11" collisionType=static position ="0,-103.2,60" lookat="0,0,0" yaw="0" roll="-90">
+ <attached>
+ <Model mesh="Endurance_Commando_Module.mesh" scale="5" />
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,3" halfExtents="14,25,27" />
+ <BoxCollisionShape position ="0,30,-20" halfExtents="15,5,6" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- connecting tunnel 1 (ct1) -->
+
+ <StaticEntity name ="ct1" collisionType=static position ="0,-78,78" yaw="0" roll="90" pitch="-30" >
+ <attached>
+
+ <Model mesh="Endurance_Connecting_Tunnel.mesh" scale="6" />
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape halfExtents="8,8,10" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+ <!-- coordinates (86,-50,0) element 12 -->
+
+ <StaticEntity name ="part12" collisionType=static position ="0,-60,103.2" lookat="0,0,0" yaw="0" roll="-90">
+ <attached>
+ <Model mesh="Endurance_Landig_Module.mesh" scale="5" />
+
+
+ </attached>
+
+ <collisionShapes>
+
+ <BoxCollisionShape position ="0,0,3" halfExtents="14,25,27" />
+
+ </collisionShapes>
+
+ </StaticEntity>
+
+
+ </attached>
+
+
+
+ </ModularSpaceShip>
+
+</Template>
+
+
+
+
+
Copied: code/trunk/data/levels/templates/test11.oxt (from rev 11356, code/branches/BigShip_HS16/data/levels/templates/test11.oxt)
===================================================================
--- code/trunk/data/levels/templates/test11.oxt (rev 0)
+++ code/trunk/data/levels/templates/test11.oxt 2017-03-09 15:09:27 UTC (rev 11357)
@@ -0,0 +1,99 @@
+<templates>
+
+
+ <Template name = endurance>
+
+ <!-- Spaceship parameters -->
+ <SpaceShip
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = bigshipcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 6
+
+ health = 100
+ maxhealth = 200
+ initialhealth = 100
+
+ shieldhealth = 100
+ initialshieldhealth = 30
+ maxshieldhealth = 50
+ shieldabsorption = 0.8
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
+
+ primaryThrust = 30
+ auxilaryThrust = 30
+ rotationThrust = 10
+
+ lift = 1;
+ stallSpeed = 220;
+
+ boostPower = 30
+ boostPowerRate = 1.5
+ boostRate = 4
+ boostCooldownDuration = 10
+
+ shakeFrequency = 15
+ shakeAmplitude = 9
+
+ collisionType = "dynamic"
+ mass = 1000
+ linearDamping = 0.7
+ angularDamping = 0.9999999
+ >
+
+
+ <!-- Engines of the Spaceship -->
+
+ <engines>
+ <MultiStateEngine position=" 15, 0, 0" template=bigshipengine />
+ <MultiStateEngine position="-15, 0, 0" template=bigshipengine />
+ </engines>
+
+ <!-- Testsphere in testlevel -->
+
+ <MovableEntity position ="0, 0, 0" velocity= "10, 0, 0" collisionType=dynamic mass=1000 friction=0.01 >
+
+ <!-- use attached for the different spaceship parts and the lights -->
+ <!-- BlinkingBillboard class for blinking lights -->
+ <attached>
+ <Model position="0,0,0" mesh="sphere.mesh" scale3D="100,100,100" />
+ </attached>
+
+ <!-- Collision Shapes -->
+
+ <collisionShapes>
+ <SphereCollisionShape position="0,0,0" radius="100" />
+ </collisionShapes>
+ </MovableEntity>
+
+ <!-- Explosion and Explosionparts -->
+
+ <!-- Cameras and Cameraposition -->
+
+ <!-- Multistateengine definition + engine sounds -->
+
+ <!-- Large coordinate axis -->
+ <Model position="0,0,0" mesh="Coordinates.mesh" scale="20"/>
+
+ <!-- Spawnpoint of the Spaceship -->
+ <SpawnPoint team=0 position = "-100,0,0" lookat="0,0,0" spawnclass=Spaceship pawndesign=spaceshippirate />
+
+ <!-- Planets and forcefields -->
+
+
+ <!-- Blacklight to illuminate surfaces -->
+
+
+
+ <!-- Egine sound of the Spaceship -->
+ <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+
+ <!-- World Ambient Sound -->
+
+
+
+ </Spaceship>
+</Template>
+</templates>
\ No newline at end of file
Copied: code/trunk/src/test.txt (from rev 11356, code/branches/BigShip_HS16/src/test.txt)
===================================================================
--- code/trunk/src/test.txt (rev 0)
+++ code/trunk/src/test.txt 2017-03-09 15:09:27 UTC (rev 11357)
@@ -0,0 +1,123 @@
+ #
+ # ORXONOX - the hottest 3D action shooter ever to exist
+ # > www.orxonox.net <
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along
+ # with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ #
+ # Author:
+ # Reto Grieder
+ # Description:
+ # Configures the compilers and sets build options.
+ #
+
+# Required macros and functions
+INCLUDE(FlagUtilities)
+INCLUDE(TargetUtilities)
+
+INCLUDE(SourceConfig.cmake)
+
+# Configure the two headers and set some options
+INCLUDE(OrxonoxConfig.cmake)
+
+################ Sub Directories ################
+
+ADD_SUBDIRECTORY(external)
+ADD_SUBDIRECTORY(libraries)
+ADD_SUBDIRECTORY(orxonox)
+SET(ORXONOX_MODULES CACHE INTERNAL "")
+SET(ORXONOX_PLUGINS CACHE INTERNAL "")
+ADD_SUBDIRECTORY(modules)
+
+################## Executable ###################
+
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}/libraries
+ ${CMAKE_CURRENT_SOURCE_DIR}/orxonox
+)
+
+# Translate argument
+IF(ORXONOX_USE_WINMAIN)
+ SET(ORXONOX_WIN32 WIN32)
+ENDIF()
+
+SET(ORXONOX_MAIN_FILES Orxonox.cc)
+
+# Add special source file for OS X
+IF(APPLE)
+ LIST(APPEND ORXONOX_MAIN_FILES OrxonoxMac.mm)
+# Add the icon for win32 builds
+ELSEIF(WIN32)
+ LIST(APPEND ORXONOX_MAIN_FILES ${CMAKE_SOURCE_DIR}/contrib/winresource.rc)
+ENDIF()
+
+ORXONOX_ADD_EXECUTABLE(orxonox-main
+ # When defined as WIN32 this removes the console window on Windows
+ ${ORXONOX_WIN32}
+ LINK_LIBRARIES
+ orxonox
+ SOURCE_FILES
+ ${ORXONOX_MAIN_FILES}
+ OUTPUT_NAME orxonox
+)
+# Main executable should depend on all modules (but not on plugins)
+ADD_DEPENDENCIES(orxonox-main ${ORXONOX_MODULES})
+
+# Get name to configure the run scripts
+IF (POLICY CMP0026)
+ CMAKE_POLICY(PUSH)
+ CMAKE_POLICY(SET CMP0026 OLD) # we only use the file's name, not its actual location, so the old policy is fine
+ENDIF()
+GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
+GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
+SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
+IF (POLICY CMP0026)
+ CMAKE_POLICY(POP) # set policy back to original settings
+ENDIF()
+
+
+# Apple Mac OS X specific build settings
+IF(APPLE)
+ # On Apple we need to link to AppKit and Foundation frameworks
+ TARGET_LINK_LIBRARIES(orxonox-main
+ "-framework AppKit"
+ "-framework Foundation"
+ )
+
+ # Post-build step for the creation of the Dev-App bundle
+ INCLUDE(PrepareDevBundle)
+ ADD_CUSTOM_COMMAND(
+ TARGET orxonox-main
+ POST_BUILD
+ # Copy the executable into the Orxonox.app
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${ORXONOX_EXECUTABLE_NAME}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
+ # Copy the dev-build marker file to Orxonox.app
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/orxonox_dev_build.keep_me" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
+ # Create a shortcut of the application to the root of the build tree
+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app"
+ )
+ENDIF(APPLE)
+
+#################### Doxygen ####################
+
+# Prepare include paths for Doxygen. This is necessary to display
+# the correct path to use when including a file, e.g.
+# core/XMLPort.h instead of src/core/XMLPort.h
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/modules)
+GET_DIRECTORY_PROPERTY(_temp INCLUDE_DIRECTORIES)
+# Replace ';' by spaces
+STRING(REPLACE ";" " " _temp "${_temp}")
+SET(DOXYGEN_INCLUDE_DIRECTORIES "${_temp}" PARENT_SCOPE)
More information about the Orxonox-commit
mailing list