#
# ChangeLog for code/trunk
#
# Generated by Trac 1.0.9
# May 15, 2024, 2:33:10 AM

Thu, 09 Mar 2017 15:30:11 GMT patricwi [11359]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/CampaignMenu.layout (modified)
	* code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified)
	* code/trunk/data/gui/schemes/OrxonoxLook.scheme (modified)
	* code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified)
	* code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified)
	* code/trunk/data/gui/schemes/TaharezGreenLook.scheme (modified)
	* code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified)
	* code/trunk/data/gui/schemes/TaharezLook.scheme (modified)
	* code/trunk/data/gui/scripts/CampaignMenu.lua (modified)
	* code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/trunk/data/levels/StoryModeMap.oxw (copied)
	* code/trunk/data/levels/templates/StoryMode.oxt (copied)
	* code/trunk/data/overlays/StoryModeHUD.oxo (copied)
	* code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/gametypes/StoryMode.cc (copied)
	* code/trunk/src/orxonox/gametypes/StoryMode.h (copied)

	story mode map merged


Thu, 09 Mar 2017 15:22:19 GMT patricwi [11358]
	* code/trunk (modified)
	* code/trunk/data/levels/Spacerace2.oxw (deleted)
	* code/trunk/data/levels/SurfaceRacePresentation.oxw (deleted)
	* code/trunk/data/levels/newnewnewspacerace.oxw (copied)
	* code/trunk/data/levels/spaceRace.oxw (deleted)
	* code/trunk/data/levels/surfaceRace.oxw (deleted)
	* code/trunk/data/levels/templates/fastship.oxt (copied)
	* code/trunk/src/modules/gametypes/CMakeLists.txt (modified)
	* code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (deleted)
	* code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (deleted)
	* code/trunk/src/modules/gametypes/OldSpaceRace.cc (deleted)
	* code/trunk/src/modules/gametypes/OldSpaceRace.h (deleted)
	* code/trunk/src/modules/gametypes/SpaceRace.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRace.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/trunk/src/orxonox/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/infos/Bot.cc (modified)
	* code/trunk/src/orxonox/infos/GametypeInfo.h (modified)
	* code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified)

	space race merged


Thu, 09 Mar 2017 15:09:27 GMT patricwi [11357]
	* code/trunk (modified)
	* code/trunk/data/levels/Endurancefinal.oxw (copied)
	* code/trunk/data/levels/HeavyCruiser.oxw (modified)
	* code/trunk/data/levels/emptyLevel.oxw (modified)
	* code/trunk/data/levels/templates/endurancetest_template.oxt (copied)
	* code/trunk/data/levels/templates/test11.oxt (copied)
	* code/trunk/src/test.txt (copied)

	big ship merged


Thu, 09 Mar 2017 14:38:58 GMT patricwi [11356]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/HighscoreMenu.layout (copied)
	* code/trunk/data/gui/layouts/MainMenu.layout (modified)
	* code/trunk/data/gui/scripts/HighscoreMenu.lua (copied)
	* code/trunk/data/gui/scripts/MainMenu.lua (modified)
	* code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/trunk/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/trunk/src/modules/invader/Invader.cc (modified)
	* code/trunk/src/modules/jump/Jump.cc (modified)
	* code/trunk/src/modules/tetris/Tetris.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/Highscore.cc (copied)
	* code/trunk/src/orxonox/Highscore.h (copied)
	* code/trunk/src/orxonox/LevelInfo.cc (modified)
	* code/trunk/src/orxonox/LevelInfo.h (modified)

	merged space race with trunk


Thu, 09 Mar 2017 14:02:38 GMT patricwi [11355]
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)

	deleted comments


Thu, 09 Mar 2017 13:50:27 GMT patricwi [11354]
	* code/trunk (modified)
	* code/trunk/data/levels/pickups.oxw (modified)
	* code/trunk/data/overlays/HUDPickupTemplate.oxo (copied)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified)

	merged updated HUD branch to trunk


Thu, 09 Mar 2017 13:46:20 GMT patricwi [11353]
	* code/trunk (modified)
	* code/trunk/README (modified)
	* code/trunk/data/defaultConfig/keybindings.ini (modified)
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified)
	* code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDPickupItem.h (copied)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (copied)
	* code/trunk/src/modules/pickup/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (modified)

	merged HUD branch to trunk