Changeset 790 for code/trunk/src/orxonox/objects/weapon

Timestamp:

Feb 7, 2008, 5:01:44 PM (17 years ago)

Author:

nicolasc

Message:

merged FICN back into trunk
awaiting release.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weapon (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon)
• src/orxonox/objects/weapon/AmmunitionDump.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/AmmunitionDump.cc)
• src/orxonox/objects/weapon/AmmunitionDump.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/AmmunitionDump.h)
• src/orxonox/objects/weapon/BarrelGun.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BarrelGun.cc)
• src/orxonox/objects/weapon/BarrelGun.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BarrelGun.h)
• src/orxonox/objects/weapon/BaseWeapon.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BaseWeapon.cc)
• src/orxonox/objects/weapon/BaseWeapon.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BaseWeapon.h)
• src/orxonox/objects/weapon/Bullet.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/Bullet.cc)
• src/orxonox/objects/weapon/Bullet.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/Bullet.h)
• src/orxonox/objects/weapon/BulletManager.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BulletManager.cc)
• src/orxonox/objects/weapon/BulletManager.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BulletManager.h)
• src/orxonox/objects/weapon/WeaponStation.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/WeaponStation.cc)
• src/orxonox/objects/weapon/WeaponStation.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/WeaponStation.h)