Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11764


Ignore:
Timestamp:
Feb 18, 2018, 1:17:48 AM (7 years ago)
Author:
landauf
Message:

merged ProtectBoss_HS17

Location:
code/branches/Presentation_HS17_merge
Files:
4 edited
3 copied

Legend:

Unmodified
Added
Removed

  • code/branches/Presentation_HS17_merge

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

    r11719 r11764  
    2929    <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"/>
    3030    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     31
     32    <Model position="0,0,0" mesh="ast1.mesh" scale="20"/>
     33    <Model position="100,0,0" mesh="ast2.mesh" scale="20"/>
     34    <Model position="200,0,0" mesh="ast3.mesh" scale="20"/>
     35    <Model position="300,0,0" mesh="ast4.mesh" scale="20"/>
     36    <Model position="400,0,0" mesh="ast5.mesh" scale="20"/>
     37    <Model position="500,0,0" mesh="ast6.mesh" scale="20"/>
     38    <Model position="600,0,0" mesh="asteroid_ice.mesh" scale="20"/>
     39    <Model position="700,0,0" mesh="asteroid_UV.mesh" scale="20"/>
     40    <Model position="900,0,0" mesh="drone.mesh" scale="20"/>
     41    <Model position="1000,0,0" mesh="Fahne.mesh" scale="20"/>
     42    <Model position="1100,0,0" mesh="GravityBomb.mesh" scale="20"/>
     43    <Model position="1200,0,0" mesh="GravityBombRocket.mesh" scale="20"/>
     44    <Model position="1300,0,0" mesh="hovership_body.mesh" scale="20"/>
     45    <Model position="1400,0,0" mesh="hovership_engine.mesh" scale="20"/>
     46    <Model position="1500,0,0" mesh="satellite.mesh" scale="20"/>
     47    <Model position="1800,0,0" mesh="Spacebomb.mesh" scale="20"/>
     48    <Model position="2100,0,0" mesh="Transporter.mesh" scale="20"/>
     49    <Model position="2400,0,0" mesh="Transporterspaceship.mesh" scale="20"/>
    3150   
    3251  </Scene>

  • code/branches/Presentation_HS17_merge/src/orxonox/controllers/DroneController.cc

    r11071 r11764  
    4949        RegisterObject(DroneController);
    5050
     51        this->setTeam(0);
    5152        this->owner_ = nullptr;
    5253        this->drone_ = nullptr;
    … …  
    164165            }
    165166        }
     167       
    166168        SUPER(AIController, tick, dt);
    167169    }

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

    r11743 r11764  
    88  Destroyer.cc
    99  StoryModePawn.cc
     10  ShootableObstacle.cc
    1011)
Note: See TracChangeset for help on using the changeset viewer.