Changeset 2096

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/core/XMLIncludes.h (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/objects/WeaponSystem.cc (copied) (copied from code/branches/weapon/src/orxonox/objects/WeaponSystem.cc)
• src/orxonox/objects/WeaponSystem.h (copied) (copied from code/branches/weapon/src/orxonox/objects/WeaponSystem.h)
• src/orxonox/objects/quest/AddQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.h (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.h (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/Quest.cc (modified) (1 prop)
• src/orxonox/objects/quest/Quest.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.h (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.cc (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.h (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)
• src/tolua/tolua-5.1.pkg (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• visual_studio/vc8/audio.vsprops (modified) (1 prop)
• visual_studio/vc8/base.vsprops (modified) (1 prop)
• visual_studio/vc8/ceguilua.vsprops (modified) (1 prop)
• visual_studio/vc8/core.vsprops (modified) (1 prop)
• visual_studio/vc8/cpptcl.vsprops (modified) (1 prop)
• visual_studio/vc8/debug.vsprops (modified) (1 prop)
• visual_studio/vc8/directories.vsprops (modified) (1 prop)
• visual_studio/vc8/lua.vsprops (modified) (1 prop)
• visual_studio/vc8/network.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox_vc8.sln (modified) (1 prop)
• visual_studio/vc8/release.vsprops (modified) (1 prop)
• visual_studio/vc8/tinyxml.vcproj (modified) (1 prop)
• visual_studio/vc8/tinyxml.vsprops (modified) (1 prop)
• visual_studio/vc8/tolua.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/util.vsprops (modified) (1 prop)

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -128 +128 @@
     class EventTrigger;
 
+    class WeaponSystem;
+    class WeaponSet;
+    class WeaponSlot;
+    class Weapon;
+    class Munition;
+
     class EventListener;
     class EventDispatcher;