#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Nov 28, 2024, 6:03:54 PM

Wed, 05 Dec 2018 10:40:51 GMT ottka [12148]
	* code/branches/OrxoKart_HS18/src/modules/orxokart/ShroomHUD.cc (modified)
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.material (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.png (added)

	Mushroom GUI


Wed, 05 Dec 2018 10:25:23 GMT emustafa [12147]
	* code/branches/OrxoKart_HS18/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/KartController.cc (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/KartController.h (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.h (modified)
	* code/branches/OrxoKart_HS18/src/orxonox/controllers/CMakeLists.txt (modified)

	controlls tweaks


Wed, 05 Dec 2018 10:22:45 GMT cadick [12146]
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/OrxoKartMushroomBild.png (added)

	added mushroom png


Wed, 05 Dec 2018 09:54:17 GMT samuelbl [12145]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)

	Player fixed


Wed, 05 Dec 2018 09:48:32 GMT ottka [12144]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart2.oxw (added)
	* code/branches/OrxoKart_HS18/data/overlays/OrxoKartHUD.oxo (modified)
	* code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt (added)
	* 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/OrxoKart.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartPrereqs.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/ShroomHUD.cc (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/ShroomHUD.h (added)

	New HUDs and Start


Wed, 05 Dec 2018 09:36:02 GMT cadick [12142]
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartStartTor/OrxoKartStartTor.mesh (modified)

	added better port


Wed, 05 Dec 2018 09:29:45 GMT wiesep [12141]
	* code/branches/shader_HS18/data/levels/BumpMap.oxw (modified)

	Renamed Models


Wed, 05 Dec 2018 09:17:10 GMT cadick [12139]
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/OrxoKartMushroom.material (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/OrxoKartMushroom.mesh (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/OrxoKartMushroom.png (added)

	added mushroom


Wed, 05 Dec 2018 08:56:28 GMT cadick [12138]
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartStartTor (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartStartTor/OrxoKartStartTor.material (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartStartTor/OrxoKartStartTor.mesh (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartStartTor/OrxoKartStartTor.png (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/RainbowSpiral (added)

	added port


Wed, 05 Dec 2018 08:45:40 GMT matanner [12137]
	* code/branches/TowerDefense_HS18/data/levels/emptyLevel.oxw (modified)
	* code/branches/TowerDefense_HS18/data/levels/towerDefense.oxw (modified)
	* code/branches/TowerDefense_HS18/src/modules/towerdefense/TowerDefenseController.cc (modified)
	* code/branches/TowerDefense_HS18/src/modules/towerdefense/towerdefensereadme.txt (modified)

	Quality of life changes


Wed, 05 Dec 2018 08:26:18 GMT kunzro [12136]
	* code/branches/wagnis_HS18/data/levels/Wagnis_testlevel.oxw (modified)
	* code/branches/wagnis_HS18/data/levels/templates/wagnisCursor.oxt (modified)
	* code/branches/wagnis_HS18/data/overlays/WagnisHUD.oxo (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.cc (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.h (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified)
	* code/branches/wagnis_HS18/src/modules/weapons/projectiles/WagnisProjectile.cc (modified)
	* code/branches/wagnis_HS18/src/modules/weapons/weaponmodes/WagnisGun.cc (modified)

	HUD fixed


Tue, 04 Dec 2018 12:56:55 GMT samuelbl [12135]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)

	Player functionalities added


Sun, 02 Dec 2018 21:47:00 GMT stadlero [12134]
	* code/branches/wagnis_HS18/data/overlays/WagnisHUD.oxo (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified)

	Troop count is visible in the HUD


Sun, 02 Dec 2018 15:08:26 GMT stadlero [12133]
	* code/branches/wagnis_HS18/data/levels/Wagnis_testlevel.oxw (added)
	* code/branches/wagnis_HS18/data/levels/templates/wagnisCursor.oxt (modified)
	* code/branches/wagnis_HS18/data/overlays/WagnisHUD.oxo (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)

	Wagnis now progresses through stages


Thu, 29 Nov 2018 18:22:46 GMT stadlero [12132]
	* code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)

	Wagnis runs without crashing on startup


Thu, 29 Nov 2018 08:12:53 GMT linggj [12131]
	* code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified)
	* code/branches/WorldMap_HS18/data/overlays/StoryModeHUD.oxo (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h (modified)

	it works but needs some beuty to be added


Wed, 28 Nov 2018 22:17:41 GMT stadlero [12130]
	* code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)

	changed gametype from Deathmatch to Wagnis in Wagnis.oxw + some wip ...


Wed, 28 Nov 2018 11:53:04 GMT kunzro [12129]
	* code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified)
	* code/branches/wagnis_HS18/data/levels/templates/wagnisCursor.oxt (modified)
	* code/branches/wagnis_HS18/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/wagnis_HS18/src/modules/weapons/projectiles/WagnisProjectile.cc (added)
	* code/branches/wagnis_HS18/src/modules/weapons/projectiles/WagnisProjectile.h (added)
	* code/branches/wagnis_HS18/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/wagnis_HS18/src/modules/weapons/weaponmodes/WagnisGun.cc (added)
	* code/branches/wagnis_HS18/src/modules/weapons/weaponmodes/WagnisGun.h (added)

	Cursor fixed, should be working properly now


Wed, 28 Nov 2018 11:06:14 GMT ottka [12128]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h (modified)

	Make two levels and more


Wed, 28 Nov 2018 10:57:48 GMT samuelbl [12127]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)

	Player moves implemented


Wed, 28 Nov 2018 10:52:42 GMT michbaum [12126]
	* code/branches/TowerDefense_HS18/src/modules/towerdefense/TowerDefenseController.cc (added)
	* code/branches/TowerDefense_HS18/src/modules/towerdefense/TowerDefenseController.h (added)

	Neuer Controller fuer die Gegnerbewegung


Wed, 28 Nov 2018 10:50:56 GMT michbaum [12125]
	* code/branches/TowerDefense_HS18/data/levels/towerDefense.oxw (modified)
	* code/branches/TowerDefense_HS18/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/TowerDefense_HS18/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/TowerDefense_HS18/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/TowerDefense_HS18/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)

	Neuer Gegnercontroller und alle noetigen Aenderungen


Wed, 28 Nov 2018 10:50:16 GMT stadlero [12124]
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPrereqs.h (modified)

	Wagnis class wip


Wed, 28 Nov 2018 10:36:23 GMT wiesep [12123]
	* code/branches/shader_HS18/data/levels/BumpMap.oxw (added)
	* code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (deleted)

	Renamed leve


Wed, 28 Nov 2018 09:13:50 GMT wiesep [12121]
	* code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (modified)

	Changed spawnpoint and light positions


Wed, 28 Nov 2018 09:02:11 GMT stadlero [12119]
	* code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)

	Wagnis class does now compile


Wed, 28 Nov 2018 08:33:18 GMT kunzro [12118]
	* code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified)
	* code/branches/wagnis_HS18/data/levels/templates/wagnisCursor.oxt (added)

	'Cursor' added and lvl updated


Wed, 21 Nov 2018 11:13:54 GMT ottka [12116]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h (modified)

	level select in level file


Wed, 21 Nov 2018 11:03:16 GMT stadlero [12114]
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified)

	WIP 21 nov


Wed, 21 Nov 2018 11:01:38 GMT wiesep [12113]
	* code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (modified)
	* code/branches/shader_HS18/data/levels/tutorial.oxw (modified)

	Rotating cubes


Wed, 21 Nov 2018 11:01:01 GMT wiesep [12112]
	* code/branches/shader_HS18/src/libraries/tools/Mesh.cc (modified)

	Added error handling


Wed, 21 Nov 2018 10:49:03 GMT ottka [12111]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (modified)

	stop timer after round


Wed, 21 Nov 2018 10:45:27 GMT linggj [12110]
	* code/branches/WorldMap_HS18/ToDo (added)
	* code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified)
	* code/branches/WorldMap_HS18/src/modules/flappyorx/FlappyOrxShip.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.h (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h (modified)

	some changes


Wed, 21 Nov 2018 09:19:21 GMT stadlero [12109]
	* code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)

	Player class does now compile


Wed, 21 Nov 2018 08:32:15 GMT ottka [12108]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (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/OrxoKart.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.cc (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.h (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartPrereqs.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc (modified)

	implement simple respawn


Thu, 15 Nov 2018 21:23:48 GMT stadlero [12107]
	* code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified)

	Province is now a pawn


Wed, 14 Nov 2018 10:59:52 GMT linggj [12106]
	* code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.cc (added)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.h (added)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h (modified)

	Story Mode Controller added again as a controllabel entitz


Wed, 14 Nov 2018 10:58:59 GMT samuelbl [12105]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)

	Player update


Wed, 14 Nov 2018 09:43:18 GMT samuelbl [12104]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified)

	Province all public


Wed, 14 Nov 2018 09:38:10 GMT samuelbl [12103]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)

	Player updated


