#
# ChangeLog for code/branches/Presentation_HS16
#
# Generated by Trac 1.0.9
# May 14, 2024, 7:01:44 AM

Wed, 14 Dec 2016 15:05:11 GMT maxima [11342]
	* code/branches/Presentation_HS16 (modified)
	* code/branches/Presentation_HS16/data/levels/Spacerace2.oxw (deleted)
	* code/branches/Presentation_HS16/data/levels/SurfaceRacePresentation.oxw (deleted)
	* code/branches/Presentation_HS16/data/levels/newnewnewspacerace.oxw (copied)
	* code/branches/Presentation_HS16/data/levels/spaceRace.oxw (deleted)
	* code/branches/Presentation_HS16/data/levels/surfaceRace.oxw (deleted)
	* code/branches/Presentation_HS16/data/levels/templates/fastship.oxt (copied)
	* code/branches/Presentation_HS16/src/modules/gametypes/CMakeLists.txt (modified)
	* code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.cc (deleted)
	* code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.h (deleted)
	* code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.cc (deleted)
	* code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.h (deleted)
	* code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.h (modified)
	* code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.cc (modified)
	* code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.h (modified)
	* code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/Presentation_HS16/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/Presentation_HS16/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/Presentation_HS16/src/orxonox/infos/Bot.cc (modified)
	* code/branches/Presentation_HS16/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/Presentation_HS16/src/orxonox/sound/WorldAmbientSound.cc (modified)
	* code/branches/Presentation_HS16/svn-commit.2.tmp (copied)
	* code/branches/Presentation_HS16/svn-commit.tmp (copied)

	spacerace branch merged to presentation


Wed, 14 Dec 2016 14:33:41 GMT maxima [11341]
	* code/branches/Presentation_HS16 (modified)
	* code/branches/Presentation_HS16/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/Presentation_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified)
	* code/branches/Presentation_HS16/data/gui/schemes/OrxonoxLook.scheme (modified)
	* code/branches/Presentation_HS16/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified)
	* code/branches/Presentation_HS16/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified)
	* code/branches/Presentation_HS16/data/gui/schemes/TaharezGreenLook.scheme (modified)
	* code/branches/Presentation_HS16/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified)
	* code/branches/Presentation_HS16/data/gui/schemes/TaharezLook.scheme (modified)
	* code/branches/Presentation_HS16/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/Presentation_HS16/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/Presentation_HS16/data/levels/Invaders.oxw (modified)
	* code/branches/Presentation_HS16/data/levels/StoryModeMap.oxw (copied)
	* code/branches/Presentation_HS16/data/levels/emptyLevel.oxw (modified)
	* code/branches/Presentation_HS16/data/levels/templates/StoryMode.oxt (copied)
	* code/branches/Presentation_HS16/data/overlays/StoryModeHUD.oxo (copied)
	* code/branches/Presentation_HS16/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/branches/Presentation_HS16/src/orxonox/gametypes/StoryMode.cc (copied)
	* code/branches/Presentation_HS16/src/orxonox/gametypes/StoryMode.h (copied)

	storymode branch merged to presentation


Wed, 14 Dec 2016 12:39:14 GMT maxima [11339]
	* code/branches/Presentation_HS16 (modified)
	* code/branches/Presentation_HS16/data/defaultConfig/orxonox.ini (modified)
	* code/branches/Presentation_HS16/data/gui/layouts/HighscoreMenu.layout (copied)
	* code/branches/Presentation_HS16/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/Presentation_HS16/data/gui/scripts/HighscoreMenu.lua (copied)
	* code/branches/Presentation_HS16/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/Presentation_HS16/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/branches/Presentation_HS16/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/branches/Presentation_HS16/src/modules/invader/Invader.cc (modified)
	* code/branches/Presentation_HS16/src/modules/jump/Jump.cc (modified)
	* code/branches/Presentation_HS16/src/modules/tetris/Tetris.cc (modified)
	* code/branches/Presentation_HS16/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/Presentation_HS16/src/orxonox/CMakeLists.txt (modified)
	* code/branches/Presentation_HS16/src/orxonox/Highscore.cc (copied)
	* code/branches/Presentation_HS16/src/orxonox/Highscore.h (copied)
	* code/branches/Presentation_HS16/src/orxonox/LevelInfo.cc (modified)
	* code/branches/Presentation_HS16/src/orxonox/LevelInfo.h (modified)

	merged the highscore branch to presentation


Wed, 14 Dec 2016 12:06:27 GMT maxima [11338]
	* code/branches/Presentation_HS16 (copied)

	new branch for presentation. starting with HUD branch


Mon, 12 Dec 2016 15:20:50 GMT patricwi [11336]
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified)
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (modified)
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified)
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h (modified)
	* code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/HUD_HS16/src/modules/pickup/PickupManager.h (modified)
	* code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h (modified)

	finished version of HUD and PickupSystem. crash bug remaining