[Orxonox-commit 5575] r10238 - in code/branches/presentationHS14merge: . data/levels data/levels/includes data/levels/templates src/modules/weapons
landauf at orxonox.net
landauf at orxonox.net
Sun Feb 1 18:42:19 CET 2015
Author: landauf
Date: 2015-02-01 18:42:19 +0100 (Sun, 01 Feb 2015)
New Revision: 10238
Added:
code/branches/presentationHS14merge/data/levels/FPS_Level_HS14.oxw
code/branches/presentationHS14merge/data/levels/includes/weaponSettingsFPS_HS14.oxi
code/branches/presentationHS14merge/data/levels/templates/FPS_HS14.oxt
code/branches/presentationHS14merge/data/levels/templates/spacestation_elements.oxt
code/branches/presentationHS14merge/data/levels/templates/ss_tube01.oxt
Modified:
code/branches/presentationHS14merge/
code/branches/presentationHS14merge/data/levels/presentationHS13.oxw
code/branches/presentationHS14merge/data/levels/templates/FPS.oxt
code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc
Log:
merged weaponupdateHS14 (except some unnecessary changes)
Property changes on: code/branches/presentationHS14merge
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/Racingbot:9388-9513
/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/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/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/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/formation:8885-8991
/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/hud:8883-8986
/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/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/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/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/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/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/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/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/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/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/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
+ /code/branches/Racingbot:9388-9513
/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/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/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/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/formation:8885-8991
/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/hud:8883-8986
/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/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/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/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/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/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/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/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/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/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/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
Copied: code/branches/presentationHS14merge/data/levels/FPS_Level_HS14.oxw (from rev 10237, code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw)
===================================================================
--- code/branches/presentationHS14merge/data/levels/FPS_Level_HS14.oxw (rev 0)
+++ code/branches/presentationHS14merge/data/levels/FPS_Level_HS14.oxw 2015-02-01 17:42:19 UTC (rev 10238)
@@ -0,0 +1,348 @@
+<!--FPS mode level
+ autor: Florian Süess-->
+<LevelInfo
+ name = "FPS Level HS14"
+ description = "Entering a Space Station & finde a way through it."
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+ include("templates/pickupRepresentationTemplates.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipAssff.oxt")
+ include("templates/spaceshipPirate.oxt")
+ include("templates/spaceshipEscort.oxt")
+ include("templates/bigship.oxt")
+ include("templates/spaceshipTurret.oxt")
+ include("templates/spaceshipCollateralDamage.oxt")
+ include("templates/FPS_HS14.oxt")
+ include("templates/HeavyCruiser.oxt")
+ include("templates/spacestation_elements.oxt")
+?>
+
+<Level
+ gametype = Deathmatch
+>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+
+ <Scene
+ ambientlight = "0.5, 0.5, 0.5"
+ skybox = "Orxonox/skyBoxMoreNebula"
+ negativeWorldRange = "-100000, -100000, -100000"
+ positiveWorldRange = " 100000, 100000, 100000"
+ gravity = "0,0,0"
+ hasPhysics = true
+ >
+
+ <?lua
+ include("includes/pickups.oxi")
+ ?>
+
+ <!-- my ships -->
+
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0,1.0,1.0,0.5" specular="1.0, 0.9, 0.9, 1.0"/>
+
+ <SpawnPoint team=1 position="6000,2000,500" lookat="4000,-1000,-1000" spawnclass=SpaceShip pawndesign=spaceshipescort />
+ <!--Position normal Level: "6000,2000,500"; postion for work at the spacesation: "3000,0,0 "-->
+
+ <!--1,200,0-->
+ <SpaceShip
+ template = "spaceshipassff"
+ team = "1"
+ position = "3337,-19,-320"
+ orientation = "5800,-200,-1200,0"
+ health = "200"
+ initialhealth = "200"
+ maxhealth = "200"
+ shieldhealth = "50"
+ initialshieldhealth = "50"
+ maxshieldhealth = "50"
+ shieldabsorption = "0.8"
+ reloadrate = "100"
+ reloadwaittime = "0.1"
+ name = "Tanis1"
+ radarname = "Light Destroyer" >
+ <attached>
+ <DockingTarget name="spaceShip" />
+ <DistanceTriggerBeacon name="bcnSpaceShip" />
+ </attached>
+ </SpaceShip>
+
+
+
+ <StaticEntity position = "2800,0,0" mass=10000 collisionType=static >
+ <attached>
+ <Model mesh="HydroHarvester.mesh" mass=10 position="0,0,0" scale=50 />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="-560,0,0" halfExtents="115,100,245" /><!-- Three lower boxes -->
+ <BoxCollisionShape position="290,0,-480" halfExtents="115,100,245" yaw=-120 />
+ <BoxCollisionShape position="290,0,480" halfExtents="115,100,245" yaw=-240 />
+ <BoxCollisionShape position="-280,0,0" halfExtents="163,50,50" /><!-- Three lower connections -->
+ <BoxCollisionShape position="140,0,-240" halfExtents="163,50,50" yaw=-120 />
+ <BoxCollisionShape position="140,0,240" halfExtents="163,50,50" yaw=-240 />
+ <BoxCollisionShape position="0,530,0" halfExtents="172,52,298" /><!-- Upper Tower -->
+ <BoxCollisionShape position="0,530,0" halfExtents="172,52,298" yaw=-120 />
+ <BoxCollisionShape position="0,530,0" halfExtents="172,52,298" yaw=-240 />
+ <BoxCollisionShape position="0,400,0" halfExtents="43,110,26" yaw=-30 /><!-- Middle one-->
+ <BoxCollisionShape position="-200,100,0" halfExtents="26,50,43" /><!--Three lower legs -->
+ <BoxCollisionShape position="100,100,-173" halfExtents="43,50,26" yaw=-30 />
+ <BoxCollisionShape position="100,100,-173" halfExtents="43,50,26" yaw=30 />
+ <BoxCollisionShape position="-100,264,0" halfExtents="26,105,43" roll=-49 /><!--Three upper legs -->
+ <BoxCollisionShape position="50,264,-87" halfExtents="26,105,43" roll=-49 yaw=-120 />
+ <BoxCollisionShape position="50,264,87" halfExtents="26,105,43" roll=-49 yaw=-240 />
+ </collisionShapes>
+ </StaticEntity>
+
+
+ <!-- Docking I -->
+ <Dock position="2830,20,50" roll=0 yaw=0 >
+ <animations>
+ <MoveToDockingTarget target="fistperson" />
+ </animations>
+ <effects>
+ <DockToShip target="fistperson" />
+ </effects>
+ <events>
+ <execute>
+ <EventListener event="dockMe" />
+ </execute>
+
+ <undocking>
+ <EventListener event="undockMe" />
+ </undocking>
+
+ </events>
+ <attached>
+ <!-- Trigger for docking with billboard -->
+ <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
+ <DistanceTrigger position="0,0,0" distance="200" target="Pawn"
+ beaconMode="exclude" targetname="bcnDestroyer" name="dockMe"
+ />
+ <!-- Trigger for undocking with billboard -2800,-20055,-700-->
+ <Billboard position="-1500,-20021,-50" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
+ <DistanceTrigger position="-1500,-20021,-50" distance="150" target="Pawn"
+ beaconMode="identify" targetname="bcnDestroyer" name="undockMe"
+ />
+ </attached>
+
+ </Dock>
+
+ <!-- FPS Player as destination of the dock -->
+ <!-- My position after docking -->
+ <FpsPlayer template = "fps_HS14" radarname = "First Person Player" position = "1330,-20016,0" >
+ <attached>
+ <DistanceTriggerBeacon name="bcnDestroyer" />
+ <DockingTarget name="fistperson" />
+ </attached>
+ </FpsPlayer>
+
+
+
+
+ <!-- Docking II -->
+ <Dock position="86,-20005,-700" roll=0 yaw=0 >
+ <animations>
+ <MoveToDockingTarget target="spaceShip" />
+ </animations>
+ <effects>
+ <DockToShip target="spaceShip" />
+ </effects>
+ <events>
+ <execute>
+ <EventListener event="dockMe" />
+ </execute>
+
+ <undocking>
+ <EventListener event="undockMe" />
+ </undocking>
+
+ </events>
+ <attached>
+ <!-- Trigger for docking with billboard -->
+ <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
+ <DistanceTrigger position="0,0,0" distance="100" target="Pawn"
+ beaconMode="exclude" targetname="bcnSpaceShip" name="dockMe"
+ />
+ <!-- Trigger for undocking with billboard -->
+ <Billboard position="3251,20006,380" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
+ <DistanceTrigger position="3251,20006,380" distance="100" target="Pawn"
+ beaconMode="identify" targetname="bcnSpaceShip" name="undockMe"
+ />
+ </attached>
+ </Dock>
+
+
+
+ <!-- Enemy ships -->
+
+ <SpaceShip
+ template = "HeavyCruiser"
+ team = "0"
+ position = "5800,-200,-1200"
+ orientation = "1,200,0,0"
+ health = "2000"
+ initialhealth = "2000"
+ maxhealth = "2000"
+ shieldhealth = "200"
+ initialshieldhealth = "200"
+ maxshieldhealth = "200"
+ shieldabsorption = "0.8"
+ reloadrate = "1"
+ reloadwaittime = "1"
+ name = "Tanis0"
+ radarname = "Tanis big ship" >
+ </SpaceShip>
+ -->
+
+ <SpaceShip
+ template = "spaceshippirate"
+ team = "0"
+ position = "11000,0,-2500"
+ orientation = "1,200,0,0"
+ health = "200"
+ initialhealth = "200"
+ maxhealth = "200"
+ shieldhealth = "50"
+ initialshieldhealth = "50"
+ maxshieldhealth = "50"
+ shieldabsorption = "0.8"
+ reloadrate = "1"
+ reloadwaittime = "1"
+ name = "Tanis0"
+ radarname = "Pirate1" >
+
+ <controller>
+ <AIController team=0/>
+ </controller>
+
+ </SpaceShip>
+
+ <SpaceShip
+ template = "spaceshippirate"
+ team = "0"
+ position = "11000,0,-2500"
+ orientation = "1,200,0,0"
+ health = "200"
+ initialhealth = "200"
+ maxhealth = "200"
+ shieldhealth = "50"
+ initialshieldhealth = "50"
+ maxshieldhealth = "50"
+ shieldabsorption = "0.8"
+ reloadrate = "1"
+ reloadwaittime = "1"
+ name = "Tanis0"
+ radarname = "Pirate2" >
+
+ <controller>
+ <AIController team=0/>
+ </controller>
+
+ </SpaceShip>
+
+
+<!-- SpaceStation
+
+The station can either be hidden outside of the skybox, within the hull of the space station if it is big enough or within a planet.
+Complex spacestations can be placed very far away from the spaceship so it is rendered at low resolution while the player uses the space ship.
+
+-->
+
+<!-- Hilfsobjekte fuer Koordinatensystem -->
+
+<!-- The axis from the coordinatesystem are "red,green,yellow" and the orange boxe shows the negative direction.
+ But atention, each element is different! A few of them are already rotatet with yaw, roll and pitch:
+ -> "pitch" is a rotation around "red" in the "yellow, green" plain.
+ -> "yaw" is a rotation around "green" in the "red, yellow" plain.
+ -> "roll" is a rotation around "yellow" in the "green,red" plain.
+ this chanches their negativ/positiv direction of the axis.
+ -->
+
+
+<!--<Model position="0,0,0" mesh="cube_red.mesh" scale3D="10000,10,10" />
+<Model position="0,0,0" mesh="cube_green.mesh" scale3D="10,10000,10" />
+<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10000" />
+
+<Model position="0,-100,0" mesh="cube_orange.mesh" scale3D="15,15,15" />
+<Model position="-100,0,0" mesh="cube_orange.mesh" scale3D="15,15,15" />
+<Model position="0,0,-100" mesh="cube_orange.mesh" scale3D="15,15,15" />
+
+<Model position="0,-20000,0" mesh="cube_red.mesh" scale3D="100,10,10" />
+<Model position="0,-20000,0" mesh="cube_green.mesh" scale3D="10,100,10" />
+<Model position="0,-20000,0" mesh="cube.mesh" scale3D="10,10,100" />
+
+<Model position="0,-20100,0" mesh="cube_orange.mesh" scale3D="15,15,15" />
+<Model position="-100,-20000,0" mesh="cube_orange.mesh" scale3D="15,15,15" />
+<Model position="0,-20000,-100" mesh="cube_orange.mesh" scale3D="15,15,15" /> -->
+
+
+<!-- Spacestation elements merged -->
+<StaticEntity position="0,-20000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 pitch=-90>
+
+ <attached>
+
+ <Model template = "ss_flag_room" position="750,-16,0" yaw=180 />
+
+ <Model template = "ss_machine" position="1545,190,370" yaw=32 pitch=180 />
+ <Model template = "ss_flag_aean" position="1330,16,0" pitch=180 />
+ <Model template = "ss_chair" position="1700,145,0" />
+
+ <Model template = "ss_tube" position="500,0,0" />
+ <Model template = "ss_table" position="650,100,0" />
+ <Model template = "ss_cylinder" position="0,75,0" />
+
+ <Model template = "ss_curve" position="-200,0,0" yaw=180 />
+ <Model template = "ss_tube_x" position="-10,0,700" />
+
+ <Model template = "ss_curve" position="-905,0,700" yaw=180 />
+ <Model template = "ss_curve" position="-810,0,1500" yaw=270/>
+ <Model template = "ss_curve" position="-10,0,1405" yaw=0 />
+
+ <Model template = "ss_wall" yaw=0 position="250,20,700" />
+ <Model template = "ss_table_cracked" yaw=0 position="-110,100,700" />
+
+
+ </attached>
+ </StaticEntity>
+
+
+<!-- Homogenous gravitationfield to simulate local gravity (activating the normal gravity will affect the spaceship terribly) -->
+<ForceField position="0,-20200,0" mode="homogen" diameter="5000" forcedirection = "0,-500,0" />
+
+
+
+
+
+<!-- Some more stuff -->
+
+ <!-- triple large belt around the planet -->
+ <?lua
+ dofile("includes/asteroidField.lua")
+ asteroidBelt(0, -19900, 0, 30, 0, 30, 30, 50, 7190, 7800, 250, 1)
+ ?>
+ <?lua
+ dofile("includes/asteroidField.lua")
+ asteroidBelt(0, -19900, 0, 30, 0, 30, 30, 50, 10000, 11000, 300, 1)
+ ?>
+ <?lua
+ dofile("includes/asteroidField.lua")
+ asteroidBelt(0, -19900, 0, 30, 0, 30, 30, 50, 14000, 15000, 350, 1)
+ ?>
+
+ <Model position="0,-19900,0" mesh="planets/ganymede.mesh" scale="5000" />
+
+
+
+ </Scene>
+
+</Level>
+
Copied: code/branches/presentationHS14merge/data/levels/includes/weaponSettingsFPS_HS14.oxi (from rev 10237, code/branches/weaponupdateHS14/data/levels/includes/weaponSettingsFPS_HS14.oxi)
===================================================================
--- code/branches/presentationHS14merge/data/levels/includes/weaponSettingsFPS_HS14.oxi (rev 0)
+++ code/branches/presentationHS14merge/data/levels/includes/weaponSettingsFPS_HS14.oxi 2015-02-01 17:42:19 UTC (rev 10238)
@@ -0,0 +1,51 @@
+ <weaponslots>
+ <WeaponSlot position="0,0,0" yaw=0 pitch=0 roll=0 />
+<!--
+ <WeaponSlot position="-0.5,0.8,2.5" yaw=0 pitch=0 roll=0 />
+ <WeaponSlot position="15,-1.5,-25" yaw=0 pitch=0 roll=0 />
+ <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
+-->
+ </weaponslots>
+ <weaponsets>
+ <WeaponSet firemode=0 />
+ <WeaponSet firemode=1 />
+ </weaponsets>
+ <weapons>
+ <WeaponPack firemode=0>
+ <links>
+ <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+ <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+ <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
+ </links>
+ <Weapon>
+ <HsW01 mode=0 munitionpershot=0 delay=0.0 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.7, -0.3, -3" />
+ <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20/>
+ </Weapon>
+ <LaserGun
+ position="0,0,0"
+ munitionType="LaserGunMunition"
+ bulletLoadingTime="0.2"
+ magazineLoadingTime="5.0"
+ speed="1000"
+ unlimitedMunition=true
+ />
+ <!--LaserGun
+ position="0,0,0"
+ munitionType="LaserGunMunition"
+ bulletLoadingTime="0.2"
+ magazineLoadingTime="5.0"
+ speed="1250"
+ unlimitedMunition=true
+ />
+ </WeaponPack>
+ <WeaponPack firemode=1>
+ <Fusion
+ position="0,0,0"
+ munitionType="FusionMunition"
+ bulletLoadingTime="0.3"
+ magazineLoadingTime="3"
+ speed="600"
+ unlimitedMunition=true
+ /-->
+ </WeaponPack>
+ </weapons>
Modified: code/branches/presentationHS14merge/data/levels/presentationHS13.oxw
===================================================================
--- code/branches/presentationHS14merge/data/levels/presentationHS13.oxw 2015-02-01 14:57:57 UTC (rev 10237)
+++ code/branches/presentationHS14merge/data/levels/presentationHS13.oxw 2015-02-01 17:42:19 UTC (rev 10238)
@@ -130,7 +130,7 @@
</execute>
<undocking>
- <EventListener event="undockMe" />
+ <EventListener event="undockMe" />
</undocking>
</events>
Modified: code/branches/presentationHS14merge/data/levels/templates/FPS.oxt
===================================================================
--- code/branches/presentationHS14merge/data/levels/templates/FPS.oxt 2015-02-01 14:57:57 UTC (rev 10237)
+++ code/branches/presentationHS14merge/data/levels/templates/FPS.oxt 2015-02-01 17:42:19 UTC (rev 10238)
@@ -20,8 +20,8 @@
weapon = "hs-w01.mesh"
>
- <collisionShapes>
- <BoxCollisionShape position="0,-20,0" halfExtents="15,25,15" />
+ <collisionShapes> <!-- old values: position="0,-20,0" halfExtents="15,25,15" -->
+ <BoxCollisionShape position="0,-25,0" halfExtents="15,20,15" />
</collisionShapes>
<camerapositions>
Copied: code/branches/presentationHS14merge/data/levels/templates/FPS_HS14.oxt (from rev 10237, code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt)
===================================================================
--- code/branches/presentationHS14merge/data/levels/templates/FPS_HS14.oxt (rev 0)
+++ code/branches/presentationHS14merge/data/levels/templates/FPS_HS14.oxt 2015-02-01 17:42:19 UTC (rev 10238)
@@ -0,0 +1,54 @@
+<Template name=fps_HS14>
+ <FpsPlayer
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 6
+
+ health = 100
+ maxhealth = 200
+ initialhealth = 100
+
+ primaryThrust = 0;
+ auxilaryThrust = 0;
+ rotationThrust = 0;
+
+ collisionType = "dynamic"
+ mass = 100
+ linearDamping = 0.7
+ angularDamping = 0.9999999
+ friction = 0.01
+
+ weapon = "hs-w01.mesh"
+ >
+ <collisionShapes>
+ <!--Normal values: position="0,-45,0" halfExtents="15,50,15" -->
+ <BoxCollisionShape position="0,-45,0" halfExtents="15,50,15" />
+ </collisionShapes>
+
+ <camerapositions>
+ <CameraPosition position="-1,1,2.2" drag=false mouselook=true />
+ </camerapositions>
+
+ <?lua
+ include("../includes/weaponSettingsFPS_HS14.oxi")
+ ?>
+
+ </FpsPlayer>
+</Template>
+<!--
+<Template name=fpscamera defaults=0>
+ <FpsPlayer>
+ <camerapositions>
+ <CameraPosition position="0,0,20" drag=false mouselook=true />
+
+ <!--
+ CameraPosition position="0,150,-25" pitch=-90 drag=true />
+ <CameraPosition position="0,0,-40" yaw=180 drag=true />
+ <CameraPosition position="0,3,-14" yaw=0 />
+ <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
+ <CameraPosition position="50,5,-8" yaw=90 drag=true /
+
+ </camerapositions>
+ </FpsPlayer>
+</Template>
+-->
Copied: code/branches/presentationHS14merge/data/levels/templates/spacestation_elements.oxt (from rev 10237, code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt)
===================================================================
--- code/branches/presentationHS14merge/data/levels/templates/spacestation_elements.oxt (rev 0)
+++ code/branches/presentationHS14merge/data/levels/templates/spacestation_elements.oxt 2015-02-01 17:42:19 UTC (rev 10238)
@@ -0,0 +1,466 @@
+<!--Templates of spacestation elements with alle their collisionshapes,
+ for creating a spacestation very easy.
+ Autor: Florian Süess
+ Test Level: FPS_Level_HS14 -->
+<Template name=spacestation_elements>
+ <SpaceStation
+ normalTubetemplate = ss_tube
+ curvedTubetemplate = ss_curve
+ crossingTubetemplate = ss_tube_x
+ wall = ss_wall
+ flagg = ss_flag_aean
+ >
+ </SpaceStation>
+</Template>
+
+
+<!-- to place the different collisionshapes, I used some help boxes and an help coordinate system.
+ The axis from the coordinatesystem are "red,green,yellow" and the orange boxe shows the negative direction.
+ But atention, each element is different! A few of them are already rotatet with yaw, roll and pitch:
+ -> "pitch" is a rotation around "red" in the "yellow, green" plain.
+ -> "yaw" is a rotation around "green" in the "red, yellow" plain.
+ -> "roll" is a rotation around "yellow" in the "green,red" plain.
+ this chanches their negativ/positiv direction of the axis.
+ -->
+
+
+<!-- Spacestation Element Tube -->
+<Template name=ss_tube>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <Model position="0,0,0" yaw=0 scale3D="100,100,100" mesh="ss_tube.mesh" />
+
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,100" halfExtents="250,100,0" /> <!--Wand links-->
+ <BoxCollisionShape position="0,0,-100" halfExtents="250,100,0" /> <!--Wand rechts-->
+ <BoxCollisionShape position="0,100,0" halfExtents="250,0,100" /> <!--Decke-->
+ <BoxCollisionShape position="0,-100,0" halfExtents="250,0,100" /> <!--Boden-->
+
+
+ </collisionShapes>
+
+<Model position="-200,0,-275" mesh="cube_green.mesh" scale3D="0,100,75" />
+ </MovableEntity>
+
+</Template>
+
+
+<!-- Spacestation Element Curve -->
+<Template name=ss_curve>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="0,0,-200" mesh="cube_green.mesh" scale3D="0,100,150" />
+ <Model position="-300,0,100" mesh="cube_green.mesh" scale3D="150,100,0" />
+ <Model position="-100,0,0" yaw=45 mesh="cube_red.mesh" scale3D="150,100,0" />
+
+ <Model position="-200,0,-275" mesh="cube_green.mesh" scale3D="0,100,75" />
+ <Model position="-375,0,-100" mesh="cube_green.mesh" scale3D="75,100,0" />
+ <Model position="-245,0,-148" yaw=45 mesh="cube_red.mesh" scale3D="70.71,100,0" />
+
+ <Model position="-225,100,-125" mesh="cube_red.mesh" scale3D="225,0,225" /> -->
+
+
+ <Model position="0,0,0" yaw=0 scale3D="100,100,100" mesh="ss_curve.mesh" />
+
+
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,-200" halfExtents="0,100,150" /> <!--Wand rechts-->
+ <BoxCollisionShape position="-300,0,100" halfExtents="150,100,0" /> <!--Wand rechts-->
+ <BoxCollisionShape position="-100,0,0" yaw=45 halfExtents="150,100,0" /> <!--Wand rechts-->
+ <BoxCollisionShape position="-200,0,-275" halfExtents="0,100,75" /> <!--Wand links-->
+ <BoxCollisionShape position="-375,0,-100" halfExtents="75,100,0" /> <!--Wand links-->
+ <BoxCollisionShape position="-245,0,-148" yaw=45 halfExtents="70.7,100,0" /> <!--Wand links-->
+ <BoxCollisionShape position="-225,100,-125" halfExtents="225,0,225" /> <!--Boden-->
+ <BoxCollisionShape position="-225,-100,-125" halfExtents="250,0,225" /> <!--Decke-->
+
+ </collisionShapes>
+
+
+ </MovableEntity>
+
+</Template>
+
+
+<!-- Spacestation Element Crossing -->
+<Template name=ss_tube_x>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="175,0,100" mesh="cube_green.mesh" scale3D="75,100,0" />
+ <Model position="-0,0,275" mesh="cube_green.mesh" scale3D="0,100,75" />
+ <Model position="-200,0,275" mesh="cube_red.mesh" scale3D="0,100,75" />
+ <Model position="-375,0,100" mesh="cube_red.mesh" scale3D="75,100,0" />
+
+ <Model position="175,0,-100" mesh="cube_green.mesh" scale3D="75,100,0" />
+ <Model position="0,0,-275" mesh="cube_green.mesh" scale3D="0,100,75" />
+ <Model position="-200,0,-275" mesh="cube_red.mesh" scale3D="0,100,75" />
+ <Model position="-375,0,-100" mesh="cube_red.mesh" scale3D="75,100,0" />
+
+ <Model position="-245,0,-147" yaw=45 mesh="cube_red.mesh" scale3D="70.7,100,0" />
+ <Model position="50,0,-147" yaw=-45 mesh="cube_red.mesh" scale3D="70.7,100,0" />
+ <Model position="-245,0,149" yaw=-45 mesh="cube_orange.mesh" scale3D="70.7,100,0" />
+ <Model position="50,0,148" yaw=45 mesh="cube_orange.mesh" scale3D="70.7,100,0" /> -->
+
+ <Model position="0,0,0" scale3D="100,100,100" mesh="ss_tube_x.mesh" />
+
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="175,0,100" halfExtents="75,100,0" /> <!--Wand links-->
+ <BoxCollisionShape position="0,0,275" halfExtents="0,100,75" /> <!--Wand links-->
+ <BoxCollisionShape position="-200,0,275" halfExtents="0,100,75" /> <!--Wand links-->
+ <BoxCollisionShape position="-375,0,100" halfExtents="75,100,0" /> <!--Wand links-->
+
+ <BoxCollisionShape position="175,0,-100" halfExtents="75,100,0" /> <!--Wand rechts-->
+ <BoxCollisionShape position="0,0,-275" halfExtents="0,100,75" /> <!--Wand rechts-->
+ <BoxCollisionShape position="-200,0,-275" halfExtents="0,100,75" /> <!--Wand rechts-->
+ <BoxCollisionShape position="-375,0,-100" halfExtents="75,100,0" /> <!--Wand rechts-->
+
+ <BoxCollisionShape position="-245,0,-147" yaw=45 halfExtents="70.7,100,0" /> <!--Wand schraeg rechts-->
+ <BoxCollisionShape position="50,0,-149" yaw=-45 halfExtents="70.7,100,0" /> <!--Wand schraeg rechts-->
+ <BoxCollisionShape position="-245,0,149" yaw=-45 halfExtents="70.7,100,0" /> <!--Wand schraeg links-->
+ <BoxCollisionShape position="50,0,148" yaw=45 halfExtents="70.7,100,0" /> <!--Wand schraeg links-->
+
+
+
+ <BoxCollisionShape position="-100,100,0" halfExtents="350,0,350" /> <!--Boden-->
+ <BoxCollisionShape position="-100,-110,0" halfExtents="350,0,350" /> <!--decke-->
+
+ </collisionShapes>
+
+
+ </MovableEntity>
+
+</Template>
+
+
+<!-- Spacestation Element Flagroom -->
+<Template name=ss_flag_room>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="-125,116,0" mesh="cube_green.mesh" scale3D="130,0,125" />
+ <Model position="-275,116,235" yaw=55 mesh="cube_green.mesh" scale3D="140,0,50" />
+ <Model position="-275,116,-235" yaw=-55 mesh="cube_red.mesh" scale3D="140,0,50" />
+ <Model position="-365,116,320" yaw=35 mesh="cube_green.mesh" scale3D="100,0,50" />
+ <Model position="-365,116,-320" yaw=-35 mesh="cube_red.mesh" scale3D="100,0,50" />
+ <Model position="-520,156,380" roll=-25 mesh="cube_green.mesh" scale3D="100,0,50" />
+ <Model position="-520,156,-380" roll=-25 mesh="cube_red.mesh" scale3D="100,0,50" />
+
+
+ <Model position="-80,0,100" mesh="cube_green.mesh" scale3D="80,100,0" />
+ <Model position="-160,0,150" yaw=90 mesh="cube_green.mesh" scale3D="50,200,0" />
+ <Model position="-220,0,260" yaw=55 mesh="cube_green.mesh" scale3D="140,200,0" />
+ <Model position="-360,0,390" yaw=33 mesh="cube_green.mesh" scale3D="110,200,0" />
+ <Model position="-600,16,430" mesh="cube_green.mesh" scale3D="200,200,0" />
+ <Model position="-810,16,405" yaw=-32 mesh="cube_green.mesh" scale3D="150,200,0" />
+ <Model position="-965,166,270" yaw=-55 mesh="cube_green.mesh" scale3D="150,50,0" />
+
+ <Model position="-80,0,-100" mesh="cube_red.mesh" scale3D="80,100,0" />
+ <Model position="-160,0,-150" yaw=-90 mesh="cube_red.mesh" scale3D="50,200,0" />
+ <Model position="-220,0,-260" yaw=-55 mesh="cube_red.mesh" scale3D="140,200,0" />
+ <Model position="-360,0,-390" yaw=-33 mesh="cube_red.mesh" scale3D="110,200,0" />
+ <Model position="-600,16,-430" mesh="cube_red.mesh" scale3D="200,200,0" />
+ <Model position="-810,16,-405" yaw=32 mesh="cube_red.mesh" scale3D="150,200,0" />
+ <Model position="-965,166,-270" yaw=55 mesh="cube_red.mesh" scale3D="150,50,0" />
+
+ <Model position="-1045,166,0" mesh="cube_orange.mesh" scale3D="0,50,160" />
+
+
+ <Model position="-650,200,0" mesh="cube_green.mesh" scale3D="400,0,450" />
+
+ <Model position="-500,-200,0" mesh="cube_green.mesh" scale3D="400,0,400" />
+ <Model position="-60,-84,0" mesh="cube_green.mesh" scale3D="60,0,100" />
+
+ <Model position="-1015,156,0" mesh="cube_orange.mesh" scale3D="27,25,120" />
+ <Model position="-580,185,0" mesh="cube_orange.mesh" scale3D="30,12,30" />
+ <Model position="-580,195,0" mesh="cube_orange.mesh" scale3D="50,10,50" />
+
+
+
+ <Model position="-255,121,0" mesh="cube_green.mesh" scale3D="0,85,125" />
+ <Model position="-300,116,190" yaw=-35 mesh="cube_green.mesh" scale3D="0,80,75" />
+ <Model position="-300,116,-190" yaw=35 mesh="cube_green.mesh" scale3D="0,80,75" />
+ <Model position="-410,116,290" yaw=-55 mesh="cube_green.mesh" scale3D="0,80,75" />
+ <Model position="-410,116,-290" yaw=55 mesh="cube_green.mesh" scale3D="0,80,75" />
+ <Model position="-500,185,328" yaw=2 roll=-25 mesh="cube_green.mesh" scale3D="100,35,0" />
+ <Model position="-500,185,-328" yaw=-2 roll=-25 mesh="cube_red.mesh" scale3D="100,35,0" /> -->
+
+
+
+ <!-- points for the orientation -->
+ <!--<Model position="0,0,0" mesh="cube_orange.mesh" scale3D="10,10,10" />
+ <Model position="-260,0,0" mesh="cube_orange.mesh" scale3D="10,10,10" />
+ <Model position="-580,0,400" mesh="cube_orange.mesh" scale3D="10,10,10" />
+ <Model position="-580,0,-400" mesh="cube_orange.mesh" scale3D="10,10,10" />
+
+ <Model position="-580,0,0" mesh="cube_orange.mesh" scale3D="10,10,10" /> -->
+
+
+ <Model position="0,0,0" yaw=0 pitch=-90 scale3D="100,100,100" mesh="ss_flag_room.mesh" />
+
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="-125,116,0" halfExtents="130,0,125" /> <!--Boden oben mitte-->
+ <BoxCollisionShape position="-275,116,235" yaw=55 halfExtents="140,0,50" /> <!--Boden oben rechts-->
+ <BoxCollisionShape position="-275,116,-235" yaw=-55 halfExtents="140,0,50" /> <!--Boden oben links-->
+ <BoxCollisionShape position="-365,116,320" yaw=35 halfExtents="100,0,50" /> <!--Boden oben rechts-->
+ <BoxCollisionShape position="-365,116,-320" yaw=-35 halfExtents="100,0,50" /> <!--Boden oben links-->
+ <BoxCollisionShape position="-520,156,380" roll=-25 halfExtents="100,0,50" /> <!--Boden oben rechts-->
+ <BoxCollisionShape position="-520,156,-380" roll=-25 halfExtents="100,0,50" /> <!--Boden oben links-->
+
+
+ <BoxCollisionShape position="-80,0,100" halfExtents="80,100,0" /> <!--Wand oben rechts-->
+ <BoxCollisionShape position="-160,0,150" yaw=90 halfExtents="50,200,0" /> <!--Wand oben rechts-->
+ <BoxCollisionShape position="-220,0,260" yaw=55 halfExtents="100,200,0" /> <!--Wand oben rechts-->
+ <BoxCollisionShape position="-360,0,390" yaw=33 halfExtents="110,200,0" /> <!--Wand oben rechts-->
+ <BoxCollisionShape position="-600,16,430" halfExtents="200,200,0" /> <!--Wand unten rechts-->
+ <BoxCollisionShape position="-810,16,405" yaw=-32 halfExtents="150,200,0" /> <!--Wand unten rechts-->
+ <BoxCollisionShape position="-965,166,270" yaw=-55 halfExtents="150,50,0" /> <!--Wand unten rechts-->
+
+ <BoxCollisionShape position="-80,0,-100" halfExtents="80,100,0" /> <!--Wand oben links-->
+ <BoxCollisionShape position="-160,0,-150" yaw=-90 halfExtents="50,200,0" /> <!--Wand oben links-->
+ <BoxCollisionShape position="-220,0,-260" yaw=-55 halfExtents="100,200,0" /> <!--Wand oben links-->
+ <BoxCollisionShape position="-360,0,-390" yaw=-33 halfExtents="110,200,0" /> <!--Wand oben links-->
+ <BoxCollisionShape position="-600,16,-430" halfExtents="200,200,0" /> <!--Wand unten links-->
+ <BoxCollisionShape position="-810,16,-405" yaw=32 halfExtents="150,200,0" /> <!--Wand unten links-->
+ <BoxCollisionShape position="-965,166,-270" yaw=55 halfExtents="150,50,0" /> <!--Wand unten links-->
+
+ <BoxCollisionShape position="-1045,166,0" halfExtents="0,50,160" /> <!--Wand unten mitte-->
+
+
+
+ <BoxCollisionShape position="-650,200,0" halfExtents="400,0,450" /> <!--Boden unten-->
+
+ <BoxCollisionShape position="-500,-200,0" halfExtents="400,0,400" /> <!--decke-->
+ <BoxCollisionShape position="-60,-84,0" halfExtents="60,0,100" /> <!--decke oben-->
+
+ <BoxCollisionShape position="-1015,156,0" halfExtents="27,25,120" /> <!--Tisch-->
+ <BoxCollisionShape position="-580,185,0" halfExtents="30,12,30" /> <!--Stufe "Mittelpkt"-->
+ <BoxCollisionShape position="-580,195,0" halfExtents="50,10,50" /> <!--Stufe "Mittelpkt"-->
+
+
+ <BoxCollisionShape position="-255,121,0" halfExtents="0,85,125" /> <!--Wand innen-->
+ <BoxCollisionShape position="-300,116,190" yaw=-35 halfExtents="0,80,75" /> <!--Wand innen-->
+ <BoxCollisionShape position="-300,116,-190" yaw=35 halfExtents="0,80,75" /> <!--Wand innen-->
+ <BoxCollisionShape position="-410,116,290" yaw=-55 halfExtents="0,80,75" /> <!--Wand innen-->
+ <BoxCollisionShape position="-410,116,-290" yaw=55 halfExtents="0,80,75" /> <!--Wand innen-->
+ <BoxCollisionShape position="-500,185,328" yaw=2 roll=-25 halfExtents="100,35,0" /> <!--Wand innen-->
+ <BoxCollisionShape position="-500,185,-328" yaw=-2 roll=-25 halfExtents="100,35,0" /> <!--Wand innen-->
+
+
+ </collisionShapes>
+
+
+ </MovableEntity>
+
+</Template>
+
+
+<!-- Spacestation Element Machine -->
+<Template name=ss_machine>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="0,80,0" mesh="cube_orange.mesh" scale3D="40,80,25" /> -->
+
+ <Model position="0,0,0" roll=0 scale3D="0.15,0.15,0.15" mesh="ss_machine.mesh" />
+
+ </attached>
+ <collisionShapes>
+
+ <BoxCollisionShape position="0,80,0" halfExtents="40,80,25" /> <!--whole machine-->
+
+ </collisionShapes>
+ -->
+
+ </MovableEntity>
+roll=180 mesh="ss_table.mesh" scale3D="25,25,25"
+</Template>
+
+
+<!-- Spacestation Element Table-->
+<Template name=ss_table>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="0,-32,0" mesh="cube_orange.mesh" scale3D="60,32,40" /> -->
+
+ <Model position="0,0,0" roll=180 scale3D="25,25,25" mesh="ss_table.mesh" />
+
+ </attached>
+ <collisionShapes>
+
+ <BoxCollisionShape position="0,-32,0" yaw=15 halfExtents="60,32,40" /> <!--ganzer Tisch-->
+
+ </collisionShapes>
+
+
+ </MovableEntity>
+
+</Template>
+
+
+<!-- Spacestation Element Table (cracked) -->
+<Template name=ss_table_cracked>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="0,-32,0" mesh="cube_orange.mesh" scale3D="60,32,40" /> -->
+
+
+ <Model position="0,0,0" roll=180 scale3D="25,25,25" mesh="ss_table_cracked.mesh" />
+
+ </attached>
+ <collisionShapes>
+
+ <BoxCollisionShape position="0,-32,0" halfExtents="60,32,40" /> <!--ganzer Tisch-->
+
+ </collisionShapes>
+
+
+ </MovableEntity>
+
+</Template>
+
+
+<!-- Spacestation Element Cylinder -->
+<Template name=ss_cylinder>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="0,-40,0" yaw=15 mesh="cube_red.mesh" scale3D="7,65,25" />
+ <Model position="0,-40,0" yaw=45 mesh="cube_red.mesh" scale3D="7,65,25" />
+ <Model position="0,-40,0" yaw=75 mesh="cube_red.mesh" scale3D="7,65,25" />
+ <Model position="0,-40,0" yaw=105 mesh="cube_red.mesh" scale3D="7,65,25" />
+ <Model position="0,-40,0" yaw=135 mesh="cube_red.mesh" scale3D="7,65,25" />
+ <Model position="0,-40,0" yaw=165 mesh="cube_red.mesh" scale3D="7,65,25" /> -->
+
+
+ <Model position="0,0,0" roll=180 scale3D="25,25,25" mesh="ss_cylinder.mesh" />
+
+ </attached>
+ <collisionShapes>
+
+ <BoxCollisionShape position="0,-40,0" yaw=15 halfExtents="10,65,25" /> <!--Fuellung-->
+ <BoxCollisionShape position="0,-40,0" yaw=45 halfExtents="10,65,25" /> <!--Fuellung-->
+ <BoxCollisionShape position="0,-40,0" yaw=75 halfExtents="10,65,25" /> <!--Fuellung-->
+ <BoxCollisionShape position="0,-40,0" yaw=105 halfExtents="10,65,25" /> <!--Fuellung-->
+ <BoxCollisionShape position="0,-40,0" yaw=135 halfExtents="10,65,25" /> <!--Fuellung-->
+ <BoxCollisionShape position="0,-40,0" yaw=165 halfExtents="10,65,25" /> <!--Fuellung-->
+
+ </collisionShapes>
+
+
+ </MovableEntity>
+
+</Template>
+
+
+<!-- Spacestation Element Chair -->
+<Template name=ss_chair>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="-5,18,0" mesh="cube_orange.mesh" scale3D="20,20,20" />
+ <Model position="-23,-30,0" mesh="cube_orange.mesh" scale3D="2,33,18" /> -->
+
+
+ <Model position="0,0,0" roll=0 pitch=180 scale3D="20,20,20" mesh="ss_chair.mesh" />
+
+ </attached>
+ <collisionShapes>
+
+ <BoxCollisionShape position="-5,18,0" halfExtents="20,20,20" /> <!--Unterer Teil-->
+ <BoxCollisionShape position="-23,-30,0" halfExtents="2,33,20" /> <!--Rueckenlaehne-->
+
+ </collisionShapes>
+
+
+ </MovableEntity>
+
+</Template>
+
+
+<!-- Spacestation Element Wall -->
+<Template name=ss_wall>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="-78,0,0" mesh="cube_orange.mesh" scale3D="2,100,100" /> -->
+
+
+ <Model position="0,0,0" roll=0 pitch=180 scale3D="80,80,80" mesh="ss_wall.mesh" />
+
+ </attached>
+ <collisionShapes>
+
+ <BoxCollisionShape position="-78,0,0" halfExtents="2,100,100" /> <!--Flache Seite-->
+
+ </collisionShapes>
+
+
+ </MovableEntity>
+
+</Template>
+
+
+<!-- Spacestation Element Flag -->
+<Template name=ss_flag_aean>
+
+ <MovableEntity position="0,0,0">
+ <attached>
+
+ <!-- Boxes helps to place collisionShapes -->
+
+ <!--<Model position="0,0,0" mesh="cube_orange.mesh" scale3D="2,160,2" />
+ <Model position="0,108,80" mesh="cube_orange.mesh" scale3D="1,50,80" /> -->
+
+
+ <Model position="0,0,0" roll=0 scale3D="40,40,40" mesh="ss_flag_aean.mesh" />
+
+ </attached>
+ <collisionShapes>
+
+ <BoxCollisionShape position="0,0,0" halfExtents="2,160,2" /> <!--Mast-->
+ <BoxCollisionShape position="0,108,80" halfExtents="1,50,80" /> <!--Flagge-->
+
+ </collisionShapes>
+
+
+ </MovableEntity>
+
+</Template>
+
\ No newline at end of file
Copied: code/branches/presentationHS14merge/data/levels/templates/ss_tube01.oxt (from rev 10237, code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt)
===================================================================
--- code/branches/presentationHS14merge/data/levels/templates/ss_tube01.oxt (rev 0)
+++ code/branches/presentationHS14merge/data/levels/templates/ss_tube01.oxt 2015-02-01 17:42:19 UTC (rev 10238)
@@ -0,0 +1,20 @@
+<Template name=ss_tube01>
+
+<MovableEntity position="0,0,0">
+<attached>
+
+<Model position="0,0,0" yaw=0 pitch=180 roll=0 scale=1 mesh="ss_tube.mesh" />
+
+</attached>
+<!-- <collisionShapes>
+ <BoxCollisionShape position="0,8,17" halfExtents="8,10,10" />
+ <BoxCollisionShape position="0,0,22" halfExtents="18, 2, 10" />
+ <BoxCollisionShape position="0,0,9" halfExtents="12, 2, 20" />
+ <BoxCollisionShape position="0,0,-18" halfExtents="6, 2, 18" />
+
+ </collisionShapes>
+ -->
+
+</MovableEntity>
+
+</Template>
\ No newline at end of file
Modified: code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc 2015-02-01 14:57:57 UTC (rev 10237)
+++ code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc 2015-02-01 17:42:19 UTC (rev 10238)
@@ -40,6 +40,8 @@
namespace orxonox
{
+ RegisterClass(RocketController);
+
/**
@brief
Constructor.
@@ -96,7 +98,7 @@
if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000)
this->rocket_->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
- if (distance <1000) this->rocket_->setAcceleration(0,0,0);
+ if (distance < 1000) this->rocket_->setAcceleration(0,0,0);
this->rocket_->rotateYaw(-sgn(coord.x)*coord.x*coord.x);
this->rocket_->rotatePitch(sgn(coord.y)*coord.y*coord.y);
More information about the Orxonox-commit
mailing list