#
# ChangeLog for code/branches/presentationHS13/data/levels/dockingToASpaceStation.oxw
#
# Generated by Trac 1.0.9
# Jun 11, 2024, 10:25:28 PM

Mon, 16 Dec 2013 13:22:45 GMT smerkli [9907]
	* code/branches/presentationHS13 (modified)
	* code/branches/presentationHS13/data/gui/layouts/UndockingDialog.layout (copied)
	* code/branches/presentationHS13/data/gui/scripts/UndockingDialog.lua (copied)
	* code/branches/presentationHS13/data/levels/EntryTest.oxw (copied)
	* code/branches/presentationHS13/data/levels/FPSTest.oxw (modified)
	* code/branches/presentationHS13/data/levels/docking.oxw (modified)
	* code/branches/presentationHS13/data/levels/dockingToASpaceStation.oxw (copied)
	* code/branches/presentationHS13/src/modules/docking/Dock.cc (modified)
	* code/branches/presentationHS13/src/modules/docking/Dock.h (modified)
	* code/branches/presentationHS13/src/modules/docking/MoveToDockingTarget.cc (modified)
	* code/branches/presentationHS13/src/modules/objects/ForceField.cc (modified)
	* code/branches/presentationHS13/src/modules/objects/ForceField.h (modified)
	* code/branches/presentationHS13/src/orxonox/infos/PlayerInfo.cc (modified)

	Merged spacestationentry branch


Mon, 09 Dec 2013 14:57:28 GMT agermann [9885]
	* code/branches/spacestationentry/data/levels/dockingToASpaceStation.oxw (modified)
	* code/branches/spacestationentry/src/modules/docking/Dock.cc (modified)
	* code/branches/spacestationentry/src/modules/docking/Dock.h (modified)
	* code/branches/spacestationentry/src/modules/docking/MoveToDockingTarget.cc (modified)

	The level EntryTest.oxw can be deleted. Finally a nice and working ...