#
# ChangeLog for code/branches/Presentation_HS17_merge/src/orxonox
#
# Generated by Trac 1.0.9
# Sep 22, 2024, 8:08:34 AM

Sun, 18 Feb 2018 17:42:50 GMT landauf [11774]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (copied)
	* code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified)
	* code/branches/Presentation_HS17_merge/data/levels/tutorial.oxw (modified)
	* code/branches/Presentation_HS17_merge/data/overlays/HUDTemplate_test.oxo (copied)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.cc (copied)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.h (copied)
	* code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.h (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.h (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.h (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt (modified)

	merged Waypoints_HS17


Sun, 18 Feb 2018 16:33:19 GMT landauf [11770]
	* code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc (modified)
	* code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h (modified)

	[SOBv2_HS17] some cleanup in Model/Mesh


Sun, 18 Feb 2018 15:27:43 GMT landauf [11768]
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h (modified)

	[SOBv2_HS17] fixed build (Highscopre API has changed)


Sun, 18 Feb 2018 15:02:50 GMT landauf [11766]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/BlenderFilesSOB (copied)
	* code/branches/Presentation_HS17_merge/SOB.oxw (copied)
	* code/branches/Presentation_HS17_merge/TRANSFER (copied)
	* code/branches/Presentation_HS17_merge/data/levels/SOB.oxw (modified)
	* code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc (modified)
	* code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (copied)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h (copied)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc (copied)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h (copied)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h (modified)

	merged SOBv2_HS17


Sun, 18 Feb 2018 00:17:48 GMT landauf [11764]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw (copied)
	* code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied)

	merged ProtectBoss_HS17


Wed, 14 Feb 2018 23:11:35 GMT landauf [11746]
	* code/branches/Presentation_HS17_merge/data/overlays/HUDTemplatesFPS.oxo (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/interfaces/RadarViewable.h (modified)

	removed some more occurrences of "Map" (a class that doesn't seem to ...


Wed, 14 Feb 2018 23:11:04 GMT landauf [11745]
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h (modified)

	[CampaignMap_HS17] some cleanup


Wed, 14 Feb 2018 22:44:50 GMT landauf [11744]
	* code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel (deleted)
	* code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc (modified)
	* code/branches/Presentation_HS17_merge/svn-commit.tmp (deleted)

	[CampaignMap_HS17] reverted some unwanted changes


Wed, 14 Feb 2018 22:31:43 GMT landauf [11743]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel (copied)
	* code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw (copied)
	* code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt (copied)
	* code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo (modified)
	* code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo (copied)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc (copied)
	* code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h (copied)
	* code/branches/Presentation_HS17_merge/svn-commit.tmp (copied)

	merged CampaignMap_HS17


Sun, 11 Feb 2018 15:52:54 GMT landauf [11730]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw (copied)
	* code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroidmining (copied)
	* code/branches/Presentation_HS17_merge/src/modules/pickup/Pickup.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/pickup/PickupSpawner.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/pickup/PickupSpawner.h (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged AsteroidMining_HS17


Sat, 10 Feb 2018 23:00:43 GMT landauf [11723]
	* code/branches/Presentation_HS17_merge (copied)

	created new branch to merge HS17 projects back to trunk


Sun, 04 Feb 2018 15:58:37 GMT landauf [11720]
	* 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/infos/Bot.cc (modified)
	* code/trunk/src/orxonox/infos/GametypeInfo.h (modified)

	[SpaceRace_HS16] reverted some unwanted changes and fixed formatting ...