#
# ChangeLog for code/branches/Presentation_HS17
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 8:23:51 AM

Mon, 18 Dec 2017 11:40:00 GMT patricwi [11690]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/data/levels/ArrowLevel.oxw (deleted)
	* code/branches/Presentation_HS17/data/levels/scriptableControllerTest.oxw (deleted)
	* code/branches/Presentation_HS17/data/levels/scripts (deleted)
	* code/branches/Presentation_HS17/data/overlays/HUDPickupTemplate.oxo (modified)
	* code/branches/Presentation_HS17/data/overlays/HUDTemplate_test.oxo (copied)
	* code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/Presentation_HS17/src/libraries/core/BaseObject.h (modified)
	* code/branches/Presentation_HS17/src/libraries/tools/Timer.cc (modified)
	* code/branches/Presentation_HS17/src/libraries/tools/Timer.h (modified)
	* code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/modules/overlays/hud/HUDWaypoints.cc (deleted)
	* code/branches/Presentation_HS17/src/modules/overlays/hud/HUDWaypoints.h (deleted)
	* code/branches/Presentation_HS17/src/modules/questsystem/Quest.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/orxonox/Level.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/Level.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/controllers/ArrowController.cc (deleted)
	* code/branches/Presentation_HS17/src/orxonox/controllers/ArrowController.h (deleted)
	* code/branches/Presentation_HS17/src/orxonox/controllers/AutonomousDroneController.cc (deleted)
	* code/branches/Presentation_HS17/src/orxonox/controllers/AutonomousDroneController.h (deleted)
	* code/branches/Presentation_HS17/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/orxonox/controllers/WaypointArrow.cc (deleted)
	* code/branches/Presentation_HS17/src/orxonox/controllers/WaypointArrow.h (deleted)
	* code/branches/Presentation_HS17/src/orxonox/graphics/Model.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/items/ShipPart.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/scriptablecontroller (deleted)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/Arrow.cc (deleted)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/Arrow.h (deleted)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/AutonomousDrone.cc (deleted)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/AutonomousDrone.h (deleted)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	rolled back to functional without 2 branches


Sun, 17 Dec 2017 18:09:12 GMT patricwi [11688]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/src/orxonox/controllers/ArrowController.cc (copied)
	* code/branches/Presentation_HS17/src/orxonox/controllers/ArrowController.h (copied)

	finished merging presentation projects


Sun, 17 Dec 2017 13:37:50 GMT patricwi [11686]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/data/levels/scriptableControllerTest.oxw (copied)
	* code/branches/Presentation_HS17/data/levels/scripts (copied)
	* code/branches/Presentation_HS17/src/libraries/core/BaseObject.h (modified)
	* code/branches/Presentation_HS17/src/libraries/tools/Timer.cc (modified)
	* code/branches/Presentation_HS17/src/libraries/tools/Timer.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/orxonox/Level.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/Level.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/items/ShipPart.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/scriptablecontroller (copied)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	merged scriptable controller but not tested


Sun, 17 Dec 2017 13:35:52 GMT patricwi [11685]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/data/levels/ArrowLevel.oxw (copied)
	* code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/modules/overlays/hud/HUDWaypoints.cc (copied)
	* code/branches/Presentation_HS17/src/modules/overlays/hud/HUDWaypoints.h (copied)
	* code/branches/Presentation_HS17/src/orxonox/controllers/AutonomousDroneController.cc (copied)
	* code/branches/Presentation_HS17/src/orxonox/controllers/AutonomousDroneController.h (copied)
	* code/branches/Presentation_HS17/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/orxonox/controllers/WaypointArrow.cc (copied)
	* code/branches/Presentation_HS17/src/orxonox/controllers/WaypointArrow.h (copied)
	* code/branches/Presentation_HS17/src/orxonox/graphics/Model.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/Arrow.cc (copied)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/Arrow.h (copied)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/AutonomousDrone.cc (copied)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/AutonomousDrone.h (copied)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt (modified)

	files missing are ArrowController.cc and .h


Sat, 16 Dec 2017 14:10:43 GMT patricwi [11683]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/data/levels/Asteroids2D.oxw (copied)
	* code/branches/Presentation_HS17/data/levels/includes/asteroids2DWeapon.oxi (copied)
	* code/branches/Presentation_HS17/data/levels/templates/asteroidsAsteroids2D.oxt (copied)
	* code/branches/Presentation_HS17/data/levels/templates/spaceshipAsteroids2D.oxt (copied)
	* code/branches/Presentation_HS17/data/overlays/Asteroids2DHUD.oxo (copied)
	* code/branches/Presentation_HS17/src/modules/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/modules/asteroids2D (copied)

	asteroids merged


Sat, 16 Dec 2017 12:44:42 GMT patricwi [11682]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/data/gui/layouts/Dialog.layout (copied)
	* code/branches/Presentation_HS17/data/gui/layouts/Dialogue.layout (deleted)
	* code/branches/Presentation_HS17/data/gui/scripts/Dialog.lua (copied)
	* code/branches/Presentation_HS17/data/gui/scripts/Dialogue.lua (deleted)
	* code/branches/Presentation_HS17/data/levels/DialogShowcase.oxw (copied)
	* code/branches/Presentation_HS17/data/levels/DialogueShowcase.oxw (deleted)
	* code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/Presentation_HS17/src/modules/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/modules/dialog (copied)
	* code/branches/Presentation_HS17/src/modules/dialogue (deleted)

	dialog merged


