#
# ChangeLog for code/branches/dockingsystem2/data
#
# Generated by Trac 1.0.9
# Jul 27, 2025, 5:39:56 PM

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.


Sun, 03 Apr 2011 18:05:30 GMT rgrieder [8179]
	* code/trunk/data/levels/lastTeamStanding.oxw (modified)

	Hopefully fixed XML parsing errors at startup (can't test right now, ...