#
# ChangeLog for code/branches/Presentation_HS17_merge
#
# Generated by Trac 1.0.9
# Jun 2, 2024, 6:25:54 AM

Sun, 11 Feb 2018 17:04:36 GMT landauf [11733]
	* code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw (modified)

	[AsteroidMining_HS17] fixed level file


Sun, 11 Feb 2018 17:04:01 GMT landauf [11732]
	* code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified)

	[AsteroidMining_HS17] fixed a bunch of compile- and run-time errors ...


Sun, 11 Feb 2018 16:13:24 GMT landauf [11731]
	* code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h (added)
	* code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified)

	[AsteroidMining_HS17] fixed dll linkage for MSVC


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


Sun, 11 Feb 2018 15:49:56 GMT landauf [11729]
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/dodgerace/DodgeRace.h (modified)

	fixed crash when setting highscore


Sun, 11 Feb 2018 15:13:55 GMT landauf [11728]
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc (modified)

	[Asteroid_HS17] fixed a bunch of bugs in the placement of stones


Sun, 11 Feb 2018 14:44:49 GMT landauf [11727]
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h (modified)

	[Asteroid_HS17] cleanup (mostly includes)


Sat, 10 Feb 2018 23:33:56 GMT landauf [11726]
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc (modified)

	[Asteroid_HS17] fixed build - highscore API was changed in the
	meantime


Sat, 10 Feb 2018 23:26:40 GMT landauf [11725]
	* code/branches/Presentation_HS17_merge (modified)
	* code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw (copied)
	* code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi (copied)
	* code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt (copied)
	* code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt (copied)
	* code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo (copied)
	* code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified)
	* code/branches/Presentation_HS17_merge/src/modules/asteroids2D (copied)

	merged Asteroid_HS17


Sat, 10 Feb 2018 23:24:16 GMT landauf [11724]
	* code/branches/Presentation_HS17_merge/src/modules/pickup/PickupPrereqs.h (modified)

	fixed compiler warning


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


Sat, 10 Feb 2018 00:02:18 GMT landauf [11722]
	* code/trunk/data/levels/StoryModeMap.oxw (modified)
	* code/trunk/data/levels/templates/StoryMode.oxt (modified)

	[StoryModeMap_HS16] fixed warnings in console