Changeset 2893 for code/trunk/src/orxonox/objects/weaponSystem/munitions
- Timestamp:
- Apr 5, 2009, 11:27:54 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 3 edited
- 2 copied
-
. (modified) (1 prop)
-
src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (copied) (copied from code/branches/weaponsystem/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc)
-
src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (copied) (copied from code/branches/weaponsystem/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h)
-
src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/weaponsystem (added) merged: 2743,2778,2804,2852,2886
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt
r2710 r2893 1 1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES 2 2 LaserGunMunition.cc 3 FusionMunition.cc 3 4 ) -
code/trunk/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc
r2662 r2893 43 43 RegisterObject(LaserGunMunition); 44 44 45 //default if not defined in XML 45 46 this->maxBullets_ = 40; 46 47 this->maxMagazines_ = 100;
Note: See TracChangeset
for help on using the changeset viewer.
