Changeset 2096 for code/trunk/src/orxonox/objects/weaponSystem

Timestamp:

Nov 1, 2008, 10:14:55 PM (16 years ago)

Author:

landauf

Message:

merged weapon branch back to trunk
changed eol-style of all new files to native

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponSystem (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem)
• src/orxonox/objects/weaponSystem/Munition.cc (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/Munition.cc) (1 prop)
• src/orxonox/objects/weaponSystem/Munition.h (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/Munition.h) (1 prop)
• src/orxonox/objects/weaponSystem/Weapon.cc (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/Weapon.cc) (1 prop)
• src/orxonox/objects/weaponSystem/Weapon.h (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/Weapon.h) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSet.cc (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/WeaponSet.cc) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSet.h (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/WeaponSet.h) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSlot.cc (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/WeaponSlot.cc) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSlot.h (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/WeaponSlot.h) (1 prop)
• src/orxonox/objects/weaponSystem/munitions (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/munitions)
• src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc) (1 prop)
• src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h) (1 prop)
• src/orxonox/objects/weaponSystem/weapons (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/weapons)
• src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc) (1 prop)
• src/orxonox/objects/weaponSystem/weapons/LaserGun.h (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/weapons/LaserGun.h) (1 prop)
• src/orxonox/objects/weaponSystem/weapons/Missile.cc (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/weapons/Missile.cc) (1 prop)
• src/orxonox/objects/weaponSystem/weapons/Missile.h (copied) (copied from code/branches/weapon/src/orxonox/objects/weaponSystem/weapons/Missile.h) (1 prop)