#
# ChangeLog for code/branches/Merge_HS18/svn-commit.tmp
#
# Generated by Trac 1.0.9
# May 10, 2024, 10:18:01 AM

Tue, 11 Dec 2018 13:52:30 GMT merholzl [12180]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/Merge_HS18/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/Merge_HS18/data/levels/MapExample.oxw (copied)
	* code/branches/Merge_HS18/data/levels/StoryModeMap.oxw (modified)
	* code/branches/Merge_HS18/data/levels/emptyLevel22.oxw (copied)
	* code/branches/Merge_HS18/data/levels/templates/MapExample.oxt (copied)
	* code/branches/Merge_HS18/data/levels/templates/StoryMode.oxt (modified)
	* code/branches/Merge_HS18/data/levels/templates/StoryModeEscort.oxt (modified)
	* code/branches/Merge_HS18/data/overlays/MapExampleHUD.oxo (copied)
	* code/branches/Merge_HS18/data/overlays/StoryModeHUD.oxo (modified)
	* code/branches/Merge_HS18/src/modules/flappyorx/FlappyOrxShip.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)
	* code/branches/Merge_HS18/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/orxonox/controllers/SMCoord.cc (copied)
	* code/branches/Merge_HS18/src/orxonox/controllers/SMCoord.h (copied)
	* code/branches/Merge_HS18/src/orxonox/controllers/StoryModeController.cc (copied)
	* code/branches/Merge_HS18/src/orxonox/controllers/StoryModeController.h (copied)
	* code/branches/Merge_HS18/src/orxonox/gametypes/StoryMode.cc (modified)
	* code/branches/Merge_HS18/svn-commit.tmp (copied)

	World Map merging


Wed, 05 Dec 2018 10:56:19 GMT linggj [12152]
	* code/branches/WorldMap_HS18/data/levels/MapExample.oxw (added)
	* code/branches/WorldMap_HS18/data/levels/templates/MapExample.oxt (added)
	* code/branches/WorldMap_HS18/data/overlays/MapExampleHUD.oxo (added)
	* code/branches/WorldMap_HS18/svn-commit.tmp (added)

	it works