#
# ChangeLog for code/branches/Merge_HS18/src
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 10:15:20 AM

Tue, 11 Dec 2018 18:38:06 GMT merholzl [12185]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/OrxoKart1.oxw (copied)
	* code/branches/Merge_HS18/data/levels/OrxoKart2.oxw (copied)
	* code/branches/Merge_HS18/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/Merge_HS18/data/levels/kart_alpha0.1.oxw (copied)
	* code/branches/Merge_HS18/data/levels/templates/OrxoKartKart.oxt (copied)
	* code/branches/Merge_HS18/data/overlays/OrxoKartHUD.oxo (copied)
	* code/branches/Merge_HS18/data/tcl/orxokart_highscores.txt (copied)
	* code/branches/Merge_HS18/src/modules/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/orxokart (copied)
	* code/branches/Merge_HS18/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/svn_is_cancer (copied)

	OrxoKart merge


Tue, 11 Dec 2018 17:53:27 GMT merholzl [12184]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/Wagnis.oxw (copied)
	* code/branches/Merge_HS18/data/levels/templates/wagnisCursor.oxt (copied)
	* code/branches/Merge_HS18/data/overlays/WagnisHUD.oxo (copied)
	* code/branches/Merge_HS18/src/libraries/tools/Timer.cc (modified)
	* code/branches/Merge_HS18/src/modules/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/wagnis (copied)
	* code/branches/Merge_HS18/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/weapons/projectiles/WagnisProjectile.cc (copied)
	* code/branches/Merge_HS18/src/modules/weapons/projectiles/WagnisProjectile.h (copied)
	* code/branches/Merge_HS18/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/weapons/weaponmodes/WagnisGun.cc (copied)
	* code/branches/Merge_HS18/src/modules/weapons/weaponmodes/WagnisGun.h (copied)

	Wagnis Merge


Tue, 11 Dec 2018 17:33:26 GMT merholzl [12183]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/BumpMap.oxw (copied)
	* code/branches/Merge_HS18/data/levels/tutorial.oxw (modified)
	* code/branches/Merge_HS18/src/libraries/tools/Mesh.cc (modified)

	Shader merge


Tue, 11 Dec 2018 17:20:24 GMT merholzl [12182]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/emptyLevel.oxw (modified)
	* code/branches/Merge_HS18/data/levels/towerDefense.oxw (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseController.cc (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseController.h (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseField.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseRangeViewer.cc (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseRangeViewer.h (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/towerdefensereadme.txt (modified)

	RD merge


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


Tue, 11 Dec 2018 13:21:47 GMT merholzl [12179]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/TixyTaxyTorxy.oxw (copied)
	* code/branches/Merge_HS18/data/overlays/TixyTaxyTorxyHUD.oxo (copied)
	* code/branches/Merge_HS18/src/modules/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/TixyTaxyTorxy (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)

	Tictactoe merge


Tue, 11 Dec 2018 12:50:03 GMT merholzl [12178]
	* code/branches/Merge_HS18 (copied)

	MergeBranch


Wed, 14 Nov 2018 08:17:56 GMT merholzl [12099]
	* code/trunk (modified)
	* code/trunk/cmake/InstallCheck.cmake (modified)
	* code/trunk/cmake/tools/FindCEGUI.cmake (modified)
	* code/trunk/src/libraries/tools/Timer.h (modified)

	Merging changes for Flatpak building convenience into trunk