#
# ChangeLog for /
#
# Generated by Trac 1.0.9
# Apr 28, 2024, 2:43:46 PM

Thu, 04 Apr 2019 14:16:22 GMT jeromela [12277]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (modified)

	Spielfeld angepasst. Next: Fumktionalitaet auch anpassen


Thu, 04 Apr 2019 14:15:09 GMT mkarpf [12276]
	* code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw (modified)

	Test-Level with 3 Blocks


Thu, 04 Apr 2019 13:59:47 GMT tkuonen [12275]
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h (modified)

	Extend MouseAPI


Thu, 04 Apr 2019 13:56:36 GMT kofrey [12274]
	* code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.h (modified)
	* code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)

	mine not working


Thu, 04 Apr 2019 13:51:04 GMT cwaupoti [12273]
	* code/branches/Boxhead_FS19/data/levels/Hover.oxw (modified)
	* code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/Boxhead_FS19/src/modules/hover/Hover.h (modified)
	* code/branches/Boxhead_FS19/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.cc (modified)
	* code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.h (modified)
	* code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/HoverGun.cc (modified)
	* code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/HoverGun.h (modified)

	comment


Thu, 04 Apr 2019 13:33:04 GMT rueegseb [12272]
	* code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.cc (modified)
	* code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.h (modified)

	overload setnewTarget for Argument Vecor3 and implementation of the ...


Thu, 04 Apr 2019 13:28:50 GMT tkuonen [12271]
	* code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.cc (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.h (modified)

	Begin extending MouseAPI


Thu, 04 Apr 2019 13:22:31 GMT ahuwyler [12270]
	* code/branches/OrxoBlox_FS19/data/levels/OrxoBlox.oxw (deleted)

	deleted .oxw file


Thu, 04 Apr 2019 13:02:27 GMT ahuwyler [12269]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)

	ES FUNKT!


Thu, 04 Apr 2019 12:40:29 GMT ahuwyler [12268]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/overlays/OrxoBloxHUD.oxo (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.cc (modified)

	OrxoBlox in the HUD


Thu, 04 Apr 2019 12:25:56 GMT kofrey [12267]
	* code/branches/Boxhead_FS19/data/defaultConfig/keybindings.ini (modified)
	* code/branches/Boxhead_FS19/data/levels/Hover.oxw (modified)
	* code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt (modified)
	* code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/Boxhead_FS19/src/modules/hover/Hover.cc (modified)
	* code/branches/Boxhead_FS19/src/modules/hover/HoverWall.cc (modified)

	working version


Thu, 04 Apr 2019 11:48:18 GMT jeromela [12266]
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxAI.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxAI.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBat.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBat.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.h (added)

	added files


Thu, 04 Apr 2019 11:45:35 GMT jeromela [12265]
	* code/branches/OrxoBlox_FS19/data/levels/emptyLevel.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)

	t       <collisionShapes>
	                <BoxCollisionShape ...


Thu, 28 Mar 2019 16:06:31 GMT jeromela [12264]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/tcl/orxokart_highscores.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxAI.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxAI.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBat.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBat.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/pong/Pong.cc (modified)

	Struggling with the gametype class!


Thu, 28 Mar 2019 16:00:24 GMT tkuonen [12263]
	* code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc (modified)

	Repair MouseAPI


Thu, 28 Mar 2019 16:00:18 GMT cwaupoti [12262]
	* code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.cc (added)
	* code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.h (added)
	* code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/HoverGun.cc (added)
	* code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/HoverGun.h (added)

	created HoverGun, but file is not working yet


Thu, 28 Mar 2019 15:51:14 GMT cwaupoti [12261]
	* code/branches/Boxhead_FS19/data/levels/Hover.oxw (modified)
	* code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt (modified)
	* code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/Boxhead_FS19/src/modules/hover/Hover.h (modified)
	* code/branches/Boxhead_FS19/src/modules/weapons/projectiles/IceGunProjectile.cc (modified)

	created HoverGun, but file is not working yet


Thu, 28 Mar 2019 14:49:58 GMT ahuwyler [12260]
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)

	Changed OrxoBlox.cc


Thu, 28 Mar 2019 14:47:15 GMT rueegseb [12259]
	* code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.cc (modified)
	* code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.h (modified)

	distinguish the different Ghost when the Ghost is not moving


