#
# ChangeLog for /
#
# Generated by Trac 1.0.9
# Nov 18, 2024, 10:55:46 PM

Mon, 04 Dec 2017 12:38:14 GMT varxth [11621]
	* code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified)

	castle


Sun, 03 Dec 2017 20:22:33 GMT pascscha [11620]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h (modified)

	XML Port


Sun, 03 Dec 2017 18:48:35 GMT vyang [11619]
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.h (modified)

	Kompilierfehler behoben


Sun, 03 Dec 2017 18:32:18 GMT remartin [11618]
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified)

	Die überkomplizierte Verteilung in SpawnChildren funktioniert recht ...


Sun, 03 Dec 2017 17:02:22 GMT vyang [11617]
	* code/branches/Asteroid_HS17/data/levels/Asteroids2D.oxw (modified)
	* code/branches/Asteroid_HS17/data/levels/templates/asteroidsAsteroids2D.oxt (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h (modified)

	spawnEnemy und Templates für die 3 Grössen der Asteroiden
	geschrieben.


Sat, 02 Dec 2017 17:15:54 GMT vyang [11616]
	* code/branches/Asteroid_HS17/data/levels/Asteroids2D.oxw (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCube.cc (deleted)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCube.h (deleted)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.cc (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.h (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/CMakeLists.txt (modified)

	Asteroids2DStones erstellt, lassen sich ins Level laden, random spawn ...


Fri, 01 Dec 2017 19:40:42 GMT remartin [11615]
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (modified)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (modified)

	Gebastel in spawnChildren, hat immer noch Fehler drin.


Fri, 01 Dec 2017 17:38:00 GMT vyang [11614]
	* code/branches/Asteroid_HS17/data/levels/Asteroids2D.oxw (modified)
	* code/branches/Asteroid_HS17/data/levels/templates/asteroidsAsteroids2D.oxt (added)
	* code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids2D.oxt (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCube.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCube.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h (modified)

	Asteroids werden random geladen-> collisionShape und Bewegung
	einstellen


Thu, 30 Nov 2017 17:34:56 GMT vyang [11613]
	* code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids2D.oxt (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCenterPoint.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h (modified)

	Geschwindigkeit im Level angepasst, Raumschiff kann das Spielfeld ...


Thu, 30 Nov 2017 14:35:25 GMT kuchlert [11612]
	* code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua (modified)
	* code/branches/Dialog_HS17/data/gui/scripts/Dialogue.lua (modified)
	* code/branches/Dialog_HS17/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogPrereqs.h (modified)

	funktioniert bis dialogmanager getInstance, angefangen und noch zu ...


Thu, 30 Nov 2017 08:33:27 GMT kuchlert [11611]
	* code/branches/Dialog_HS17/src/modules/dialog/Answer.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Answer.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/AnswerId.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/AnswerId.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/CMakeLists.txt (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogPrereqs.h (added)
	* code/branches/Dialog_HS17/src/modules/dialog/Question.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Question.h (modified)

	fixed addQuestion and addAnswer in Dialog


Mon, 27 Nov 2017 17:54:29 GMT remartin [11610]
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.cc (added)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/SpicedAsteroidField.h (added)




Mon, 27 Nov 2017 17:53:05 GMT remartin [11609]
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)
	* code/branches/AsteroidMining_HS17/src/modules/pickup/PickupSpawner.cc (modified)
	* code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Solved pickup problem with tiny adaptation in Pawn.h and ...


Mon, 27 Nov 2017 16:00:59 GMT vyang [11608]
	* code/branches/Asteroid_HS17/data/levels/Asteroids2D.oxw (modified)
	* code/branches/Asteroid_HS17/data/levels/MiniGameTest.oxw (modified)
	* code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids2D.oxt (modified)
	* code/branches/Asteroid_HS17/data/levels/templates/spaceshipMiniGameTest.oxt (modified)
	* code/branches/Asteroid_HS17/data/overlays/Asteroids2DHUD.oxo (added)
	* code/branches/Asteroid_HS17/data/overlays/MiniGameTestHUD.oxo (added)
	* code/branches/Asteroid_HS17/src/modules/CMakeLists.txt (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCenterPoint.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCenterPoint.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DHUDinfo.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/CMakeLists.txt (modified)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTest.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTest.h (modified)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestShip.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestShip.h (modified)

	Asteroids2D erfolgreich als Minigame eingebunden, Dimensionen des ...


Mon, 27 Nov 2017 15:57:47 GMT maxima [11607]
	* code/branches/Dialog_HS17/src/modules/dialog/Answer.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Answer.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/AnswerId.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/AnswerId.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/CMakeLists.txt (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Question.cc (modified)
	* code/branches/Dialog_HS17/src/modules/dialog/Question.h (modified)

	No more compiler errors. XMLPortObjects not yet implemented.


Mon, 27 Nov 2017 15:38:50 GMT kohlia [11606]
	* code/branches/ScriptableController_HS17/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/items/ShipPart.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	Pawn killing works too now


Mon, 27 Nov 2017 15:31:26 GMT fanconic [11605]
	* code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/data/levels/templates/StoryMode.oxt (modified)
	* code/branches/CampaignMap_HS17/data/levels/templates/StoryModeEscort.oxt (added)
	* code/branches/CampaignMap_HS17/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD.oxo (modified)
	* code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (modified)
	* code/branches/CampaignMap_HS17/src/orxonox/controllers/StoryModeController.cc (added)
	* code/branches/CampaignMap_HS17/src/orxonox/controllers/StoryModeController.h (added)

	Beschriftung Funktioniert nun. Zusaetzlich ist das Levelfile mit ...


Mon, 27 Nov 2017 15:29:35 GMT lrigoni [11604]
	* code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified)
	* code/branches/ProtectBoss_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/ProtectBoss_HS17/src/orxonox/worldentities/pawns/ShootableObstacle.cc (added)
	* code/branches/ProtectBoss_HS17/src/orxonox/worldentities/pawns/ShootableObstacle.h (added)

	Changes of 27.11.2017


Mon, 27 Nov 2017 15:15:26 GMT jostoffe [11603]
	* code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified)

	Der Pfeil ist nun immer senkrecht oberhalb vom SpaceShip. ...


Mon, 27 Nov 2017 14:55:34 GMT varxth [11602]
	* code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOB.cc (modified)

	! angeschrieben


Mon, 27 Nov 2017 14:32:34 GMT zarron [11601]
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOB.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOB.h (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified)

	with Highscores


Mon, 27 Nov 2017 14:29:03 GMT merholzl [11600]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified)
	* code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h (modified)

	XML Ports and cleanUp


Mon, 27 Nov 2017 14:28:41 GMT varxth [11599]
	* code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (modified)

	fireball with particle spawner


Mon, 27 Nov 2017 14:00:47 GMT pascscha [11598]
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)

	faster asteroid spawning


Mon, 27 Nov 2017 13:21:11 GMT varxth [11597]
	* code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBQBlock.cc (modified)

	Collisionshape of fireball


Mon, 27 Nov 2017 13:05:12 GMT merholzl [11596]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified)
	* code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)

	Cleanup of level files


Mon, 27 Nov 2017 13:03:45 GMT pascscha [11595]
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h (modified)

	cleanup


Mon, 27 Nov 2017 13:02:42 GMT vyang [11594]
	* code/branches/Asteroid_HS17/data/tcl/core (deleted)
	* code/branches/Asteroid_HS17/svn-commit.tmp (deleted)

	data/tcl/core und svn-commit.tmp geloescht


Mon, 27 Nov 2017 13:00:29 GMT vyang [11593]
	* code/branches/Asteroid_HS17/data/levels/Asteroids.oxw (deleted)
	* code/branches/Asteroid_HS17/data/levels/Asteroids2D.oxw (added)
	* code/branches/Asteroid_HS17/data/levels/MiniGameTest.oxw (added)
	* code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids.oxt (deleted)
	* code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids2D.oxt (added)
	* code/branches/Asteroid_HS17/data/levels/templates/spaceshipMiniGameTest.oxt (added)
	* code/branches/Asteroid_HS17/data/tcl/core (added)
	* code/branches/Asteroid_HS17/src/modules/CMakeLists.txt (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids (deleted)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCenterPoint.cc (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCenterPoint.h (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCube.cc (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCube.h (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DHUDinfo.cc (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DHUDinfo.h (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DPrereqs.h (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids2D/CMakeLists.txt (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/CMakeLists.txt (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTest.cc (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTest.h (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestCenterPoint.cc (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestCenterPoint.h (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestCube.cc (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestCube.h (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestHUDinfo.cc (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestHUDinfo.h (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestPrereqs.h (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestShip.cc (added)
	* code/branches/Asteroid_HS17/src/modules/minigametest/MiniGameTestShip.h (added)
	* code/branches/Asteroid_HS17/svn-commit.tmp (added)

	MiniGameTest Minigame erstellt -> Kopie von DodgeRace, Namen von ...


Mon, 27 Nov 2017 12:41:13 GMT zarron [11592]
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)

	shooting mechanism fixed


Mon, 27 Nov 2017 12:39:12 GMT varxth [11591]
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBQBlock.cc (modified)

	Fix in QBlock


Mon, 27 Nov 2017 12:21:57 GMT varxth [11590]
	* code/branches/SOBv2_HS17/TRANSFER (added)
	* code/branches/SOBv2_HS17/TRANSFER/orxo_material_fire.material (added)
	* code/branches/SOBv2_HS17/TRANSFER/orxo_texture_fire.png (added)

	material updated


Mon, 27 Nov 2017 11:42:32 GMT pascscha [11589]
	* code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified)

	svn commit -m


Fri, 24 Nov 2017 12:15:12 GMT boltn [11588]
	* code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (modified)

	nur einmal auszfuehrenden code aus tick in initialize fkt verschoben


Tue, 21 Nov 2017 15:51:31 GMT remartin [11587]
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)

	Kleinere Probleme gelöst (HP, Position richtig setzen). Noch die ...


Tue, 21 Nov 2017 12:07:17 GMT remartin [11586]
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified)

	Major breakthrough: Variable Collision shape works, error in ...


Mon, 20 Nov 2017 16:32:43 GMT lrigoni [11585]
	* code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified)

	Changes 20.11.2017


Mon, 20 Nov 2017 16:01:46 GMT boltn [11584]
	* code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (modified)

	Planeten koennen nun mittels objectlist beschrieben werden. todo: ...


Mon, 20 Nov 2017 15:48:03 GMT kohlia [11583]
	* code/branches/ScriptableController_HS17/src/libraries/core/BaseObject.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/Level.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/Level.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.h (modified)

	Near object, near point and at area work!


Mon, 20 Nov 2017 15:30:24 GMT jostoffe [11582]
	* code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified)

	Koordinatentransformation und Drehung des Pfeils funktioniert noch
	nicht


Mon, 20 Nov 2017 15:21:26 GMT remartin [11581]
	* code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified)

	Doesn-t freeze any more. Asteroids and the pickup seem to collide ...


Mon, 20 Nov 2017 15:19:40 GMT merholzl [11580]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)

	colisson boxes and asteroidshapoeremoval


Mon, 20 Nov 2017 15:15:17 GMT kuchlert [11579]
	* code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout (added)
	* code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua (added)
	* code/branches/Dialog_HS17/data/levels/DialogueShowcase2.oxw (added)
	* code/branches/Dialog_HS17/src/modules/CMakeLists.txt (modified)
	* code/branches/Dialog_HS17/src/modules/dialog (added)
	* code/branches/Dialog_HS17/src/modules/dialog/Answer.cc (added)
	* code/branches/Dialog_HS17/src/modules/dialog/Answer.h (added)
	* code/branches/Dialog_HS17/src/modules/dialog/AnswerId.cc (added)
	* code/branches/Dialog_HS17/src/modules/dialog/AnswerId.h (added)
	* code/branches/Dialog_HS17/src/modules/dialog/CMakeLists.txt (added)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc (added)
	* code/branches/Dialog_HS17/src/modules/dialog/Dialog.h (added)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.cc (added)
	* code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h (added)
	* code/branches/Dialog_HS17/src/modules/dialog/Question.cc (added)
	* code/branches/Dialog_HS17/src/modules/dialog/Question.h (added)
	* code/branches/Dialog_HS17/src/modules/dialogue_2 (deleted)

	some bug fixed most not


Mon, 20 Nov 2017 15:06:43 GMT varxth [11578]
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.h (modified)

	abgleich


Mon, 20 Nov 2017 15:05:27 GMT zarron [11577]
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (modified)

	first atempt to set dir of fireballs correctly


Mon, 20 Nov 2017 14:26:31 GMT pascscha [11576]
	* code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)

	deathmessages again


Mon, 20 Nov 2017 14:21:35 GMT varxth [11575]
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.h (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (modified)

	merged Fireball and player


Mon, 20 Nov 2017 14:15:13 GMT merholzl [11574]
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)

	more death textes


Mon, 20 Nov 2017 14:11:07 GMT zarron [11573]
	* code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.h (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (modified)

	fireing Fireballs enabled


Mon, 20 Nov 2017 13:46:48 GMT merholzl [11572]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)

	hitboxes


Mon, 20 Nov 2017 13:42:49 GMT maxima [11571]
	* data/contentcreation/pps/FlappyOrx (added)

	new folder for pps


Mon, 20 Nov 2017 13:29:05 GMT varxth [11570]
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (modified)

	better Fireball


Mon, 20 Nov 2017 13:28:36 GMT varxth [11569]
	* code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified)

	better Fireball


Mon, 20 Nov 2017 13:16:00 GMT merholzl [11568]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)

	some messages


Mon, 20 Nov 2017 13:15:02 GMT varxth [11567]
	* code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.cc (modified)

	komplet


Mon, 20 Nov 2017 13:00:56 GMT pascscha [11566]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)

	skybox


Mon, 20 Nov 2017 12:35:53 GMT pascscha [11565]
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h (modified)

	death message initiated2


Mon, 20 Nov 2017 12:27:33 GMT fanconic [11564]
	* code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (modified)

	small changes


Mon, 20 Nov 2017 12:06:08 GMT pascscha [11563]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified)

	death message initiated


Mon, 13 Nov 2017 16:25:09 GMT kohlia [11562]
	* code/branches/ScriptableController_HS17/src/libraries/tools/Timer.cc (modified)
	* code/branches/ScriptableController_HS17/src/libraries/tools/Timer.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/Level.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/Level.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.h (modified)

	Figuring out when the different things are ready in orxonox


Mon, 13 Nov 2017 15:34:53 GMT remartin [11561]
	* code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)
	* code/branches/AsteroidMining_HS17/src/modules/pickup/Pickup.h (modified)
	* code/branches/AsteroidMining_HS17/src/modules/pickup/PickupSpawner.h (modified)

	Pickup generating works now after changing privacy settings of set ...


Mon, 13 Nov 2017 15:20:31 GMT fanconic [11560]
	* code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/data/levels/templates/StoryMode.oxt (modified)
	* code/branches/CampaignMap_HS17/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified)

	Das StoryModeHUD.cc wurde kompiliert und ist momentan bugfrei. Es ...


Mon, 13 Nov 2017 15:16:35 GMT jostoffe [11559]
	* code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/Waypoints_HS17/src/modules/questsystem/Quest.cc (modified)
	* code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc (modified)
	* code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.h (modified)

	Pfeil wird angezeigt und fliegt mit dem Raumschiff mit, aber er ist ...


Mon, 13 Nov 2017 15:14:47 GMT patricwi [11558]
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified)
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h (modified)
	* code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified)

	no more segfaults but still not exiting properly - maybe never ending ...


Mon, 13 Nov 2017 15:13:43 GMT lrigoni [11557]
	* code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified)

	Commit of 13.11.17


Mon, 13 Nov 2017 15:07:13 GMT zarron [11556]
	* code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/CMakeLists.txt (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (added)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.h (added)

	Fireball implemented, Physics are crazy at the moment


Mon, 13 Nov 2017 15:05:34 GMT vyang [11555]
	* code/branches/Asteroid_HS17/data/levels/Asteroids.oxw (modified)
	* code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids.oxt (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.h (modified)

	Level file: korrekte Kameraposition, Raumschiff bewegt sich nicht, ...


Mon, 13 Nov 2017 14:44:45 GMT pascscha [11554]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)

	Increasing difficulty


Thu, 09 Nov 2017 17:13:50 GMT remartin [11553]
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)

	That pickup stuff is a bloody mess. Protected methods and weird ...


Tue, 07 Nov 2017 18:26:12 GMT kohlia [11552]
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb.ipp (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified)

	Lua bindings should work now


Tue, 07 Nov 2017 16:47:14 GMT remartin [11551]
	* code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified)

	added method 'putStuff' for initialisation. Mesh has correct size ...


Tue, 07 Nov 2017 12:04:27 GMT remartin [11550]
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (modified)

	Unsymmetrische Kommentarklammern in Ordnung gebracht. Sollte jetzt ...


Mon, 06 Nov 2017 16:23:08 GMT kohlia [11549]
	* code/branches/ScriptableController_HS17/src/orxonox/Level.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/Level.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb.ipp (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/luatb_typed_stack.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.h (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified)
	* code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified)

	Not working yet


Mon, 06 Nov 2017 16:11:38 GMT remartin [11548]
	* code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (deleted)
	* code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.h (deleted)




Mon, 06 Nov 2017 16:06:16 GMT remartin [11547]
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining (added)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.cc (added)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (added)
	* code/branches/AsteroidMining_HS17/src/modules/asteroidmining/CMakeLists.txt (added)




Mon, 06 Nov 2017 16:04:28 GMT remartin [11546]
	* code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw (modified)
	* code/branches/AsteroidMining_HS17/src/modules/CMakeLists.txt (modified)
	* code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)

	Dateien von /orxonox nach /src migriert. Generierung inkl. Mesh und ...


Mon, 06 Nov 2017 15:40:56 GMT boltn [11545]
	* code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/CampaignMap_HS17/src/orxonox/worldentities/StoryModePlanet.cc (added)
	* code/branches/CampaignMap_HS17/src/orxonox/worldentities/StoryModePlanet.h (added)

	Beschriftbaren planet erstellt und in passenderen ordner verschoben.


Mon, 06 Nov 2017 15:35:06 GMT fanconic [11544]
	* code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel (added)
	* code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw (added)
	* code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (modified)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (modified)

	Story Mode Hud was edited, and a level file was added


Mon, 06 Nov 2017 15:18:11 GMT pascscha [11543]
	* code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)

	camera changes


