#
# ChangeLog for code/branches/dockingsystem2
#
# Generated by Trac 1.0.9
# Nov 18, 2024, 12:04:09 AM

Mon, 09 May 2011 14:26:37 GMT sven [8434]
	* code/branches/dockingsystem2/data/gui/layouts/DockingDialog.layout (added)
	* code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua (added)
	* code/branches/dockingsystem2/data/levels/docking.oxw (modified)
	* code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt (modified)
	* code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified)
	* code/branches/dockingsystem2/src/modules/docking/Dock.h (modified)

	Added simple GUI for docking..


Mon, 02 May 2011 14:19:43 GMT sven [8383]
	* code/branches/dockingsystem2/src/modules/docking/Dock.h (modified)

	Fixed an include.


Mon, 02 May 2011 14:16:27 GMT sven [8382]
	* code/branches/dockingsystem2/data/levels/docking.oxw (modified)
	* code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified)
	* code/branches/dockingsystem2/src/modules/docking/Dock.h (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (modified)
	* code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc (modified)

	Added dock/undock console commands.


Thu, 21 Apr 2011 20:45:42 GMT dafrick [8289]
	* code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.h (modified)

	Adding possibility to have a string of temporaryControls.


Mon, 18 Apr 2011 14:35:01 GMT sven [8257]
	* code/branches/dockingsystem2/data/levels/docking.oxw (modified)
	* code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt (modified)
	* code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockToShip.h (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockingEffect.h (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h (modified)
	* code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc (added)
	* code/branches/dockingsystem2/src/modules/docking/DockingTarget.h (added)

	First working dock example..


Thu, 07 Apr 2011 20:19:16 GMT dafrick [8206]
	* code/branches/dockingsystem2/data/levels/docking.oxw (modified)
	* code/branches/dockingsystem2/data/levels/fightInOurBack.oxw (modified)
	* code/branches/dockingsystem2/data/levels/pirateAttack.oxw (modified)
	* code/branches/dockingsystem2/data/levels/theTimeMachine.oxw (modified)
	* code/branches/dockingsystem2/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified)
	* code/branches/dockingsystem2/src/modules/objects/triggers/DistanceMultiTrigger.h (modified)
	* code/branches/dockingsystem2/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/branches/dockingsystem2/src/modules/objects/triggers/DistanceTrigger.h (modified)
	* code/branches/dockingsystem2/src/modules/objects/triggers/MultiTrigger.cc (modified)

	Extending DistanceTrigger (both the normal and the MultiTrigger ...


Wed, 06 Apr 2011 14:54:07 GMT dafrick [8197]
	* code/branches/dockingsystem2/data/levels/docking.oxw (modified)
	* code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified)
	* code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h (modified)

	Replacing getNick() with getName(). nick_ in HumanPlayer is only ...


Wed, 06 Apr 2011 14:39:29 GMT dafrick [8196]
	* code/branches/dockingsystem2 (modified)
	* code/branches/dockingsystem2/data/levels/docking.oxw (copied)
	* code/branches/dockingsystem2/src/modules/CMakeLists.txt (modified)
	* code/branches/dockingsystem2/src/modules/docking (copied)
	* code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt (copied)
	* code/branches/dockingsystem2/src/modules/docking/Dock.cc (copied)
	* code/branches/dockingsystem2/src/modules/docking/Dock.h (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockToShip.cc (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockToShip.h (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockingEffect.h (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockingPrecompiledHeaders.h (copied)
	* code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h (copied)
	* code/branches/dockingsystem2/src/orxonox/infos/HumanPlayer.h (modified)
	* code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc (modified)

	Merging old dockingsystem branch into new one.
	Do
	svn switch ...


Wed, 06 Apr 2011 14:26:26 GMT dafrick [8195]
	* code/branches/dockingsystem2 (copied)

	New dockingsystem branch, to avoid problems when merging it into
	trunk.


Wed, 06 Apr 2011 09:12:38 GMT dafrick [8193]
	* code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/TriggerBase.h (modified)

	Resolving bug in MultiTrigger.