#
# ChangeLog for code/branches/presentationHS14/src/modules/objects/CMakeLists.txt
#
# Generated by Trac 1.0.9
# Jun 1, 2024, 5:46:46 AM

Mon, 15 Dec 2014 14:58:14 GMT maxima [10181]
	* code/branches/presentationHS14 (modified)
	* code/branches/presentationHS14/data/levels/includes/weaponSettingsTurret.oxi (modified)
	* code/branches/presentationHS14/data/levels/includes/weaponSettingsTurret1.oxi (copied)
	* code/branches/presentationHS14/data/levels/templates/enemytowerdefense.oxt (copied)
	* code/branches/presentationHS14/data/levels/templates/standardTurret.oxt (copied)
	* code/branches/presentationHS14/data/levels/templates/tower.oxt (modified)
	* code/branches/presentationHS14/data/levels/towerDefense.oxw (modified)
	* code/branches/presentationHS14/data/levels/turretTest.oxw (modified)
	* code/branches/presentationHS14/data/overlays/towerdefenseHUD.oxo (modified)
	* code/branches/presentationHS14/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/presentationHS14/src/modules/objects/CMakeLists.txt (modified)
	* code/branches/presentationHS14/src/modules/objects/Turret.cc (modified)
	* code/branches/presentationHS14/src/modules/objects/Turret.h (modified)
	* code/branches/presentationHS14/src/modules/objects/controllers (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TDCoordinate.cc (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TDCoordinate.h (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TDEnemy.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/Tower.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseController.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseEnemy.h (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseHUDController.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.h (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerTurret.cc (copied)
	* code/branches/presentationHS14/src/modules/towerdefense/TowerTurret.h (copied)
	* code/branches/presentationHS14/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentationHS14/src/orxonox/worldentities/WorldEntity.cc (modified)

	towerdefenseHS14 merged.


Wed, 10 Dec 2014 12:05:12 GMT smerkli [10160]
	* code/branches/presentationHS14 (copied)

	Created a presentation branch for HS 14


Tue, 19 Feb 2013 09:25:42 GMT jo [9526]
	* code/trunk (modified)
	* code/trunk/data/defaultConfig/keybindings.ini (modified)
	* code/trunk/data/levels/bigshipPresentation.oxw (copied)
	* code/trunk/data/levels/collateralDamageDemo.oxw (copied)
	* code/trunk/data/levels/gallery.oxw (modified)
	* code/trunk/data/levels/includes/weaponSettingsCollateral.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsTurret.oxi (copied)
	* code/trunk/data/levels/includes/weaponSettingsbigship.oxi (copied)
	* code/trunk/data/levels/pong.oxw (modified)
	* code/trunk/data/levels/presentationHS12.oxw (copied)
	* code/trunk/data/levels/templates/bigship.oxt (copied)
	* code/trunk/data/levels/templates/lodInformation.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipEscort.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipTurret.oxt (copied)
	* code/trunk/data/levels/turretTest.oxw (copied)
	* code/trunk/data/overlays/HUD.oxo (modified)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/src/modules/gametypes/CMakeLists.txt (modified)
	* code/trunk/src/modules/gametypes/GametypesPrereqs.h (modified)
	* code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRace.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.cc (copied)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.h (copied)
	* code/trunk/src/modules/gametypes/SpaceRaceController.cc (copied)
	* code/trunk/src/modules/gametypes/SpaceRaceController.h (copied)
	* code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified)
	* code/trunk/src/modules/objects/CMakeLists.txt (modified)
	* code/trunk/src/modules/objects/ObjectsPrereqs.h (modified)
	* code/trunk/src/modules/objects/Turret.cc (copied)
	* code/trunk/src/modules/objects/Turret.h (copied)
	* code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/trunk/src/modules/portals/PortalEndPoint.cc (modified)
	* code/trunk/src/modules/portals/PortalEndPoint.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified)
	* code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/interfaces/RadarViewable.h (modified)

	Merging presentationHS12 back to the trunk.