Mon, 06 Nov 2017 15:10:49 GMT lrigoni [11542]
	* code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified)

	Changes of 6.11.2017


Mon, 06 Nov 2017 15:06:54 GMT vyang [11541]
	* code/branches/Asteroid_HS17/data/levels/Asteroid.oxw (modified)
	* code/branches/Asteroid_HS17/data/levels/Asteroids.oxw (modified)
	* code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids.oxt (added)
	* code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsCenterPoint.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.h (modified)

	TestLevel Design -> immer noch mit Fehlermeldungen, Asteroiden in der ...


Mon, 06 Nov 2017 15:05:15 GMT patricwi [11540]
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified)
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified)
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h (modified)
	* code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified)

	sync function added without success, order of pickups in HUD is mixed
	up


Mon, 06 Nov 2017 15:01:33 GMT jostoffe [11539]
	* code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/Waypoints_HS17/src/modules/questsystem/Quest.cc (modified)
	* code/branches/Waypoints_HS17/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc (added)
	* code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.h (added)
	* code/branches/Waypoints_HS17/src/orxonox/worldentities/CMakeLists.txt (modified)

	Arrow- und ArrowControllerfiles hinzugefuegt. Position vom Schiff ...


Mon, 06 Nov 2017 14:43:57 GMT varxth [11538]
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.h (modified)

	function to change clothes


