#
# ChangeLog for code/branches/presentation2012/src
#
# Generated by Trac 1.0.9
# Nov 28, 2024, 12:18:43 PM

Wed, 23 May 2012 11:07:29 GMT decapitb [9229]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/.project (copied)
	* code/branches/presentation2012/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi (copied)
	* code/branches/presentation2012/data/levels/portals.oxw (modified)
	* code/branches/presentation2012/data/levels/teamDeathMatch.oxw (modified)
	* code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/presentation2012/data/levels/templates/tower.oxt (copied)
	* code/branches/presentation2012/data/levels/theTimeMachine.oxw (modified)
	* code/branches/presentation2012/data/levels/towerDefense.oxw (copied)
	* code/branches/presentation2012/data/overlays/towerdefenseHUD.oxo (copied)
	* code/branches/presentation2012/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation2012/src/modules/towerdefense (copied)
	* code/branches/presentation2012/src/modules/towerdefense/CMakeLists.txt (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TDEnemy.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Tower.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/Tower.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseCenterpoint.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseController.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseController.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseHUDController.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefenseHUDController.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefensePrereqs.h (copied)
	* code/branches/presentation2012/src/modules/towerdefense/tower (copied)
	* code/branches/presentation2012/src/modules/towerdefense/tower/Tower.blend (copied)
	* code/branches/presentation2012/src/modules/towerdefense/tower/Tower.material (copied)
	* code/branches/presentation2012/src/modules/towerdefense/tower/Tower.mesh (copied)
	* code/branches/presentation2012/src/modules/towerdefense/towerdefensereadme.txt (copied)
	* code/branches/presentation2012/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/presentation2012/src/orxonox/controllers/WaypointController.cc (modified)
	* code/branches/presentation2012/src/orxonox/worldentities/WorldEntity.cc (modified)

	merged towerdefense


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 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, 21 Mar 2012 20:31:38 GMT dafrick [9050]
	* code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)

	More elegant resolution of discrepancies between cegui 0.6 and 0.7.