#
# ChangeLog for code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc
#
# Generated by Trac 1.0.9
# May 23, 2024, 9:39:33 PM

Sun, 03 Jun 2012 14:33:13 GMT landauf [9269]
	* code/branches/presentation2012merge (modified)
	* code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (copied)
	* code/branches/presentation2012merge/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (copied)
	* code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (copied)
	* code/branches/presentation2012merge/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi (copied)
	* code/branches/presentation2012merge/data/levels/pickups.oxw (modified)
	* code/branches/presentation2012merge/data/levels/portals.oxw (modified)
	* code/branches/presentation2012merge/data/levels/surfaceRace.oxw (copied)
	* code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw (modified)
	* code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt (copied)
	* code/branches/presentation2012merge/data/levels/templates/tower.oxt (copied)
	* code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified)
	* code/branches/presentation2012merge/data/levels/towerDefense.oxw (copied)
	* code/branches/presentation2012merge/data/levels/tutorial.oxw (modified)
	* code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (copied)
	* code/branches/presentation2012merge/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (copied)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (copied)
	* code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense (copied)
	* code/branches/presentation2012merge/src/orxonox/LevelInfo.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/LevelInfo.h (modified)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.cc (copied)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.h (copied)
	* code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged presentation2012 to presentation2012merge


Thu, 24 May 2012 20:07:43 GMT landauf [9245]
	* code/branches/presentation2012 (modified)
	* code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi (modified)
	* code/branches/presentation2012/data/levels/templates/tower.oxt (modified)
	* code/branches/presentation2012/data/levels/towerDefense.oxw (modified)
	* code/branches/presentation2012/src/modules/towerdefense/Tower.cc (modified)
	* code/branches/presentation2012/src/modules/towerdefense/Tower.h (modified)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)

	tower defense update (again, now hopefully successful)