Changeset 2923 for code/branches
- Timestamp:
- Apr 18, 2009, 7:21:36 PM (16 years ago)
- Location:
- code/branches/weapons/src/orxonox/objects
- Files:
-
- 8 edited
-
CMakeLists.txt (modified) (1 diff)
-
weaponsystem/munitions/FusionMunition.h (modified) (1 diff)
-
weaponsystem/munitions/ReplenishingMunition.h (modified) (1 diff)
-
weaponsystem/weaponmodes/FusionFire.cc (modified) (1 diff)
-
weaponsystem/weaponmodes/FusionFire.h (modified) (1 diff)
-
weaponsystem/weaponmodes/LaserFire.cc (modified) (1 diff)
-
weaponsystem/weaponmodes/LaserFire.h (modified) (1 diff)
-
worldentities/pawns/Pawn.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapons/src/orxonox/objects/CMakeLists.txt
r2826 r2923 22 22 ADD_SUBDIRECTORY(pickup) 23 23 ADD_SUBDIRECTORY(quest) 24 ADD_SUBDIRECTORY(weapon System)24 ADD_SUBDIRECTORY(weaponsystem) 25 25 ADD_SUBDIRECTORY(worldentities) 26 26 -
code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h
r2918 r2923 31 31 32 32 #include "OrxonoxPrereqs.h" 33 #include "objects/weapon System/Munition.h"33 #include "objects/weaponsystem/Munition.h" 34 34 35 35 namespace orxonox -
code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h
r2918 r2923 31 31 32 32 #include "OrxonoxPrereqs.h" 33 #include "objects/weapon System/Munition.h"33 #include "objects/weaponsystem/Munition.h" 34 34 #include "tools/Timer.h" 35 35 -
code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc
r2921 r2923 31 31 32 32 #include "core/CoreIncludes.h" 33 #include "objects/weapon System/projectiles/BillboardProjectile.h"33 #include "objects/weaponsystem/projectiles/BillboardProjectile.h" 34 34 35 #include "objects/weapon System/Weapon.h"36 #include "objects/weapon System/WeaponPack.h"37 #include "objects/weapon System/WeaponSystem.h"35 #include "objects/weaponsystem/Weapon.h" 36 #include "objects/weaponsystem/WeaponPack.h" 37 #include "objects/weaponsystem/WeaponSystem.h" 38 38 39 39 namespace orxonox -
code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h
r2921 r2923 31 31 32 32 #include "OrxonoxPrereqs.h" 33 #include "objects/weapon System/WeaponMode.h"33 #include "objects/weaponsystem/WeaponMode.h" 34 34 35 35 namespace orxonox -
code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc
r2921 r2923 31 31 32 32 #include "core/CoreIncludes.h" 33 #include "objects/weapon System/projectiles/ParticleProjectile.h"33 #include "objects/weaponsystem/projectiles/ParticleProjectile.h" 34 34 35 #include "objects/weapon System/Weapon.h"36 #include "objects/weapon System/WeaponPack.h"37 #include "objects/weapon System/WeaponSystem.h"35 #include "objects/weaponsystem/Weapon.h" 36 #include "objects/weaponsystem/WeaponPack.h" 37 #include "objects/weaponsystem/WeaponSystem.h" 38 38 39 39 namespace orxonox -
code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h
r2921 r2923 31 31 32 32 #include "OrxonoxPrereqs.h" 33 #include "objects/weapon System/WeaponMode.h"33 #include "objects/weaponsystem/WeaponMode.h" 34 34 35 35 namespace orxonox -
code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc
r2918 r2923 39 39 #include "objects/worldentities/ParticleSpawner.h" 40 40 #include "objects/worldentities/ExplosionChunk.h" 41 #include "objects/weapon System/WeaponSystem.h"42 #include "objects/weapon System/WeaponSlot.h"43 #include "objects/weapon System/WeaponPack.h"44 #include "objects/weapon System/WeaponSet.h"41 #include "objects/weaponsystem/WeaponSystem.h" 42 #include "objects/weaponsystem/WeaponSlot.h" 43 #include "objects/weaponsystem/WeaponPack.h" 44 #include "objects/weaponsystem/WeaponSet.h" 45 45 46 46 namespace orxonox
Note: See TracChangeset
for help on using the changeset viewer.
