#
# ChangeLog for code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc
#
# Generated by Trac 1.0.9
# May 19, 2024, 12:15:44 PM

Sun, 10 Jun 2012 15:13:00 GMT jo [9286]
	* code/branches/presentation2012merge (modified)
	* code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified)
	* code/branches/presentation2012merge/data/levels/tetris.oxw (modified)
	* code/branches/presentation2012merge/src/modules/tetris/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified)
	* code/branches/presentation2012merge/src/modules/tetris/Tetris.h (modified)
	* code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc (copied)
	* code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.h (copied)
	* code/branches/presentation2012merge/src/modules/tetris/TetrisCenterpoint.cc (modified)
	* code/branches/presentation2012merge/src/modules/tetris/TetrisCenterpoint.h (modified)
	* code/branches/presentation2012merge/src/modules/tetris/TetrisPrereqs.h (modified)
	* code/branches/presentation2012merge/src/modules/tetris/TetrisScore.cc (copied)
	* code/branches/presentation2012merge/src/modules/tetris/TetrisScore.h (copied)
	* code/branches/presentation2012merge/src/modules/tetris/TetrisStone.cc (modified)
	* code/branches/presentation2012merge/src/modules/tetris/TetrisStone.h (modified)
	* code/branches/presentation2012merge/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/TeamDeathmatch.h (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc (modified)

	Merged pCuts branch.


Sun, 03 Jun 2012 15:17:18 GMT landauf [9271]
	* code/branches/presentation2012merge/cmake/tools/BuildUnits.cmake (modified)
	* code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (modified)
	* code/branches/presentation2012merge/data/gui/layouts/SingleplayerConfigMenu.layout (modified)
	* code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (modified)
	* code/branches/presentation2012merge/data/gui/scripts/SingleplayerConfigMenu.lua (modified)
	* code/branches/presentation2012merge/data/levels/Spacerace2.oxw (modified)
	* code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (modified)
	* code/branches/presentation2012merge/data/levels/asteroidField.oxw (modified)
	* code/branches/presentation2012merge/data/levels/includes/asteroidField.lua (modified)
	* code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi (modified)
	* code/branches/presentation2012merge/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified)
	* code/branches/presentation2012merge/data/levels/missionOne.oxw (modified)
	* code/branches/presentation2012merge/data/levels/presentationHS11.oxw (modified)
	* code/branches/presentation2012merge/data/levels/surfaceRace.oxw (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipSpacecruiser.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/tower.oxt (modified)
	* code/branches/presentation2012merge/data/levels/towerDefense.oxw (modified)
	* code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (modified)
	* code/branches/presentation2012merge/doc/api/groups/Portals.dox (modified)
	* code/branches/presentation2012merge/doc/api/groups/Weapons.dox (modified)
	* code/branches/presentation2012merge/src/BuildUnitsConfigGCC.cmake (modified)
	* code/branches/presentation2012merge/src/BuildUnitsConfigMSVC.cmake (modified)
	* code/branches/presentation2012merge/src/external/enet/VERSION (modified)
	* code/branches/presentation2012merge/src/external/tolua/README_ORXONOX (modified)
	* code/branches/presentation2012merge/src/libraries/util/output/ConsoleWriter.cc (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.cc (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/OldRaceCheckPoint.h (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.cc (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/presentation2012merge/src/modules/gametypes/SpaceRaceManager.h (modified)
	* code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.cc (modified)
	* code/branches/presentation2012merge/src/modules/overlays/hud/HUDBoostBar.h (modified)
	* code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified)
	* code/branches/presentation2012merge/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TDEnemy.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/Tower.cc (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/Tower.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.cc (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseController.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefenseHUDController.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense/towerdefensereadme.txt (modified)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.h (modified)
	* code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/controllers/FormationController.h (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/Mission.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/Mission.h (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/gametypes/TeamGametype.h (modified)

	svn:eol-style native (no changes in code)


Sun, 03 Jun 2012 13:38:49 GMT landauf [9266]
	* code/branches/presentation2012merge (copied)

	created branch from trunk to merge the cleanup of presentation2011 ...


Wed, 21 Mar 2012 07:06:06 GMT dafrick [9048]
	* code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified)

	Resolving a warning.