#
# ChangeLog for code/branches/presentation/data/gui/layouts/DockingDialog.layout
#
# Generated by Trac 1.0.9
# Jun 5, 2024, 5:59:13 AM

Mon, 06 Jun 2011 06:15:38 GMT dafrick [8700]
	* code/branches/presentation/data/gui/layouts/DockingDialog.layout (modified)
	* code/branches/presentation/data/gui/scripts/DockingDialog.lua (modified)
	* code/branches/presentation/data/levels/presentationFS11.oxw (modified)
	* code/branches/presentation/src/modules/docking/Dock.cc (modified)
	* code/branches/presentation/src/modules/docking/Dock.h (modified)
	* code/branches/presentation/src/modules/docking/DockingTarget.cc (modified)
	* code/branches/presentation/src/modules/docking/DockingTarget.h (modified)

	Adherence to styleguide.


Sat, 28 May 2011 16:45:14 GMT landauf [8643]
	* code/branches/presentation/data/gui/layouts/DockingDialog.layout (modified)
	* code/branches/presentation/data/gui/scripts/DockingDialog.lua (modified)
	* code/branches/presentation/data/levels/docking.oxw (modified)
	* code/branches/presentation/data/levels/earth.oxw (modified)
	* code/branches/presentation/data/levels/includes/notifications.oxi (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsAssff2.oxi (modified)
	* code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi (modified)
	* code/branches/presentation/data/levels/myTestLevel.oxw (modified)
	* code/branches/presentation/data/levels/portals.oxw (modified)
	* code/branches/presentation/data/levels/presentationFS11.oxw (modified)
	* code/branches/presentation/data/levels/quests.oxw (modified)
	* code/branches/presentation/data/levels/shieldTest.oxw (modified)
	* code/branches/presentation/data/levels/spaceRace.oxw (modified)
	* code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (modified)
	* code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt (modified)
	* code/branches/presentation/data/levels/tetris.oxw (modified)
	* code/branches/presentation/data/particle/RingExp.particle (modified)
	* code/branches/presentation/data/particle/RingExp2.particle (modified)
	* code/branches/presentation/data/particle/RingExp3.particle (modified)
	* code/branches/presentation/data/particle/Shield.particle (modified)
	* code/branches/presentation/data/particle/weaponflare.particle (modified)
	* code/branches/presentation/data/particle/weaponshoot.particle (modified)

	set svn:eol-style to native, removed svn:executable property. no code ...


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, 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..