#
# ChangeLog for code/branches/dockingsystem2/src/orxonox
#
# Generated by Trac 1.0.9
# Jun 29, 2024, 5:01:30 PM

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.


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 17:56:47 GMT jo [8178]
	* code/trunk (modified)
	* code/trunk/data/levels/lastManStanding.oxw (modified)
	* code/trunk/data/levels/lastTeamStanding.oxw (copied)
	* code/trunk/data/levels/lastTeamStandingII.oxw (copied)
	* code/trunk/data/overlays/lastManStandingHUD.oxo (modified)
	* code/trunk/data/overlays/lastTeamStandingHUD.oxo (copied)
	* code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/trunk/src/modules/overlays/hud/GametypeStatus.h (modified)
	* code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (copied)
	* code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h (copied)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.h (modified)
	* code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (copied)
	* code/trunk/src/orxonox/gametypes/LastTeamStanding.h (copied)

	Merged lastmastanding3 into trunk. There's an xml parsing error that ...