#
# ChangeLog for code/branches/gamestates3/data/overlays
#
# Generated by Trac 1.0.9
# Nov 5, 2024, 10:29:23 AM

Tue, 20 Apr 2010 16:20:27 GMT rgrieder [6766]
	* code/branches/gamestates3 (copied)

	New branch to work on XML controlled CEGUI menus and on game states ...


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.