Sat, 16 Dec 2017 12:32:02 GMT patricwi [11681]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/data/levels/NC_StoryModeLevel (copied)
	* code/branches/Presentation_HS17/data/levels/NC_StoryModeLevel.oxw (copied)
	* code/branches/Presentation_HS17/data/levels/StoryModeMap.oxw (modified)
	* code/branches/Presentation_HS17/data/levels/templates/StoryMode.oxt (modified)
	* code/branches/Presentation_HS17/data/levels/templates/StoryModeEscort.oxt (copied)
	* code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/Presentation_HS17/data/overlays/StoryModeHUD.oxo (modified)
	* code/branches/Presentation_HS17/data/overlays/StoryModeHUD2.oxo (copied)
	* code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/modules/overlays/hud/StoryModeHUD.cc (copied)
	* code/branches/Presentation_HS17/src/modules/overlays/hud/StoryModeHUD.h (copied)
	* code/branches/Presentation_HS17/src/orxonox/gametypes/StoryMode.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/gametypes/StoryMode.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/infos/Bot.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/NameableStaticEntity.cc (copied)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/NameableStaticEntity.h (copied)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/StoryModePawn.h (copied)

	added storyMode


Sat, 16 Dec 2017 12:04:11 GMT patricwi [11680]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/data/levels/ProtectBoss.oxw (copied)
	* code/branches/Presentation_HS17/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied)

	merged ProtectBoss


Sat, 16 Dec 2017 11:52:32 GMT patricwi [11679]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/data/levels/AsteroidFarming.oxw (copied)
	* code/branches/Presentation_HS17/src/modules/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/modules/asteroidmining (copied)
	* code/branches/Presentation_HS17/src/modules/pickup/Pickup.h (modified)
	* code/branches/Presentation_HS17/src/modules/pickup/PickupSpawner.cc (modified)
	* code/branches/Presentation_HS17/src/modules/pickup/PickupSpawner.h (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged AsteroidMining


Sat, 16 Dec 2017 11:24:20 GMT patricwi [11678]
	* code/branches/Presentation_HS17 (modified)
	* code/branches/Presentation_HS17/BlenderFilesSOB (copied)
	* code/branches/Presentation_HS17/SOB.oxw (copied)
	* code/branches/Presentation_HS17/TRANSFER (copied)
	* code/branches/Presentation_HS17/data/levels/FlappyOrx.oxw (copied)
	* code/branches/Presentation_HS17/data/levels/SOB.oxw (modified)
	* code/branches/Presentation_HS17/data/levels/templates/enemyFlappyOrx.oxt (copied)
	* code/branches/Presentation_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (copied)
	* code/branches/Presentation_HS17/data/overlays/FlappyOrxHUD.oxo (copied)
	* code/branches/Presentation_HS17/data/particle/fire3.particle (modified)
	* code/branches/Presentation_HS17/src/libraries/tools/Mesh.cc (modified)
	* code/branches/Presentation_HS17/src/libraries/tools/Mesh.h (modified)
	* code/branches/Presentation_HS17/src/modules/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/modules/flappyorx (copied)
	* code/branches/Presentation_HS17/src/modules/superorxobros/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOB.cc (modified)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOB.h (modified)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBFigure.h (modified)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBFireball.cc (copied)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBFireball.h (copied)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBFlagstone.h (modified)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBGumba.cc (modified)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBGumba.h (modified)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBGumbaBoss.cc (copied)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBGumbaBoss.h (copied)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBPrereqs.h (modified)
	* code/branches/Presentation_HS17/src/modules/superorxobros/SOBQBlock.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/graphics/Model.cc (modified)
	* code/branches/Presentation_HS17/src/orxonox/graphics/Model.h (modified)

	merged FlappyOrx and SOBv2


Sat, 16 Dec 2017 10:13:06 GMT patricwi [11677]
	* code/branches/Presentation_HS17 (copied)

	created new Presentation branch


Sun, 22 Oct 2017 22:23:21 GMT patricwi [11495]
	* code/trunk (modified)
	* code/trunk/data/levels/Hover.oxw (modified)
	* code/trunk/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/trunk/data/levels/templates/spaceshipHover.oxt (modified)
	* code/trunk/data/overlays/HoverHUD.oxo (modified)
	* code/trunk/src/modules/hover/CMakeLists.txt (modified)
	* code/trunk/src/modules/hover/Hover.cc (modified)
	* code/trunk/src/modules/hover/Hover.h (modified)
	* code/trunk/src/modules/hover/HoverFlag.cc (modified)
	* code/trunk/src/modules/hover/HoverOrigin.cc (modified)
	* code/trunk/src/modules/hover/HoverOrigin.h (modified)
	* code/trunk/src/modules/hover/HoverShip.cc (modified)
	* code/trunk/src/modules/hover/HoverShip.h (modified)
	* code/trunk/src/modules/hover/TFlagsLivesLevelHUD.cc (deleted)
	* code/trunk/src/modules/hover/TFlagsLivesLevelHUD.h (deleted)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified)

	reverted commit from merge with tgidronFS16 because failed to compile