#
# ChangeLog for code/branches/presentation3/data/overlays
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 3:51:09 PM

Tue, 01 Jun 2010 22:02:50 GMT landauf [7073]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/cmake/LibraryConfig.cmake (modified)
	* code/branches/presentation3/data/levels/fps_test.oxw (copied)
	* code/branches/presentation3/data/levels/includes/weaponsettings_fps.oxi (copied)
	* code/branches/presentation3/data/levels/presentation_FS10.oxw (copied)
	* code/branches/presentation3/data/levels/presentation_FS10_ed.oxw (copied)
	* code/branches/presentation3/data/levels/templates/fps.oxt (copied)
	* code/branches/presentation3/data/overlays/hudtamplates_fps.oxo (copied)
	* code/branches/presentation3/src/libraries/tools/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/tools/bsp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/CMakeLists.txt (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/DemoApp.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/DemoApp.hpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/ExampleApplication.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/ExampleFrameListener.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.hpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_misc.h (copied)
	* code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc (copied)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.h (copied)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged fps branch to presentation3


Mon, 31 May 2010 02:42:57 GMT landauf [7031]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw (copied)
	* code/branches/presentation3/data/overlays/dynamicmatchhud.oxo (copied)
	* code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/presentation3/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.cc (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h (copied)
	* code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (copied)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h (copied)
	* code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/presentation3/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/GametypeMessageListener.h (modified)

	merged dynamicmatch to presentation3


Mon, 17 May 2010 13:31:49 GMT scheusso [6912]
	* code/branches/presentation3 (copied)

	creating new presentation merger branch


Tue, 13 Apr 2010 08:16:10 GMT dafrick [6711]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/PickupInventory.layout (modified)
	* code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/trunk/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/trunk/data/gui/scripts/PickupInventory.lua (modified)
	* code/trunk/data/gui/scripts/QuestGUI.lua (modified)
	* code/trunk/data/levels/includes/pickups.oxi (modified)
	* code/trunk/data/levels/pickup.oxw (modified)
	* code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/trunk/data/overlays/hudtemplates3.oxo (modified)
	* code/trunk/src/modules/pickup/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merged pickup4 branch back to trunk.