Changeset 11776 for code/branches/Presentation_HS17_merge
- Timestamp:
- Feb 19, 2018, 12:34:42 AM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 9 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw
r11774 r11776 14 14 <?lua 15 15 include("templates/spaceshipEscort.oxt") 16 include("templates/endurancetest_template.oxt")17 include("templates/spaceshipPirate.oxt")18 include("templates/spaceshipAssff.oxt")19 20 21 16 ?> 22 17 … … 27 22 <?lua include("includes/notifications.oxi") ?> 28 23 29 <NotificationQueueCEGUI 30 name="narrative" 31 targets="simpleNotification" 32 size=3 33 displayTime=3.9 34 position="0.2, 0, 0.1, 0" 35 fontSize="23" 36 fontColor="0.3, 1, 0.2, 0.8" 37 alignment="HorzCentred" 38 displaySize="0.6, 0, 0, 0" 39 /> 40 41 <Scene 42 ambientlight = "0.5, 0.5, 0.5" 43 skybox = "Orxonox/Starbox" 24 <Scene 25 ambientlight = "0.8, 0.8, 0.8" 26 skybox = "Orxonox/Starbox" 44 27 > 45 28 46 47 <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" /> 48 49 29 <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"/> 30 <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort /> 50 31 51 <SpawnPoint position="50,0,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />52 53 54 32 </Scene> 55 33 </Level> -
code/branches/Presentation_HS17_merge/data/levels/tutorial.oxw
r11774 r11776 2 2 name = "Coding Tutorial" 3 3 description = "Level for the coding tutorial." 4 tags = "tutorial "4 tags = "tutorial, shipselection" 5 5 screenshot = "codingtutorial.png" 6 startingships = "spaceshipassff, spaceshipghost, spaceshipspacecruiser" 6 7 /> 7 8 … … 10 11 include("stats.oxo") 11 12 include("templates/spaceshipAssff.oxt") 13 include("templates/spaceshipGhost.oxt") 14 include("templates/spaceshipSpacecruiser.oxt") 12 15 include("templates/lodInformation.oxt") 13 16 ?> … … 21 24 <Scene 22 25 ambientlight = "0.5, 0.5, 0.5" 23 skybox = "Orxonox/ Starbox"26 skybox = "Orxonox/skyBoxBasic" 24 27 > 28 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7"> 29 <attached> 30 <Model scale="1" mesh="drone.mesh"/> 31 </attached> 32 <collisionShapes> 33 <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" /> 34 </collisionShapes> 35 </Drone> 25 36 37 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7"> 38 <attached> 39 <Model scale="1" mesh="rocket.mesh"/> 40 </attached> 41 <collisionShapes> 42 <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" /> 43 </collisionShapes> 44 </Drone> 26 45 27 46 <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" /> 28 47 48 <Model mesh="hs-w01.mesh" scale=10 position="0,0,-100" /> 49 <Model mesh="hs-w01s.mesh" scale=10 position="0,0,-100" /> 29 50 30 51 <?lua 31 52 for i = 1, 10, 1 do 32 53 ?> 33 <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=s paceshipassff/>54 <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=shipselection /> 34 55 <?lua end ?> 35 56 36 37 <AutonomousDroneController>38 </AutonomousDroneController>39 40 <AutonomousDrone mass=50 linearDamping=0.9 angularDamping=0.7>41 <attached>42 <Model scale="10" mesh="drone.mesh"/>43 </attached>44 57 <GlobalShader compositor="Bloom" visible=false> 58 <events> 59 <visibility> 60 <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true /> 61 </visibility> 62 </events> 63 </GlobalShader> 64 <Model position="0,0,0" scale=8 mesh="ast1.mesh" /> 65 <StaticEntity position="0,0,0" collisionType=static> 45 66 <collisionShapes> 46 < BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />67 <SphereCollisionShape radius="20" /> 47 68 </collisionShapes> 48 </ AutonomousDrone>69 </StaticEntity> 49 70 71 <!-- 72 <?lua 73 for i = 1, 70, 1 do 74 ?> 75 <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 76 <attached> 77 <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false /> 78 </attached> 79 </MovableEntity> 80 <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 81 <attached> 82 <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false /> 83 </attached> 84 </MovableEntity> 50 85 86 <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 87 <attached> 88 <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false /> 89 </attached> 90 </MovableEntity> 91 <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 92 <attached> 93 <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false /> 94 </attached> 95 </MovableEntity> 96 97 <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 98 <attached> 99 <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false /> 100 </attached> 101 </MovableEntity> 102 <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 103 <attached> 104 <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false /> 105 </attached> 106 </MovableEntity> 107 <?lua end ?> 108 --> 51 109 52 110 </Scene> -
code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt
r11774 r11776 11 11 HUDEnemyHealthBar.cc 12 12 HUDEnemyShieldBar.cc 13 HUDWaypoints.cc14 13 HUDWeaponMode.cc 15 14 HUDWeapon.cc -
code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc
r11774 r11776 80 80 XMLPortObject(Quest, QuestEffect, "fail-effects", addFailEffect, getFailEffect, xmlelement, mode); 81 81 XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode); 82 //XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode);83 82 84 83 QuestManager::getInstance().registerQuest(this); // Registers the Quest with the QuestManager. 85 84 } 86 87 88 /*bool Quest::addArrowTarget(Quest* quest){89 90 assert(quest);91 92 93 }*/94 95 96 85 97 86 /** -
code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt
r11774 r11776 19 19 FightingController.cc 20 20 MasterController.cc 21 AutonomousDroneController.cc22 21 ArrowController.cc 23 22 ) -
code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc
r11774 r11776 71 71 72 72 XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode); 73 73 74 XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode); 74 75 XMLPortParam(Model, "renderQueueGroup", setRenderQueueGroup, getRenderQueueGroup, xmlelement, mode); -
code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt
r11774 r11776 14 14 Actionpoint.cc 15 15 NameableStaticEntity.cc 16 AutonomousDrone.cc17 16 Arrow.cc 18 17 )
Note: See TracChangeset
for help on using the changeset viewer.