Mon, 06 Nov 2017 14:32:04 GMT pascscha [11537]
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxAsteroid.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxAsteroid.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)

	Death


Mon, 06 Nov 2017 14:04:36 GMT varxth [11536]
	* code/branches/SOBv2_HS17/SOB.oxw (added)

	sob.oxw


Mon, 06 Nov 2017 14:00:59 GMT varxth [11535]
	* code/branches/SOBv2_HS17/data/levels/SOB.oxw (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)

	THEOt


Mon, 06 Nov 2017 13:51:31 GMT varxth [11534]
	* code/branches/SOBv2_HS17/src/libraries/tools/Mesh.cc (modified)
	* code/branches/SOBv2_HS17/src/libraries/tools/Mesh.h (modified)
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/SOBv2_HS17/src/orxonox/graphics/Model.cc (modified)
	* code/branches/SOBv2_HS17/src/orxonox/graphics/Model.h (modified)

	added setSubMaterial(...) to Model.cc and Mesh.cc


Mon, 06 Nov 2017 13:12:57 GMT merholzl [11533]
	* code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified)

	point system in place


Mon, 06 Nov 2017 12:41:07 GMT varxth [11532]
	* code/branches/SOBv2_HS17/BlenderFilesSOB/orxo_texture_gross.png (added)

	added orxo_material_gross.png to BlenderFilesSOB


