Changeset 768 for code/branches/FICN/src/orxonox/objects

Timestamp:

Dec 31, 2007, 4:25:06 PM (17 years ago)

Author:

nicolasc

Message:

merged FICN_test back to FICN

Location:

code/branches/FICN/src/orxonox/objects

Files:

• CMakeLists.txt (deleted)
• Explosion.h (modified) (1 diff)
• Fighter.cc (modified) (1 diff)
• Model.h (modified) (1 diff)
• Projectile.h (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)
• test2.h (modified) (1 diff)
• weapon (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon)
• weapon/AmmunitionDump.cc (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/AmmunitionDump.cc)
• weapon/AmmunitionDump.h (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/AmmunitionDump.h)
• weapon/BarrelGun.cc (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/BarrelGun.cc)
• weapon/BarrelGun.h (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/BarrelGun.h)
• weapon/BaseWeapon.cc (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/BaseWeapon.cc)
• weapon/BaseWeapon.h (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/BaseWeapon.h)
• weapon/Bullet.cc (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/Bullet.cc)
• weapon/Bullet.h (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/Bullet.h)
• weapon/BulletManager.cc (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/BulletManager.cc)
• weapon/BulletManager.h (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/BulletManager.h)
• weapon/WeaponStation.cc (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/WeaponStation.cc)
• weapon/WeaponStation.h (copied) (copied from code/branches/FICN_test/src/orxonox/objects/weapon/WeaponStation.h)
• weapon_system (deleted)

code/branches/FICN/src/orxonox/objects/Explosion.h

@@ -5 +5 @@
 
 #include "WorldEntity.h"
-#include "Timer.h"
+#include "../tools/Timer.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/Fighter.cc

@@ -38 +38 @@
 #include "../Orxonox.h"
 #include "../particle/ParticleInterface.h"
-#include "weapon_system/AmmunitionDump.h"
-#include "weapon_system/BarrelGun.h"
+#include "weapon/AmmunitionDump.h"
+#include "weapon/BarrelGun.h"
 
 #include "Fighter.h"

code/branches/FICN/src/orxonox/objects/Model.h

@@ -5 +5 @@
 
 #include "WorldEntity.h"
-#include "Mesh.h"
+#include "../tools/Mesh.h"
 
 class TiXmlElement; // Forward declaration

code/branches/FICN/src/orxonox/objects/Projectile.h

@@ -5 +5 @@
 
 #include "WorldEntity.h"
-#include "BillboardSet.h"
-#include "Timer.h"
+#include "../tools/BillboardSet.h"
+#include "../tools/Timer.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/SpaceShip.h

@@ -8 +8 @@
 
 #include "Model.h"
-#include "BillboardSet.h"
+#include "../tools/BillboardSet.h"
 
 class TiXmlElement;          // Forward declaration

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -13 +13 @@
 #include "orxonox/core/BaseObject.h"
 #include "Tickable.h"
-#include "Mesh.h"
+#include "../tools/Mesh.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/test2.h

@@ -3 +3 @@
 
 #include "orxonox/core/BaseObject.h"
-#include "Timer.h"
+#include "../tools/Timer.h"
 
 namespace orxonox