Thu, 28 Mar 2019 14:43:00 GMT mkarpf [12258]
	* code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw (added)

	Test Level implemented; still buggy


Thu, 28 Mar 2019 14:40:43 GMT pomselj [12257]
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/TempData (deleted)

	removed tempdata


Thu, 28 Mar 2019 14:39:56 GMT jeromela [12256]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/pong.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/tetris.oxw (modified)

	Level Hintergrund von pong uebernommen


Thu, 28 Mar 2019 14:36:36 GMT mkarpf [12255]
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.cc (added)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapiexample.h (added)

	Test Level Created
	Carefull: Level is buggy and freezes Screen!


Thu, 28 Mar 2019 14:35:22 GMT pomselj [12254]
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallGun.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallGun.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallGunShooter.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallGunShooter.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallMunition.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallMunition.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallProjectile.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallProjectile.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)

	Added Folder BallGun, in it are the BallGun Files, the files are not ...


Thu, 28 Mar 2019 14:32:09 GMT mkarpf [12253]
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h (modified)

	Test Level created
	ATTENTION: Level is buggy and freezes Screen!


Thu, 28 Mar 2019 14:09:12 GMT rueegseb [12252]
	* code/branches/3DPacman_FS19/data/levels/3DPacman.oxw (modified)
	* code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.cc (modified)
	* code/branches/3DPacman_FS19/src/modules/pacman/PacmanGhost.h (modified)

	Added a feature to differentiate the seperate ghosts


Thu, 28 Mar 2019 13:48:40 GMT ahuwyler [12251]
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxAI.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxAI.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBat.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBat.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.h (added)

	Now All Files included!


Thu, 28 Mar 2019 13:41:12 GMT ahuwyler [12250]
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)

	Orxoblox got its Stones!


Thu, 28 Mar 2019 13:40:18 GMT pomselj [12249]
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBat.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBat.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBot.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBot.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongCenterpoint.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongCenterpoint.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongScore.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongScore.h (deleted)

	ohne nervige files


