#
# ChangeLog for code/branches/presentationHS14merge
#
# Generated by Trac 1.0.9
# Nov 30, 2024, 4:51:51 AM

Thu, 05 Feb 2015 22:43:24 GMT landauf [10257]
	* code/branches/presentationHS14merge/data/levels/kecks.oxw (modified)

	fixed tag


Thu, 05 Feb 2015 22:21:35 GMT landauf [10256]
	* code/branches/presentationHS14merge/src/modules/mini4dgame/Mini4DgamePrereqs.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.h (modified)

	found some hidden changes in a merge commit in presentationHS14 and ...


Wed, 04 Feb 2015 21:21:28 GMT landauf [10255]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/cmake/LibraryConfig.cmake (modified)
	* code/branches/presentationHS14merge/data/defaultConfig/orxonox.ini (copied)
	* code/branches/presentationHS14merge/data/gui/layouts/CampaignMenu.layout (copied)
	* code/branches/presentationHS14merge/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/presentationHS14merge/data/gui/scripts/CampaignMenu.lua (copied)
	* code/branches/presentationHS14merge/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentationHS14merge/src/orxonox/LevelManager.cc (modified)
	* code/branches/presentationHS14merge/src/orxonox/LevelManager.h (modified)
	* code/branches/presentationHS14merge/src/orxonox/gametypes/Mission.cc (modified)

	merged storymodeHS14


Sun, 01 Feb 2015 21:21:51 GMT landauf [10248]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/includes/weaponSettingsTurret1.oxi (copied)
	* code/branches/presentationHS14merge/data/levels/templates/enemytowerdefense.oxt (copied)
	* code/branches/presentationHS14merge/data/levels/templates/tower.oxt (modified)
	* code/branches/presentationHS14merge/data/levels/towerDefense.oxw (modified)
	* code/branches/presentationHS14merge/data/overlays/towerdefenseHUD.oxo (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TDCoordinate.cc (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TDCoordinate.h (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TDEnemy.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/Tower.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseController.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.cc (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.h (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseHUDController.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseHUDController.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePlayerStats.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseTower.cc (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseTower.h (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerTurret.cc (copied)
	* code/branches/presentationHS14merge/src/modules/towerdefense/TowerTurret.h (copied)

	merged towerdefenseHS14 (except some debug code)


Sun, 01 Feb 2015 19:58:38 GMT landauf [10242]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.h (modified)

	merged hudHS14


Sun, 01 Feb 2015 17:42:19 GMT landauf [10238]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/FPS_Level_HS14.oxw (copied)
	* code/branches/presentationHS14merge/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied)
	* code/branches/presentationHS14merge/data/levels/presentationHS13.oxw (modified)
	* code/branches/presentationHS14merge/data/levels/templates/FPS.oxt (modified)
	* code/branches/presentationHS14merge/data/levels/templates/FPS_HS14.oxt (copied)
	* code/branches/presentationHS14merge/data/levels/templates/spacestation_elements.oxt (copied)
	* code/branches/presentationHS14merge/data/levels/templates/ss_tube01.oxt (copied)
	* code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc (modified)

	merged weaponupdateHS14 (except some unnecessary changes)


Sun, 01 Feb 2015 14:57:57 GMT landauf [10237]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/DodgeRace.oxw (copied)
	* code/branches/presentationHS14merge/data/levels/templates/DodgeRacePattern.oxt (copied)
	* code/branches/presentationHS14merge/data/levels/templates/spaceshipDodgeRace.oxt (copied)
	* code/branches/presentationHS14merge/data/overlays/DodgeRaceHUD.oxo (copied)
	* code/branches/presentationHS14merge/src/modules/CMakeLists.txt (modified)
	* code/branches/presentationHS14merge/src/modules/dodgerace (copied)

	merged surfaceraceHS14 (but without all the strange stuff that ...


Sun, 01 Feb 2015 14:07:00 GMT landauf [10231]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/4Dtest.oxw (copied)
	* code/branches/presentationHS14merge/src/modules/CMakeLists.txt (modified)
	* code/branches/presentationHS14merge/src/modules/mini4dgame (copied)

	merged minigame4DHS14


Sun, 01 Feb 2015 13:03:23 GMT landauf [10224]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/AnihilationThreat.oxw (copied)
	* code/branches/presentationHS14merge/src/modules/notifications/NotificationQueueCEGUI.cc (modified)

	merged leveljoemeHS14


Sun, 01 Feb 2015 13:02:26 GMT landauf [10223]
	* code/branches/presentationHS14merge (modified)
	* code/branches/presentationHS14merge/data/levels/kecks.oxw (copied)

	merged keckslevelHS14


Sun, 01 Feb 2015 12:51:57 GMT landauf [10222]
	* code/branches/presentationHS14merge (copied)

	created new branch to merge the changes from HS14


Sat, 31 Jan 2015 22:29:45 GMT landauf [10218]
	* code/trunk/src/modules/jump/Jump.cc (modified)
	* code/trunk/src/modules/jump/JumpFigure.cc (modified)
	* code/trunk/src/modules/jump/JumpPrereqs.h (modified)
	* code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.cc (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.h (modified)

	fixed build and warnings with MSVC