#
# ChangeLog for code/branches/presentation/src/modules
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 2:31:43 PM

Tue, 24 May 2011 14:44:39 GMT dafrick [8561]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/gui/layouts/DockingDialog.layout (copied)
	* code/branches/presentation/data/gui/scripts/DockingDialog.lua (copied)
	* code/branches/presentation/data/levels/docking.oxw (copied)
	* code/branches/presentation/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/docking (copied)
	* code/branches/presentation/src/modules/docking/CMakeLists.txt (copied)
	* code/branches/presentation/src/modules/docking/Dock.cc (copied)
	* code/branches/presentation/src/modules/docking/Dock.h (copied)
	* code/branches/presentation/src/modules/docking/DockToShip.cc (copied)
	* code/branches/presentation/src/modules/docking/DockToShip.h (copied)
	* code/branches/presentation/src/modules/docking/DockingAnimation.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingAnimation.h (copied)
	* code/branches/presentation/src/modules/docking/DockingController.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingController.h (copied)
	* code/branches/presentation/src/modules/docking/DockingEffect.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingEffect.h (copied)
	* code/branches/presentation/src/modules/docking/DockingPrecompiledHeaders.h (copied)
	* code/branches/presentation/src/modules/docking/DockingPrereqs.h (copied)
	* code/branches/presentation/src/modules/docking/DockingTarget.cc (copied)
	* code/branches/presentation/src/modules/docking/DockingTarget.h (copied)
	* code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc (copied)
	* code/branches/presentation/src/modules/docking/MoveToDockingTarget.h (copied)
	* code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/presentation/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/presentation/src/orxonox/infos/PlayerInfo.h (modified)

	Merging dockingsystem2 branch to presentation branch.


Mon, 23 May 2011 21:40:58 GMT dafrick [8556]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation/data/levels/pickups.oxw (modified)
	* code/branches/presentation/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/presentation/src/libraries/util/SubString.h (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified)
	* code/branches/presentation/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/pickup/items/ShrinkPickup.cc (copied)
	* code/branches/presentation/src/modules/pickup/items/ShrinkPickup.h (copied)
	* code/branches/presentation/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/branches/presentation/src/orxonox/collisionshapes/CollisionShape.h (modified)
	* code/branches/presentation/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified)
	* code/branches/presentation/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/WorldEntity.cc (modified)

	Merging pickup branch into presentation branch.


Wed, 18 May 2011 08:57:00 GMT dafrick [8499]
	* code/branches/presentation (copied)

	Creating new presentation branch.


Thu, 12 May 2011 15:20:25 GMT rgrieder [8471]
	* code/trunk/src/modules/portals/PortalEndPoint.cc (modified)

	Fixed possible bug (avoid using 'this' in the initialiser list unless ...