#
# ChangeLog for code/branches/presentation2012
#
# Generated by Trac 1.0.9
# May 28, 2024, 10:24:53 AM

Fri, 18 May 2012 14:32:28 GMT smerkli [9216]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/data/gui/scripts/AudioMenu.lua (modified)

	merged branch spacegate


Fri, 18 May 2012 13:39:47 GMT smerkli [9208]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/data/gui/layouts/ShipSelectionMenu.layout (copied)
	* code/branches/presentation2012/data/gui/scripts/ShipSelectionMenu.lua (copied)
	* code/branches/presentation2012/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentation2012/data/levels/tutorial.oxw (modified)
	* code/branches/presentation2012/src/libraries/core/Loader.cc (modified)
	* code/branches/presentation2012/src/orxonox/LevelInfo.cc (modified)
	* code/branches/presentation2012/src/orxonox/LevelInfo.h (modified)
	* code/branches/presentation2012/src/orxonox/LevelManager.cc (modified)
	* code/branches/presentation2012/src/orxonox/ShipManager.cc (copied)
	* code/branches/presentation2012/src/orxonox/ShipManager.h (copied)

	merged branch shipSelection


Fri, 18 May 2012 13:14:19 GMT smerkli [9203]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/data/levels/surfaceRace.oxw (copied)
	* code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt (copied)

	merged branch surfaceRace


Fri, 18 May 2012 13:13:04 GMT smerkli [9202]
	* code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified)

	small color update to damageboostpickup


Fri, 18 May 2012 12:58:33 GMT smerkli [9195]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation2012/data/levels/pickups.oxw (modified)
	* code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation2012/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation2012/src/modules/pickup/items/DamageBoostPickup.cc (copied)
	* code/branches/presentation2012/src/modules/pickup/items/DamageBoostPickup.h (copied)
	* code/branches/presentation2012/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/branches/presentation2012/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation2012/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged branch pickup2012


Fri, 18 May 2012 12:21:25 GMT smerkli [9189]
	* code/branches/presentation2012 (copied)

	Created presentation branch for FS2012.


Wed, 09 May 2012 07:13:13 GMT rgrieder [9165]
	* code/trunk/cmake/tools/CheckOGREPlugins.cmake (modified)

	Fixed OGRE plugin finding for Ubuntu precise. Untested!