#
# ChangeLog for code/branches/Presentation_HS17/src
#
# Generated by Trac 1.0.9
# Nov 26, 2024, 3:02:14 AM

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