Wed, 14 Nov 2018 09:30:44 GMT stadlero [12102]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified)

	Billboard added to Province


Wed, 14 Nov 2018 09:01:05 GMT linggj [12101]
	* code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw (modified)
	* code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified)
	* code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw (modified)
	* code/branches/WorldMap_HS18/data/levels/templates/StoryMode.oxt (modified)
	* code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/WorldMap_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h (modified)

	12


Wed, 14 Nov 2018 08:29:00 GMT samuelbl [12100]
	* code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)

	Wagnis Player updated


Sun, 11 Nov 2018 16:38:58 GMT wiesep [12098]
	* code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (modified)
	* code/branches/shader_HS18/src/libraries/tools/Mesh.cc (modified)
	* code/branches/shader_HS18/src/libraries/tools/Timer.h (modified)

	Working version


Sun, 11 Nov 2018 15:45:00 GMT wiesep [12095]
	* code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (modified)

	Adjusted lights


Fri, 09 Nov 2018 22:36:12 GMT merholzl [12094]
	* code/branches/Flatpak/cmake/InstallCheck.cmake (modified)
	* code/branches/Flatpak/cmake/tools/FindCEGUI.cmake (modified)
	* code/branches/Flatpak/src/libraries/tools/Timer.h (modified)

	Changes needed for Flatpak compilation


