Changeset 3070 for code/branches/pickups3/src

Timestamp:

May 25, 2009, 7:55:52 PM (16 years ago)

Author:

landauf

Message:

test: removing mergeinfo also in pickups branch

Location:

code/branches/pickups3

Files:

• . (modified) (2 props)
• src/core/LuaBind.cc (modified) (1 prop)
• src/core/LuaBind.h (modified) (1 prop)
• src/core/Template.cc (modified) (1 prop)
• src/core/Template.h (modified) (1 prop)
• src/core/XMLFile.h (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)
• src/cpptcl/cpptcl.cc (modified) (1 prop)
• src/cpptcl/cpptcl.h (modified) (1 prop)
• src/network/synchronisable/NetworkCallback.h (modified) (1 prop)
• src/network/synchronisable/Synchronisable.cc (modified) (1 prop)
• src/network/synchronisable/Synchronisable.h (modified) (1 prop)
• src/orxonox/CameraManager.cc (modified) (1 prop)
• src/orxonox/CameraManager.h (modified) (1 prop)
• src/orxonox/objects/Level.cc (modified) (1 prop)
• src/orxonox/objects/Level.h (modified) (1 prop)
• src/orxonox/objects/collisionshapes (modified) (1 prop)
• src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) (1 prop)
• src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) (1 prop)
• 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/WeaponSystem.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/MobileEntity.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/MobileEntity.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/StaticEntity.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/StaticEntity.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)
• src/tolua/all-5.0.lua (modified) (1 prop)
• src/tolua/all-5.1.lua (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/SignalHandler.cc (modified) (1 prop)
• src/util/SignalHandler.h (modified) (1 prop)