#
# ChangeLog for code/branches/chat
#
# Generated by Trac 1.0.9
# May 18, 2024, 4:56:12 PM

Thu, 18 Mar 2010 21:44:37 GMT smerkli [6565]
	* code/branches/chat/src/libraries/network/packet/Chat.h (modified)

	Test commit, added a couple of comments.


Mon, 15 Mar 2010 15:23:54 GMT scheusso [6527]
	* code/branches/chat (copied)

	creating new chat branch


Mon, 15 Mar 2010 14:27:09 GMT dafrick [6524]
	* code/trunk (modified)
	* code/trunk/data/levels/empty_level.oxw (modified)
	* code/trunk/data/levels/includes/pickups.oxi (copied)
	* code/trunk/data/levels/pickup.oxw (copied)
	* code/trunk/data/levels/templates/pickup_representation_templates.oxt (copied)
	* code/trunk/src/libraries/core/BaseObject.cc (modified)
	* code/trunk/src/libraries/core/BaseObject.h (modified)
	* code/trunk/src/libraries/core/GraphicsManager.cc (modified)
	* code/trunk/src/libraries/core/OrxonoxClass.h (modified)
	* code/trunk/src/libraries/core/Super.h (modified)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup (copied)
	* code/trunk/src/modules/pickup/CMakeLists.txt (copied)
	* code/trunk/src/modules/pickup/DroppedPickup.cc (copied)
	* code/trunk/src/modules/pickup/DroppedPickup.h (copied)
	* code/trunk/src/modules/pickup/Pickup.cc (copied)
	* code/trunk/src/modules/pickup/Pickup.h (copied)
	* code/trunk/src/modules/pickup/PickupCollection.cc (copied)
	* code/trunk/src/modules/pickup/PickupCollection.h (copied)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (copied)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (copied)
	* code/trunk/src/modules/pickup/PickupManager.cc (copied)
	* code/trunk/src/modules/pickup/PickupManager.h (copied)
	* code/trunk/src/modules/pickup/PickupPrecompiledHeaders.h (copied)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (copied)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (copied)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (copied)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (copied)
	* code/trunk/src/modules/pickup/PickupSpawner.h (copied)
	* code/trunk/src/modules/pickup/items (copied)
	* code/trunk/src/modules/pickup/items/CMakeLists.txt (copied)
	* code/trunk/src/modules/pickup/items/HealthPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/HealthPickup.h (copied)
	* code/trunk/src/modules/pickup/items/MetaPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/MetaPickup.h (copied)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (copied)
	* code/trunk/src/orxonox/interfaces/Pickupable.cc (copied)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (copied)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/pickup/BaseItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/BaseItem.h (deleted)
	* code/trunk/src/orxonox/pickup/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/pickup/DroppedItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/DroppedItem.h (deleted)
	* code/trunk/src/orxonox/pickup/EquipmentItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/EquipmentItem.h (deleted)
	* code/trunk/src/orxonox/pickup/ModifierPickup.cc (deleted)
	* code/trunk/src/orxonox/pickup/ModifierPickup.h (deleted)
	* code/trunk/src/orxonox/pickup/ModifierType.h (deleted)
	* code/trunk/src/orxonox/pickup/PassiveItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/PassiveItem.h (deleted)
	* code/trunk/src/orxonox/pickup/PickupCollection.cc (deleted)
	* code/trunk/src/orxonox/pickup/PickupCollection.h (deleted)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.cc (copied)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.h (copied)
	* code/trunk/src/orxonox/pickup/PickupInventory.cc (deleted)
	* code/trunk/src/orxonox/pickup/PickupInventory.h (deleted)
	* code/trunk/src/orxonox/pickup/PickupSpawner.cc (deleted)
	* code/trunk/src/orxonox/pickup/PickupSpawner.h (deleted)
	* code/trunk/src/orxonox/pickup/UsableItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/UsableItem.h (deleted)
	* code/trunk/src/orxonox/pickup/items (deleted)
	* code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, ...