#
# ChangeLog for code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc
#
# Generated by Trac 1.0.9
# Jun 13, 2024, 6:00:58 AM

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


Fri, 15 Dec 2017 11:07:58 GMT fanconic [11675]
	* code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc (deleted)
	* code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.h (deleted)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified)
	* code/branches/CampaignMap_HS17/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/CampaignMap_HS17/src/orxonox/worldentities/NameableStaticEntity.cc (added)
	* code/branches/CampaignMap_HS17/src/orxonox/worldentities/NameableStaticEntity.h (added)
	* code/branches/CampaignMap_HS17/src/orxonox/worldentities/StoryModePlanet.cc (deleted)
	* code/branches/CampaignMap_HS17/src/orxonox/worldentities/StoryModePlanet.h (deleted)

	renamed storymodeplanet to NameableStaticEntity