Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11774


Ignore:
Timestamp:
Feb 18, 2018, 6:42:50 PM (7 years ago)
Author:
landauf
Message:

merged Waypoints_HS17

Location:
code/branches/Presentation_HS17_merge
Files:
8 edited
14 copied

Legend:

Unmodified
Added
Removed

  • code/branches/Presentation_HS17_merge

  • code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw

    r11765 r11774  
    1414<?lua
    1515  include("templates/spaceshipEscort.oxt")
     16  include("templates/endurancetest_template.oxt")
     17  include("templates/spaceshipPirate.oxt")
     18  include("templates/spaceshipAssff.oxt")
     19
     20
    1621?>
    1722
    … …  
    2227  <?lua include("includes/notifications.oxi") ?>
    2328
    24   <Scene
    25     ambientlight = "0.8, 0.8, 0.8"
    26     skybox       = "Orxonox/Starbox"
     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"
    2744  >
    2845
    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 />
     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
    3150   
     51    <SpawnPoint position="50,0,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     52
     53
    3254  </Scene>
    3355</Level>

  • code/branches/Presentation_HS17_merge/data/levels/tutorial.oxw

    r9348 r11774  
    22 name = "Coding Tutorial"
    33 description = "Level for the coding tutorial."
    4  tags = "tutorial, shipselection"
     4 tags = "tutorial"
    55 screenshot = "codingtutorial.png"
    6  startingships = "spaceshipassff, spaceshipghost, spaceshipspacecruiser"
    76/>
    87
    … …  
    1110  include("stats.oxo")
    1211  include("templates/spaceshipAssff.oxt")
    13   include("templates/spaceshipGhost.oxt")
    14   include("templates/spaceshipSpacecruiser.oxt")
    1512  include("templates/lodInformation.oxt")
    1613?>
    … …  
    2421  <Scene
    2522   ambientlight = "0.5, 0.5, 0.5"
    26    skybox       = "Orxonox/skyBoxBasic"
     23   skybox       = "Orxonox/Starbox"
    2724  >
    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>
    3625
    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>
    4526
    4627    <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" />
    4728
    48     <Model mesh="hs-w01.mesh" scale=10 position="0,0,-100" />
    49     <Model mesh="hs-w01s.mesh" scale=10 position="0,0,-100" />
    5029
    5130    <?lua
    5231      for i = 1, 10, 1 do
    5332    ?>
    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 />
     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=spaceshipassff />
    5534    <?lua end ?>
    5635
    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>
     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     
    6645      <collisionShapes>
    67         <SphereCollisionShape radius="20" />
     46        <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
    6847      </collisionShapes>
    69     </StaticEntity>
     48    </AutonomousDrone>
    7049
    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>
    8550
    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 -->
    10951
    11052  </Scene>

  • code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt

    r11743 r11774  
    1111  HUDEnemyHealthBar.cc
    1212  HUDEnemyShieldBar.cc
     13  HUDWaypoints.cc
    1314  HUDWeaponMode.cc
    1415  HUDWeapon.cc

  • code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc

    r11071 r11774  
    8080        XMLPortObject(Quest, QuestEffect, "fail-effects", addFailEffect, getFailEffect, xmlelement, mode);
    8181        XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode);
     82        //XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode);
    8283
    8384        QuestManager::getInstance().registerQuest(this); // Registers the Quest with the QuestManager.
    8485    }
     86
     87
     88    /*bool Quest::addArrowTarget(Quest* quest){
     89
     90        assert(quest);
     91
     92
     93    }*/
     94
     95
    8596
    8697    /**

  • code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt

    r11052 r11774  
    1919  FightingController.cc
    2020  MasterController.cc
     21  AutonomousDroneController.cc
     22  ArrowController.cc
    2123)

  • code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc

    r11770 r11774  
    7171
    7272        XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode);
    73 
    7473        XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
    7574        XMLPortParam(Model, "renderQueueGroup", setRenderQueueGroup, getRenderQueueGroup, xmlelement, mode);

  • code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt

    r11743 r11774  
    1414  Actionpoint.cc
    1515  NameableStaticEntity.cc
     16  AutonomousDrone.cc
     17  Arrow.cc
    1618)
    1719
Note: See TracChangeset for help on using the changeset viewer.