Fri, 09 Nov 2018 22:28:21 GMT merholzl [12093]
	* code/branches/Flatpak (copied)

	Flatpak test branch


Wed, 07 Nov 2018 10:52:40 GMT ottka [12090]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified)

	clean up of module :)


Wed, 07 Nov 2018 10:42:26 GMT ottka [12089]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (modified)

	implement module


Wed, 07 Nov 2018 10:28:25 GMT thomkell [12087]
	* code/branches/TixyTaxyTorxy_HS18/data/levels/TixyTaxyTorxy.oxw (modified)

	field


Wed, 07 Nov 2018 10:26:02 GMT sastocke [12086]
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc (modified)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc (modified)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.h (modified)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.cc (modified)

	switching towers


Wed, 07 Nov 2018 09:48:46 GMT cadick [12082]
	* code/branches/OrxoKart_HS18/svn_is_cancer/images/textures/OrxoKartStreckenabschnitt.png (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/images/textures/OrxoKartStreckenabschnittZiel.png (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/materials/OrxoKartStreckenabschnitt.material (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/materials/OrxoKartStreckenabschnittZiel.material (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/models/OrxoKartStreckenabschnitt.mesh (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/models/OrxoKartStreckenabschnittZiel.mesh (added)

	added textures for Strecke


Wed, 07 Nov 2018 09:45:50 GMT ottka [12081]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)

	it is alive


Wed, 07 Nov 2018 09:44:00 GMT stadlero [12080]
	* code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (modified)

	private variables added in player class


Wed, 07 Nov 2018 09:38:34 GMT ottka [12079]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt (modified)
	* code/branches/OrxoKart_HS18/data/overlays/OrxoKartHUD.oxo (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified)

	fixed HUD


Wed, 07 Nov 2018 09:23:46 GMT kunzro [12077]
	* code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified)

	gameboard string fixed


Wed, 07 Nov 2018 09:21:44 GMT wiesep [12076]
	* code/branches/shader_HS18/src/libraries/tools/Mesh.cc (modified)

	Added tangent vector generating


Wed, 07 Nov 2018 09:21:08 GMT wiesep [12075]
	* code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw (added)

	Test Level for Shaders


Wed, 07 Nov 2018 09:14:37 GMT ottka [12074]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/src/modules/CMakeLists.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/OrxoKart.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h (modified)

	makefile update


Wed, 07 Nov 2018 09:13:31 GMT emustafa [12073]
	* code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/OrxoKart_HS18/src/modules/hover/Hover.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/hover/HoverShip.cc (modified)

	reverted hover files


Sat, 03 Nov 2018 22:49:55 GMT stadlero [12072]
	* code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)

	Added connections-string parser in WagnisGameboard which still needs
	work


Wed, 31 Oct 2018 10:49:41 GMT emustafa [12071]
	* code/branches/OrxoKart_HS18/data/levels/kart_alpha0.1.oxw (added)
	* code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt (added)

	OrxoKart uses OrxoKartKart and not HoverShip


Wed, 31 Oct 2018 10:39:26 GMT emustafa [12070]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)

	OrxoKart uses OrxoKartKart and not HoverShip


Wed, 31 Oct 2018 10:32:03 GMT stadlero [12069]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h (added)

	Player class added


Wed, 31 Oct 2018 10:30:19 GMT samuelbl [12068]
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h (added)

	Wagnis class added.


Wed, 31 Oct 2018 10:27:04 GMT kunzro [12067]
	* code/branches/wagnis_HS18/data/levels/Wagnis.oxw (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified)

	XML and CMake updated, Gameboard is working


Wed, 31 Oct 2018 10:23:24 GMT emustafa [12066]
	* code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt (modified)
	* code/branches/OrxoKart_HS18/src/modules/hover/HoverShip.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.h (modified)

	OrxoKartKart controls optimized


Wed, 31 Oct 2018 10:20:31 GMT ottka [12065]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/svn_is_cancer (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/images (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/images/textures (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/images/textures/teststrecke.png (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/materials (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/materials/teststrecke.material (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/models (added)
	* code/branches/OrxoKart_HS18/svn_is_cancer/models/teststrecke.mesh (added)

	god help us


Wed, 31 Oct 2018 10:02:38 GMT sastocke [12064]
	* code/branches/TixyTaxyTorxy_HS18/data/levels/TixyTaxyTorxy.oxw (added)
	* code/branches/TixyTaxyTorxy_HS18/data/overlays/TixyTaxyTorxyHUD.oxo (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/CMakeLists.txt (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.h (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyCenterpoint.cc (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyCenterpoint.h (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyCoordinate.cc (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyCoordinate.h (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.h (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyHUDController.cc (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyHUDController.h (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyPrereqs.h (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxySelecter.cc (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxySelecter.h (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.cc (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.h (added)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyreadme.txt (added)

	second initial setup


Wed, 31 Oct 2018 10:01:02 GMT sastocke [12063]
	* code/branches/TixyTaxyTorxy_HS18/src/modules/CMakeLists.txt (modified)
	* code/branches/TixyTaxyTorxy_HS18/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)

	Initial setup


Wed, 31 Oct 2018 09:56:46 GMT ottka [12062]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (modified)
	* code/branches/OrxoKart_HS18/src/modules/hover/Hover.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (modified)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (modified)

	level added


Wed, 31 Oct 2018 09:40:50 GMT linggj [12060]
	* code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw (added)
	* code/branches/WorldMap_HS18/data/levels/emptyLevel22.oxw (added)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc (added)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h (added)

	Story Mode Controller added


Wed, 31 Oct 2018 09:37:15 GMT linggj [12059]
	* code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified)
	* code/branches/WorldMap_HS18/src/orxonox/controllers/CMakeLists.txt (modified)

	Story Mode Controller added


Wed, 31 Oct 2018 08:13:23 GMT linggj [12058]
	* code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw (modified)
	* code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified)
	* code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc (modified)

	building


Wed, 24 Oct 2018 09:43:55 GMT ottka [12057]
	* code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.h (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.cc (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartOrigin.h (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartPrereqs.h (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.cc (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartTile.h (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc (added)
	* code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.h (added)

	rainbow road testing


Wed, 24 Oct 2018 09:38:45 GMT ottka [12056]
	* code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt (modified)

	rainbow road test


Wed, 24 Oct 2018 09:37:10 GMT linggj [12055]
	* code/branches/WorldMap_HS18/path.txt (added)

	Text file


Wed, 24 Oct 2018 09:33:55 GMT linggj [12054]
	* code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified)

	Ship added


Wed, 24 Oct 2018 09:32:57 GMT linggj [12053]
	* code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout (modified)
	* code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua (modified)
	* code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw (modified)
	* code/branches/WorldMap_HS18/data/levels/templates/StoryModeEscort.oxt (modified)
	* code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc (modified)
	* code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc (modified)

	Ship added


Wed, 24 Oct 2018 09:29:37 GMT kunzro [12052]
	* code/branches/wagnis_HS18/data/levels/Wagnis.oxw (added)

	Levelfile added


Wed, 24 Oct 2018 09:22:05 GMT stadlero [12051]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified)

	XML Funkion von Province-Klasse hinzugefuegt


Sun, 21 Oct 2018 12:54:21 GMT stadlero [12050]
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (modified)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (modified)

	Eine XMLPort Funktion in der Gameboard-Klasse hinzugefügt


Sun, 21 Oct 2018 11:28:52 GMT stadlero [12049]
	* code/branches/wagnis_HS18/src/modules/wagnis (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisPrereqs.h (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc (added)
	* code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (added)

	Klassen jetzt hinzugefügt -Oli


Sun, 21 Oct 2018 11:24:43 GMT stadlero [12048]
	* code/branches/wagnis_HS18/src/libraries/tools/Timer.cc (modified)
	* code/branches/wagnis_HS18/src/libraries/tools/Timer.h (modified)
	* code/branches/wagnis_HS18/src/modules/CMakeLists.txt (modified)

	Klassen WagnisProvince und WagnisGameboard hinzugefügt und in Klasse ...


Wed, 17 Oct 2018 09:38:23 GMT merholzl [12045]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/3DPacman.oxw (copied)
	* code/branches/mergeFS18/data/levels/templates/PacmanGelb.oxt (copied)
	* code/branches/mergeFS18/data/overlays/PacmanHUD.oxo (copied)
	* code/branches/mergeFS18/src/modules/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/dodgerace/DodgeRaceShip.cc (modified)
	* code/branches/mergeFS18/src/modules/pacman (copied)

	merged pacman


Wed, 17 Oct 2018 09:23:17 GMT patricwi [12043]
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanAfraidGhost.mesh (modified)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGelb.mesh (modified)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostBlue.mesh (modified)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostOrange.mesh (modified)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostPink.mesh (modified)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostRed.mesh (modified)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanMap.mesh (modified)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanPointAfraid.mesh (modified)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanPointSphere.mesh (modified)

	Updated Meshes to v 1.8


Wed, 17 Oct 2018 08:41:31 GMT patricwi [12041]
	* code/branches/3DPacman_FS18/New Material/updated_mesh (added)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanAfraidGhost.mesh (added)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGelb.mesh (added)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostBlue.mesh (added)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostOrange.mesh (added)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostPink.mesh (added)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanGhostRed.mesh (added)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanMap.mesh (added)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanPointAfraid.mesh (added)
	* code/branches/3DPacman_FS18/New Material/updated_mesh/PacmanPointSphere.mesh (added)

	Upgraded meshes


Wed, 17 Oct 2018 07:12:58 GMT merholzl [12040]
	* code/branches/SuperOrxoBros_HS18 (copied)

	SuperOrxoBros improvements


Wed, 17 Oct 2018 07:12:22 GMT merholzl [12039]
	* code/branches/TixyTaxyTorxy_HS18 (copied)

	interesting TicTacToe


Wed, 17 Oct 2018 07:11:25 GMT merholzl [12038]
	* code/branches/TowerDefense_HS18/mergeFS18 (copied)

	Tower Defense improvements


Wed, 17 Oct 2018 07:10:24 GMT merholzl [12037]
	* code/branches/OrxoKart_HS18 (copied)

	MarioKart apation


Wed, 17 Oct 2018 07:09:33 GMT merholzl [12036]
	* code/branches/WorldMap_HS18 (copied)

	World Map


Wed, 17 Oct 2018 07:08:16 GMT merholzl [12035]
	* code/branches/wagnis_HS18 (copied)

	Risiko adaption


Wed, 17 Oct 2018 07:06:50 GMT merholzl [12034]
	* code/branches/shader_HS18 (copied)

	New branch for shader


Wed, 10 Oct 2018 14:08:48 GMT merholzl [12031]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/SOB.oxw (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOB.cc (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBFigure.h (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBGumba.cc (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBItem.h (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBPrereqs.h (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBTube.cc (copied)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBTube.h (copied)

	merged Tubes into SuperOrxoBros


Wed, 10 Oct 2018 13:55:21 GMT merholzl [12030]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/OrxyRoad.oxw (copied)
	* code/branches/mergeFS18/data/levels/templates/OrxyRoadPattern.oxt (copied)
	* code/branches/mergeFS18/data/levels/templates/spaceshipOrxyRoad.oxt (copied)
	* code/branches/mergeFS18/data/overlays/OrxyRoadHUD.oxo (copied)
	* code/branches/mergeFS18/src/modules/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/orxyroad (copied)

	added OrxyRoad


Wed, 10 Oct 2018 13:36:53 GMT merholzl [12029]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/newnewnewspacerace.oxw (modified)
	* code/branches/mergeFS18/data/levels/presentationHS12.oxw (modified)
	* code/branches/mergeFS18/data/levels/templates/SpaceRaceTemplates.oxt (copied)
	* code/branches/mergeFS18/data/levels/templates/fastship.oxt (modified)
	* code/branches/mergeFS18/data/levels/templates/spaceshipCollateralDamage.oxt (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRace.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/mergeFS18/src/orxonox/items/Engine.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	added space race improvements


Wed, 10 Oct 2018 13:16:51 GMT merholzl [12028]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/ScriptableControllerTestMoveKillDrone.oxw (copied)
	* code/branches/mergeFS18/data/levels/ScriptableControllerTestSpawn.oxw (copied)
	* code/branches/mergeFS18/data/levels/scriptController.oxw (modified)
	* code/branches/mergeFS18/data/levels/scriptableControllerTest.oxw (copied)
	* code/branches/mergeFS18/data/levels/scripts (copied)
	* code/branches/mergeFS18/data/levels/templates/ScriptableControllerDroneTemplate.oxt (copied)
	* code/branches/mergeFS18/src/libraries/core/BaseObject.cc (modified)
	* code/branches/mergeFS18/src/libraries/core/BaseObject.h (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.cc (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.h (modified)
	* code/branches/mergeFS18/src/orxonox/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/orxonox/Level.cc (modified)
	* code/branches/mergeFS18/src/orxonox/Level.h (modified)
	* code/branches/mergeFS18/src/orxonox/controllers/AutonomousDroneController.cc (copied)
	* code/branches/mergeFS18/src/orxonox/controllers/AutonomousDroneController.h (copied)
	* code/branches/mergeFS18/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/orxonox/controllers/Controller.cc (modified)
	* code/branches/mergeFS18/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/mergeFS18/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/mergeFS18/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/mergeFS18/src/orxonox/items/ShipPart.cc (modified)
	* code/branches/mergeFS18/src/orxonox/scriptablecontroller (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/AutonomousDrone.cc (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/AutonomousDrone.h (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.cc (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.h (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	added scriptable controller


Wed, 10 Oct 2018 13:06:55 GMT merholzl [12027]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/testMultiplayerLevel.oxw (copied)
	* code/branches/mergeFS18/data/levels/testMultiplayerLevelLTS.oxw (copied)
	* code/branches/mergeFS18/data/overlays/lastTeamStandingHUD.oxo (modified)
	* code/branches/mergeFS18/src/libraries/network/Client.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Client.h (modified)
	* code/branches/mergeFS18/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/ClientConnection.h (modified)
	* code/branches/mergeFS18/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/ClientConnectionListener.h (modified)
	* code/branches/mergeFS18/src/libraries/network/Connection.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Connection.h (modified)
	* code/branches/mergeFS18/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/mergeFS18/src/libraries/network/GamestateHandler.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/GamestateHandler.h (modified)
	* code/branches/mergeFS18/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/GamestateManager.h (modified)
	* code/branches/mergeFS18/src/libraries/network/Host.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Host.h (modified)
	* code/branches/mergeFS18/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/LANDiscoverable.h (modified)
	* code/branches/mergeFS18/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/MasterServer.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Server.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Server.h (modified)
	* code/branches/mergeFS18/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/ServerConnection.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Acknowledgement.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Chat.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Packet.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/mergeFS18/src/modules/overlays/hud/HUDWeaponSystem.cc (modified)
	* code/branches/mergeFS18/src/orxonox/graphics/Model.cc (modified)

	Merged Masterserver, refresh button had to be removed


Wed, 10 Oct 2018 09:13:30 GMT merholzl [12026]
	* code/branches/mergeFS18 (copied)

	new merge branch to cequi 0.8 and ogre 1.9