Mon, 06 Nov 2017 12:38:44 GMT varxth [11531]
	* code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified)

	added orxo_material_gross.png to BlenderFilesSOB


Mon, 06 Nov 2017 11:58:54 GMT pascscha [11530]
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxAsteroid.cc (added)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxAsteroid.h (added)

	Asteroid Clusters


Mon, 06 Nov 2017 11:52:38 GMT pascscha [11529]
	* code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw (modified)
	* code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/CMakeLists.txt (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified)
	* code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified)

	Asteroid Clusters


Sat, 04 Nov 2017 16:04:59 GMT vyang [11528]
	* code/branches/Asteroid_HS17/data/levels/Asteroids.oxw (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsCenterPoint.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsCenterPoint.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsShip.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.cc (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.h (modified)
	* code/branches/Asteroid_HS17/src/modules/asteroids/CMakeLists.txt (modified)

	Spawn Funktion fuer die Asteroiden veraendert


Mon, 30 Oct 2017 15:36:26 GMT boltn [11527]
	* code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo (added)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc (added)
	* code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.h (added)

	Files fuer den story mode hud ge-added (noch nicht fertig)


Mon, 30 Oct 2017 15:35:03 GMT boltn [11526]
	* code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/svn-commit.tmp (added)

	Files fuer den story mode hud ge-added (noch nicht fertig)


Mon, 30 Oct 2017 15:30:58 GMT fanconic [11525]
	* code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc (modified)
	* code/branches/CampaignMap_HS17/src/orxonox/infos/Bot.cc (modified)

	verschiedene kleine Aenderungen


Mon, 30 Oct 2017 15:22:22 GMT remartin [11524]
	* code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc (modified)




Mon, 30 Oct 2017 15:18:57 GMT jostoffe [11523]
	* code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw (modified)
	* code/branches/Waypoints_HS17/data/levels/tutorial.oxw (modified)
	* code/branches/Waypoints_HS17/data/overlays/HUDPickupTemplate.oxo (modified)
	* code/branches/Waypoints_HS17/data/overlays/HUDTemplate_test.oxo (added)
	* code/branches/Waypoints_HS17/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/Waypoints_HS17/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/Waypoints_HS17/src/modules/overlays/hud/HUDWaypoints.cc (added)
	* code/branches/Waypoints_HS17/src/modules/overlays/hud/HUDWaypoints.h (added)
	* code/branches/Waypoints_HS17/src/orxonox/controllers/AutonomousDroneController.cc (added)
	* code/branches/Waypoints_HS17/src/orxonox/controllers/AutonomousDroneController.h (added)
	* code/branches/Waypoints_HS17/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Waypoints_HS17/src/orxonox/controllers/WaypointArrow.cc (added)
	* code/branches/Waypoints_HS17/src/orxonox/controllers/WaypointArrow.h (added)
	* code/branches/Waypoints_HS17/src/orxonox/worldentities/AutonomousDrone.cc (added)
	* code/branches/Waypoints_HS17/src/orxonox/worldentities/AutonomousDrone.h (added)
	* code/branches/Waypoints_HS17/src/orxonox/worldentities/CMakeLists.txt (modified)

	EmptyLevel funktioniert nicht wegen AutonomousDroneController, HUD ...


Mon, 30 Oct 2017 15:18:35 GMT lrigoni [11522]
	* code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw (modified)

	Saving 30-10-2017