#
# ChangeLog for code/branches/pickups3
#
# Generated by Trac 1.0.9
# Jun 15, 2024, 4:03:47 PM

Mon, 25 May 2009 18:01:33 GMT landauf [3071]
	* code/branches/pickups3 (modified)

	hmm


Mon, 25 May 2009 17:55:52 GMT landauf [3070]
	* code/branches/pickups3 (modified)
	* code/branches/pickups3/bin/client1.bat.in (modified)
	* code/branches/pickups3/bin/client2.bat.in (modified)
	* code/branches/pickups3/bin/dedicated.bat.in (modified)
	* code/branches/pickups3/bin/run.bat.in (modified)
	* code/branches/pickups3/bin/server.bat.in (modified)
	* code/branches/pickups3/bin/standalone.bat.in (modified)
	* code/branches/pickups3/cmake/FindDirectX.cmake (modified)
	* code/branches/pickups3/cmake/LibraryConfigTardis.cmake (modified)
	* code/branches/pickups3/src/core/LuaBind.cc (modified)
	* code/branches/pickups3/src/core/LuaBind.h (modified)
	* code/branches/pickups3/src/core/Template.cc (modified)
	* code/branches/pickups3/src/core/Template.h (modified)
	* code/branches/pickups3/src/core/XMLFile.h (modified)
	* code/branches/pickups3/src/core/XMLIncludes.h (modified)
	* code/branches/pickups3/src/cpptcl/cpptcl.cc (modified)
	* code/branches/pickups3/src/cpptcl/cpptcl.h (modified)
	* code/branches/pickups3/src/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/pickups3/src/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/pickups3/src/network/synchronisable/Synchronisable.h (modified)
	* code/branches/pickups3/src/orxonox/CameraManager.cc (modified)
	* code/branches/pickups3/src/orxonox/CameraManager.h (modified)
	* code/branches/pickups3/src/orxonox/objects/Level.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/Level.h (modified)
	* code/branches/pickups3/src/orxonox/objects/collisionshapes (modified)
	* code/branches/pickups3/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddQuestHint.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddQuestHint.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddReward.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/AddReward.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/ChangeQuestStatus.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/CompleteQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/CompleteQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/FailQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/FailQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/GlobalQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/GlobalQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/LocalQuest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/LocalQuest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/Quest.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/Quest.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestDescription.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestDescription.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestEffect.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestEffect.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestHint.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestHint.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestItem.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestItem.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestManager.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/QuestManager.h (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/Rewardable.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/quest/Rewardable.h (modified)
	* code/branches/pickups3/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/Backlight.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/Backlight.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/Camera.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/Camera.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/MobileEntity.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/MobileEntity.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/ParticleSpawner.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/StaticEntity.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/StaticEntity.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified)
	* code/branches/pickups3/src/orxonox/objects/worldentities/triggers/Trigger.h (modified)
	* code/branches/pickups3/src/tolua/all-5.0.lua (modified)
	* code/branches/pickups3/src/tolua/all-5.1.lua (modified)
	* code/branches/pickups3/src/util (modified)
	* code/branches/pickups3/src/util/Exception.cc (modified)
	* code/branches/pickups3/src/util/Exception.h (modified)
	* code/branches/pickups3/src/util/SignalHandler.cc (modified)
	* code/branches/pickups3/src/util/SignalHandler.h (modified)

	test: removing mergeinfo also in pickups branch


Mon, 25 May 2009 17:51:58 GMT landauf [3069]
	* code/branches/pickups3 (copied)

	backup


Mon, 25 May 2009 15:38:00 GMT danielh [3063]
	* code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/Jump.cc (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/Jump.h (deleted)
	* code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc (modified)
	* code/branches/pickups2/src/orxonox/objects/pickup/items (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/CMakeLists.txt (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/HealthImmediate.cc (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/HealthImmediate.h (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/HealthUsable.cc (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/HealthUsable.h (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/Jump.cc (added)
	* code/branches/pickups2/src/orxonox/objects/pickup/items/Jump.h (added)

	- Moved pickups to a seperate directory
	- Added two pickups: ...