Changeset 6782 for code/branches
- Timestamp:
- Apr 26, 2010, 3:59:43 PM (15 years ago)
- Location:
- code/branches/ai
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ai/data/levels/pickup.oxw
r6524 r6782 22 22 include("includes/pickups.oxi") 23 23 ?> 24 25 <Template name=droneTemplate> 26 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7"> 27 <attached> 28 <Model scale="10" mesh="drone.mesh"/> 29 </attached> 30 <collisionShapes> 31 <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" /> 32 </collisionShapes> 24 33 34 35 <weaponslots> 36 <WeaponSlot position=" 0, 0,0" /> 37 </weaponslots> 38 <weaponsets> 39 <WeaponSet firemode=0 /> 40 </weaponsets> 41 <weapons> 42 <WeaponPack> 43 <links> 44 <DefaultWeaponmodeLink firemode=0 weaponmode=0 /> 45 </links> 46 <Weapon> 47 <attached> 48 <Model mesh="hs-w01.mesh" roll="195" position="0,1,0" scale=2 /> 49 <Model mesh="hs-w01s.mesh" roll="195" position="0.1,0.5,0" scale=2 /> 50 </attached> 51 <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.7, 1.5,-4" /> 52 <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-0.9, 1.1,-4" /> 53 </Weapon> 54 </WeaponPack> 55 </weapons> 56 57 58 </Drone> 59 </Template> 60 25 61 <PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10"> 26 62 <pickup> 27 < MetaPickup metaType="drop"/>63 <DronePickup droneTemplate=droneTemplate /> 28 64 </pickup> 29 65 </PickupSpawner> 30 66 67 68 31 69 <PickupSpawner position="-75,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10"> 32 70 <pickup> -
code/branches/ai/data/levels/tutorial.oxw
r5781 r6782 14 14 > 15 15 16 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7"> 16 <PickupSpawner position="0,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10"> 17 <drones> 18 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7"> 17 19 <attached> 18 20 <Model scale="10" mesh="drone.mesh"/> … … 22 24 </collisionShapes> 23 25 </Drone> 26 </drones> 27 </PickupSpawner> 24 28 25 29 -
code/branches/ai/src/modules/pickup/PickupPrereqs.h
r6524 r6782 75 75 76 76 //items 77 class DronePickup; 77 78 class HealthPickup; 78 79 class MetaPickup; -
code/branches/ai/src/modules/pickup/items/CMakeLists.txt
r6524 r6782 2 2 HealthPickup.cc 3 3 MetaPickup.cc 4 DronePickup.cc 4 5 ) -
code/branches/ai/src/orxonox/controllers/CMakeLists.txt
r6417 r6782 8 8 WaypointController.cc 9 9 WaypointPatrolController.cc 10 DroneController.cc 10 11 ) -
code/branches/ai/src/orxonox/interfaces/PickupCarrier.h
r6563 r6782 52 52 class HealthPickup; 53 53 class MetaPickup; 54 class DronePickup; 54 55 55 56 /** … … 67 68 friend class HealthPickup; 68 69 friend class MetaPickup; 70 friend class DronePickup; 69 71 70 72 public: -
code/branches/ai/src/orxonox/worldentities/CMakeLists.txt
r6417 r6782 5 5 MobileEntity.cc 6 6 ControllableEntity.cc 7 7 Drone.cc 8 8 BigExplosion.cc 9 9 EffectContainer.cc
Note: See TracChangeset
for help on using the changeset viewer.