#
# ChangeLog for code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt
#
# Generated by Trac 1.0.9
# Sep 20, 2024, 5:52:02 PM

Sun, 18 Feb 2018 00:17:48 GMT landauf [11764]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw (copied)
	* code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied)

	merged ProtectBoss_HS17


Wed, 14 Feb 2018 22:31:43 GMT landauf [11743]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel (copied)
	* code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw (copied)
	* code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt (copied)
	* code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo (modified)
	* code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo (copied)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc (copied)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h (copied)
	* code/branches/Presentation_HS17_merge/svn-commit.tmp (copied)

	merged CampaignMap_HS17


Sat, 10 Feb 2018 23:00:43 GMT landauf [11723]
	* code/branches/Presentation_HS17_merge (copied)

	created new branch to merge HS17 projects back to trunk


Sat, 31 Jan 2015 17:03:17 GMT landauf [10216]
	* code/trunk (modified)
	* code/trunk/data/gui/scripts/testscript.lua (copied)
	* code/trunk/data/levels/ModularShipsTest0.oxw (copied)
	* code/trunk/data/levels/ModularShipsTest1.oxw (copied)
	* code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified)
	* code/trunk/data/levels/jump.oxw (copied)
	* code/trunk/data/levels/levelTry.oxw (copied)
	* code/trunk/data/levels/michaelstestfile.lua (copied)
	* code/trunk/data/levels/scriptController.oxw (copied)
	* code/trunk/data/levels/templates/HeavyCruiser.oxt (modified)
	* code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (copied)
	* code/trunk/data/levels/templates/standardTurret.oxt (copied)
	* code/trunk/data/levels/turretTest.oxw (modified)
	* code/trunk/data/overlays/jumpHUD.oxo (copied)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/invader/InvaderWeapon.cc (modified)
	* code/trunk/src/modules/jump (copied)
	* code/trunk/src/modules/objects/CMakeLists.txt (modified)
	* code/trunk/src/modules/objects/Turret.cc (modified)
	* code/trunk/src/modules/objects/Turret.h (modified)
	* code/trunk/src/modules/objects/controllers (copied)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/Scene.cc (modified)
	* code/trunk/src/orxonox/ShipPartManager.cc (copied)
	* code/trunk/src/orxonox/ShipPartManager.h (copied)
	* code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/controllers/ControllerDirector.cc (copied)
	* code/trunk/src/orxonox/controllers/ControllerDirector.h (copied)
	* code/trunk/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.cc (copied)
	* code/trunk/src/orxonox/controllers/ScriptController.h (copied)
	* code/trunk/src/orxonox/controllers/testscript.lua (copied)
	* code/trunk/src/orxonox/items/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/items/PartDestructionEvent.cc (copied)
	* code/trunk/src/orxonox/items/PartDestructionEvent.h (copied)
	* code/trunk/src/orxonox/items/ShipPart.cc (copied)
	* code/trunk/src/orxonox/items/ShipPart.h (copied)
	* code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/MovableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (copied)
	* code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (copied)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	merged branch presentationFS14 back to trunk