Thu, 28 Mar 2019 13:38:36 GMT pomselj [12248]
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongAI.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongAI.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/TempData (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/TempData/OrxoBloxBall.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/TempData/OrxoBloxBall.h (added)

	ohne nervige files


Thu, 28 Mar 2019 12:33:50 GMT tkuonen [12247]
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h (modified)

	Comlete initial version of MouseAPI
	remove compile errors


Thu, 28 Mar 2019 12:28:15 GMT wiesep [12246]
	* code/branches/Merge_HS18 (deleted)

	Branch is in trunk


Thu, 28 Mar 2019 12:27:53 GMT wiesep [12245]
	* code/branches/SuperOrxoBros_HS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:27:31 GMT wiesep [12244]
	* code/branches/wagnis_HS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:27:23 GMT wiesep [12243]
	* code/branches/WorldMap_HS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:27:14 GMT wiesep [12242]
	* code/branches/TowerDefense_HS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:26:45 GMT wiesep [12241]
	* code/branches/TixyTaxyTorxy_HS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:26:37 GMT wiesep [12240]
	* code/branches/Flatpak (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:26:29 GMT wiesep [12239]
	* code/branches/3DPacman_FS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:26:12 GMT wiesep [12238]
	* code/branches/SuperOrxoBrosOgre1.9 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:26:04 GMT wiesep [12237]
	* code/branches/cegui0.8_ogre1.9 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:25:51 GMT wiesep [12236]
	* code/branches/Hover_FS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:25:37 GMT wiesep [12235]
	* code/branches/ScriptableController_FS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:25:26 GMT wiesep [12234]
	* code/branches/OrxyRoad_FS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:25:14 GMT wiesep [12233]
	* code/branches/RacingBots_FS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:25:06 GMT wiesep [12232]
	* code/branches/Masterserver_FS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:24:56 GMT wiesep [12231]
	* code/branches/SuperOrxoBros_FS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:24:37 GMT wiesep [12230]
	* code/branches/ScriptableController_HS17 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:24:28 GMT wiesep [12229]
	* code/branches/TowerDefense_FS18 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:24:20 GMT wiesep [12228]
	* code/branches/HUD_HS16 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:24:12 GMT wiesep [12227]
	* code/branches/ogre1.9 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:23:58 GMT wiesep [12226]
	* code/branches/sagerjFS16 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:23:50 GMT wiesep [12225]
	* code/branches/tgidronFS16 (deleted)

	Deleted merged branch


Thu, 28 Mar 2019 12:23:33 GMT wiesep [12224]
	* code/branches/cegui0.8 (deleted)

	Deleted old branch


Thu, 28 Mar 2019 12:23:25 GMT wiesep [12223]
	* code/branches/usability (deleted)

	Deleted old branch


Thu, 28 Mar 2019 12:22:58 GMT wiesep [12222]
	* code/releases/release2012 (moved)

	Moved to release


Thu, 28 Mar 2019 12:21:35 GMT wiesep [12221]
	* code/branches/wiimote (deleted)

	Deleted old branch


Thu, 28 Mar 2019 12:21:22 GMT wiesep [12220]
	* code/branches/mac_osx2 (deleted)

	Deleted old branch


Thu, 28 Mar 2019 12:20:51 GMT wiesep [12219]
	* code/branches/gamestates3 (deleted)

	Deleted old branch


Thu, 21 Mar 2019 15:07:31 GMT tkuonen [12218]
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc (modified)




Thu, 21 Mar 2019 15:06:42 GMT tkuonen [12217]
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h (modified)




Thu, 21 Mar 2019 14:58:39 GMT cwaupoti [12216]
	* code/branches/Boxhead_FS19/data/defaultConfig/keybindings.ini (modified)
	* code/branches/Boxhead_FS19/data/levels/Hover.oxw (modified)
	* code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt (modified)
	* code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt (modified)

	Mouse fixed on horizontal axis, added opponent with halth points, ...


Thu, 21 Mar 2019 14:49:39 GMT jeromela [12215]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (added)

	included empty OrxoBlox level in Minigames


Thu, 21 Mar 2019 14:49:07 GMT jeromela [12214]
	* code/branches/OrxoBlox_FS19/data/levels/emptyLevel.oxw (modified)

	included empty OrxoBlox level in Minigames


Thu, 21 Mar 2019 13:26:59 GMT tkuonen [12213]
	* code/branches/MouseAPI_FS19/src/modules/CMakeLists.txt (modified)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI (added)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt (added)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc (added)
	* code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h (added)

	Define MouseAPI


Thu, 21 Mar 2019 13:19:16 GMT ahuwyler [12212]
	* code/branches/OrxoBlox_FS19/data/tcl/orxokart_highscores.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (modified)

	A new Game is born


Thu, 14 Mar 2019 15:03:00 GMT cwaupoti [12211]
	* code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/Boxhead_FS19/src/modules/hover/Hover.cc (modified)

	removed walls, added ice gun


Thu, 14 Mar 2019 15:01:59 GMT pomselj [12210]
	* code/branches/OrxoBlox_FS19/data/levels/OrxoBlox.oxw (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongAI.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongAI.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBat.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBat.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBot.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBot.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongCenterpoint.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongCenterpoint.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongScore.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongScore.h (added)

	created a folder for our module and started implementing the ball
	class


Thu, 14 Mar 2019 12:24:38 GMT wiesep [12209]
	* code/branches/Boxhead_FS19 (copied)

	Create Boxhead_FS19 branch


Thu, 14 Mar 2019 12:20:30 GMT wiesep [12208]
	* code/branches/OrxoBlox_FS19 (copied)

	Create OrxoBlox_FS19 branch


Thu, 14 Mar 2019 12:16:37 GMT wiesep [12207]
	* code/branches/BossFight_FS19 (copied)

	Create BossFight_FS19 branch


Thu, 14 Mar 2019 12:14:19 GMT wiesep [12206]
	* code/branches/3DPacman_FS19 (copied)

	Create 3DPacman_FS19 branch


Thu, 14 Mar 2019 12:07:20 GMT wiesep [12205]
	* code/branches/MouseAPI_FS19 (copied)

	Create MouseAPI_FS19 branch


Thu, 07 Mar 2019 14:31:22 GMT wiesep [12204]
	* code/branches/shader_HS18 (deleted)

	Close merged branch


Thu, 07 Mar 2019 14:02:12 GMT wiesep [12203]
	* code/archive/Presentation_FS18 (moved)

	Renamed


Thu, 07 Mar 2019 14:01:28 GMT wiesep [12202]
	* code/archive/PresentationFS18 (moved)

	Move Presentation FS18 to archive


Thu, 07 Mar 2019 13:46:22 GMT wiesep [12201]
	* code/trunk (copied)

	placed new trunk from mergeFS18


Thu, 07 Mar 2019 13:44:55 GMT wiesep [12200]
	* code/trunk (deleted)

	delete trunk temporarily


Thu, 07 Mar 2019 13:44:04 GMT wiesep [12199]
	* code/tags/0.0.6 (copied)

	Copied old trunk as tag


Fri, 01 Mar 2019 12:04:10 GMT landauf [12198]
	* build/dockerfiles/orxonox_build/Dockerfile (modified)
	* build/dockerfiles/orxonox_jenkins-slave/Dockerfile (modified)

	redo changes from r11812


Thu, 28 Feb 2019 13:30:40 GMT merholzl [12197]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/BumpMap.oxw (copied)
	* code/branches/mergeFS18/data/levels/kart_alpha0.1.oxw (deleted)
	* code/branches/mergeFS18/data/levels/tutorial.oxw (modified)
	* code/branches/mergeFS18/src/libraries/tools/Mesh.cc (modified)

	Shader merge


Thu, 28 Feb 2019 12:06:00 GMT merholzl [12196]
	* code/branches/Tutorial_HS19/data/levels/kart_alpha0.1.oxw (deleted)

	Removed unneccessarz level


Thu, 28 Feb 2019 11:58:25 GMT merholzl [12195]
	* code/branches/Tutorial_HS19 (copied)

	Tutorial branch


Thu, 28 Feb 2019 11:56:53 GMT merholzl [12194]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/OrxoKart1.oxw (copied)
	* code/branches/mergeFS18/data/levels/OrxoKart2.oxw (copied)
	* code/branches/mergeFS18/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/mergeFS18/data/levels/kart_alpha0.1.oxw (copied)
	* code/branches/mergeFS18/data/levels/templates/OrxoKartKart.oxt (copied)
	* code/branches/mergeFS18/data/overlays/OrxoKartHUD.oxo (copied)
	* code/branches/mergeFS18/data/tcl/orxokart_highscores.txt (copied)
	* code/branches/mergeFS18/src/modules/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/orxokart (copied)
	* code/branches/mergeFS18/src/orxonox/controllers/CMakeLists.txt (modified)

	Merging OrxoKart


Fri, 22 Feb 2019 15:47:15 GMT emustafa [12193]
	* code/branches/OrxoKart_HS18/src/modules/orxokart/KartController.cc (deleted)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/KartController.h (deleted)

	KartController removed from repo


Fri, 22 Feb 2019 15:46:06 GMT emustafa [12192]
	* code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt (modified)
	* code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc (modified)

	shroom removed, KartController removed


Thu, 21 Feb 2019 14:46:15 GMT merholzl [12191]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/Wagnis.oxw (copied)
	* code/branches/mergeFS18/data/levels/templates/wagnisCursor.oxt (copied)
	* code/branches/mergeFS18/data/overlays/WagnisHUD.oxo (copied)
	* code/branches/mergeFS18/src/libraries/tools/Timer.cc (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.h (modified)
	* code/branches/mergeFS18/src/modules/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/wagnis (copied)
	* code/branches/mergeFS18/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/weapons/projectiles/WagnisProjectile.cc (copied)
	* code/branches/mergeFS18/src/modules/weapons/projectiles/WagnisProjectile.h (copied)
	* code/branches/mergeFS18/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/weapons/weaponmodes/WagnisGun.cc (copied)
	* code/branches/mergeFS18/src/modules/weapons/weaponmodes/WagnisGun.h (copied)

	merged Wagnis


Thu, 21 Feb 2019 14:02:00 GMT merholzl [12190]
	* code/trunk (modified)
	* code/trunk/data/levels/towerDefense.oxw (modified)
	* code/trunk/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseController.cc (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseController.h (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseField.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseRangeViewer.cc (copied)
	* code/trunk/src/modules/towerdefense/TowerDefenseRangeViewer.h (copied)
	* code/trunk/src/modules/towerdefense/towerdefensereadme.txt (modified)

	TD merge


Thu, 21 Feb 2019 13:51:26 GMT merholzl [12189]
	* code/trunk (modified)
	* code/trunk/data/levels/BumpMap.oxw (copied)
	* code/trunk/data/levels/tutorial.oxw (modified)
	* code/trunk/src/libraries/tools/Mesh.cc (modified)
	* code/trunk/src/libraries/tools/Timer.h (modified)

	Shader merge


Wed, 12 Dec 2018 09:57:43 GMT patricwi [12188]
	* data/data_extern/images/textures/Pacman.png (added)
	* data/data_extern/materials/Example.material (added)
	* data/data_extern/materials/OrxoKartMushroom.material (added)
	* data/data_extern/materials/OrxoKartStartTor.material (added)
	* data/data_extern/materials/OrxoKartStreckenabschnitt.material (added)
	* data/data_extern/materials/OrxoKartStreckenabschnittZiel.material (added)
	* data/data_extern/models/Hover.mesh (added)
	* data/data_extern/models/OrxoKartMushroom.mesh (added)
	* data/data_extern/models/OrxoKartStartTor.mesh (added)
	* data/data_extern/models/OrxoKartStreckenabschnitt.mesh (added)
	* data/data_extern/models/OrxoKartStreckenabschnittZiel.mesh (added)

	Added new materials and models


Tue, 11 Dec 2018 22:12:18 GMT merholzl [12187]
	* data/data_extern (modified)
	* data/data_extern/images/textures/OrxoKartMushroom.png (added)
	* data/data_extern/images/textures/OrxoKartMushroomBild.png (added)
	* data/data_extern/images/textures/OrxoKartStartTor.png (added)
	* data/data_extern/images/textures/OrxoKartStreckenabschnitt.png (added)
	* data/data_extern/images/textures/OrxoKartStreckenabschnittZiel.png (added)
	* data/data_extern/images/textures/WagnisArrow.png (added)
	* data/data_extern/images/textures/basetur_tex.png (added)
	* data/data_extern/images/textures/cpipe.png (added)
	* data/data_extern/images/textures/dirty-metal-texture-12.jpg (added)
	* data/data_extern/images/textures/finalenemy1.jpg (added)
	* data/data_extern/images/textures/finalenemy2.jpg (added)
	* data/data_extern/images/textures/finalenemy3.jpg (added)
	* data/data_extern/images/textures/pcactus.png (added)
	* data/data_extern/images/textures/smokesmall.png (added)
	* data/data_extern/materials/Wagnis.material (added)
	* data/data_extern/materials/base_mat1.material (added)
	* data/data_extern/materials/cpipe.material (added)
	* data/data_extern/materials/finalenemy1.material (added)
	* data/data_extern/materials/finalenemy2.material (added)
	* data/data_extern/materials/finalenemy3.material (added)
	* data/data_extern/materials/headtur.material (added)
	* data/data_extern/materials/pcactus.material (added)
	* data/data_extern/models/basetur.mesh (added)
	* data/data_extern/models/cpipe.mesh (added)
	* data/data_extern/models/finalenemy1.mesh (added)
	* data/data_extern/models/finalenemy2.mesh (added)
	* data/data_extern/models/finalenemy3.mesh (added)
	* data/data_extern/models/headtur.mesh (added)
	* data/data_extern/models/pcactus.mesh (added)

	Data extern commit the second for HS18


Tue, 11 Dec 2018 18:39:03 GMT merholzl [12186]
	* code/branches/Merge_HS18/svn_is_cancer (deleted)

	cleanup


Tue, 11 Dec 2018 18:38:06 GMT merholzl [12185]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/OrxoKart1.oxw (copied)
	* code/branches/Merge_HS18/data/levels/OrxoKart2.oxw (copied)
	* code/branches/Merge_HS18/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/Merge_HS18/data/levels/kart_alpha0.1.oxw (copied)
	* code/branches/Merge_HS18/data/levels/templates/OrxoKartKart.oxt (copied)
	* code/branches/Merge_HS18/data/overlays/OrxoKartHUD.oxo (copied)
	* code/branches/Merge_HS18/data/tcl/orxokart_highscores.txt (copied)
	* code/branches/Merge_HS18/src/modules/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/orxokart (copied)
	* code/branches/Merge_HS18/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/svn_is_cancer (copied)

	OrxoKart merge


Tue, 11 Dec 2018 17:53:27 GMT merholzl [12184]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/Wagnis.oxw (copied)
	* code/branches/Merge_HS18/data/levels/templates/wagnisCursor.oxt (copied)
	* code/branches/Merge_HS18/data/overlays/WagnisHUD.oxo (copied)
	* code/branches/Merge_HS18/src/libraries/tools/Timer.cc (modified)
	* code/branches/Merge_HS18/src/modules/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/wagnis (copied)
	* code/branches/Merge_HS18/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/weapons/projectiles/WagnisProjectile.cc (copied)
	* code/branches/Merge_HS18/src/modules/weapons/projectiles/WagnisProjectile.h (copied)
	* code/branches/Merge_HS18/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/weapons/weaponmodes/WagnisGun.cc (copied)
	* code/branches/Merge_HS18/src/modules/weapons/weaponmodes/WagnisGun.h (copied)

	Wagnis Merge


Tue, 11 Dec 2018 17:33:26 GMT merholzl [12183]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/BumpMap.oxw (copied)
	* code/branches/Merge_HS18/data/levels/tutorial.oxw (modified)
	* code/branches/Merge_HS18/src/libraries/tools/Mesh.cc (modified)

	Shader merge


Tue, 11 Dec 2018 17:20:24 GMT merholzl [12182]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/emptyLevel.oxw (modified)
	* code/branches/Merge_HS18/data/levels/towerDefense.oxw (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseController.cc (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseController.h (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseField.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefensePrereqs.h (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseRangeViewer.cc (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseRangeViewer.h (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/towerdefensereadme.txt (modified)

	RD merge


Tue, 11 Dec 2018 16:22:11 GMT merholzl [12181]
	* data/data_extern (modified)
	* data/data_extern/images/levelpreviews/bumpMap.png (copied)
	* data/data_extern/images/textures/Cube_Lava_COLOR.jpg (copied)
	* data/data_extern/images/textures/Cube_Lava_MASK.jpg (copied)
	* data/data_extern/images/textures/Cube_Lava_NORM.jpg (copied)
	* data/data_extern/materials/BumpMapping (copied)
	* data/data_extern/materials/Cube_Lava.material (copied)
	* data/data_extern/materials/Cube_Lava_Normal.material (copied)
	* data/data_extern/materials/Cube_Lava_Normal_Blank.material (copied)
	* data/data_extern/materials/Example.material (deleted)
	* data/data_extern/materials/Examples.compositor (deleted)
	* data/data_extern/materials/Examples.program (deleted)
	* data/data_extern/materials/Flares.material (modified)
	* data/data_extern/materials/ToonShader.material (deleted)
	* data/data_extern/models/Cube_Lava.mesh (copied)
	* data/data_extern/models/Cube_Lava_Normal.mesh (copied)
	* data/data_extern/models/Cube_Lava_Normal_Blank.mesh (copied)
	* data/data_extern/programs/AmbientOneTexture.glsl (deleted)
	* data/data_extern/programs/BloomFP.cg (deleted)
	* data/data_extern/programs/Blur0_ps20.hlsl (deleted)
	* data/data_extern/programs/Blur0_vs.glsl (deleted)
	* data/data_extern/programs/Blur0_vs11.hlsl (deleted)
	* data/data_extern/programs/Blur1_ps20.hlsl (deleted)
	* data/data_extern/programs/Blur1_vs.glsl (deleted)
	* data/data_extern/programs/Blur1_vs11.hlsl (deleted)
	* data/data_extern/programs/Blur_ps.glsl (deleted)
	* data/data_extern/programs/BumpMapping.cg (deleted)
	* data/data_extern/programs/Cg (copied)
	* data/data_extern/programs/Combine_fp.cg (deleted)
	* data/data_extern/programs/Example_Basic.cg (deleted)
	* data/data_extern/programs/Example_Basic.hlsl (deleted)
	* data/data_extern/programs/GLSL (copied)
	* data/data_extern/programs/GLSL120 (copied)
	* data/data_extern/programs/GLSL150 (copied)
	* data/data_extern/programs/GLSL400 (copied)
	* data/data_extern/programs/GlassFP.cg (deleted)
	* data/data_extern/programs/Grass.cg (deleted)
	* data/data_extern/programs/GrayScale.cg (deleted)
	* data/data_extern/programs/InvertFP.cg (deleted)
	* data/data_extern/programs/LaplaceFP.cg (deleted)
	* data/data_extern/programs/OLD (copied)
	* data/data_extern/programs/OldMovieFP.cg (deleted)
	* data/data_extern/programs/OldTV.cg (deleted)
	* data/data_extern/programs/PosterizeFP.cg (deleted)
	* data/data_extern/programs/Radial_Blur_FP.cg (deleted)
	* data/data_extern/programs/SharpenEdgesFP.cg (deleted)
	* data/data_extern/programs/StdQuad_vp.cg (deleted)
	* data/data_extern/programs/StdQuad_vp.glsl (deleted)
	* data/data_extern/programs/TilingFP.cg (deleted)
	* data/data_extern/programs/ToonShaderPS.cg (deleted)
	* data/data_extern/programs/ToonShader_ps.frag (deleted)
	* data/data_extern/programs/ToonShader_vs.vert (deleted)
	* data/data_extern/programs/glow.cg (deleted)
	* data/data_extern/programs/hdr.cg (deleted)
	* data/data_extern/programs/hdr.hlsl (deleted)
	* data/data_extern/programs/hdr_bloom.glsl (deleted)
	* data/data_extern/programs/hdr_downscale2x2luminence.glsl (deleted)
	* data/data_extern/programs/hdr_downscale3x3.glsl (deleted)
	* data/data_extern/programs/hdr_downscale3x3brightpass.glsl (deleted)
	* data/data_extern/programs/hdr_finalToneMapping.glsl (deleted)
	* data/data_extern/programs/hdr_tonemap_util.glsl (deleted)
	* data/data_extern/programs/ps_glow.cg (deleted)
	* data/data_extern/programs/skinningTwoWeightsShadowCasterVp.glsl (deleted)
	* data/data_extern/programs/skinningTwoWeightsVp.glsl (deleted)
	* data/data_extern/programs/vs_glow.cg (deleted)
	* data/data_extern/resources.oxr (modified)

	all new materials for HS18


Tue, 11 Dec 2018 13:52:30 GMT merholzl [12180]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/Merge_HS18/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/Merge_HS18/data/levels/MapExample.oxw (copied)
	* code/branches/Merge_HS18/data/levels/StoryModeMap.oxw (modified)
	* code/branches/Merge_HS18/data/levels/emptyLevel22.oxw (copied)
	* code/branches/Merge_HS18/data/levels/templates/MapExample.oxt (copied)
	* code/branches/Merge_HS18/data/levels/templates/StoryMode.oxt (modified)
	* code/branches/Merge_HS18/data/levels/templates/StoryModeEscort.oxt (modified)
	* code/branches/Merge_HS18/data/overlays/MapExampleHUD.oxo (copied)
	* code/branches/Merge_HS18/data/overlays/StoryModeHUD.oxo (modified)
	* code/branches/Merge_HS18/src/modules/flappyorx/FlappyOrxShip.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)
	* code/branches/Merge_HS18/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/orxonox/controllers/SMCoord.cc (copied)
	* code/branches/Merge_HS18/src/orxonox/controllers/SMCoord.h (copied)
	* code/branches/Merge_HS18/src/orxonox/controllers/StoryModeController.cc (copied)
	* code/branches/Merge_HS18/src/orxonox/controllers/StoryModeController.h (copied)
	* code/branches/Merge_HS18/src/orxonox/gametypes/StoryMode.cc (modified)
	* code/branches/Merge_HS18/svn-commit.tmp (copied)

	World Map merging


Tue, 11 Dec 2018 13:21:47 GMT merholzl [12179]
	* code/branches/Merge_HS18 (modified)
	* code/branches/Merge_HS18/data/levels/TixyTaxyTorxy.oxw (copied)
	* code/branches/Merge_HS18/data/overlays/TixyTaxyTorxyHUD.oxo (copied)
	* code/branches/Merge_HS18/src/modules/CMakeLists.txt (modified)
	* code/branches/Merge_HS18/src/modules/TixyTaxyTorxy (copied)
	* code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)

	Tictactoe merge


Tue, 11 Dec 2018 12:50:03 GMT merholzl [12178]
	* code/branches/Merge_HS18 (copied)

	MergeBranch