#
# ChangeLog for /
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 2:29:42 PM

Sat, 31 Oct 2015 18:15:11 GMT paulsc [10735]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Implemented EffectBeacon for quest 2.1 and added platform for ...


Sat, 31 Oct 2015 17:40:29 GMT landauf [10734]
	* code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake (modified)

	fixed build for mingw (apparently it requires gnu extensions to
	compile)


Sat, 31 Oct 2015 17:11:53 GMT landauf [10733]
	* code/branches/cpp11_v2 (modified)
	* code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake (modified)
	* code/branches/cpp11_v2/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified)
	* code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc (modified)
	* code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h (modified)
	* code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h (modified)
	* code/branches/cpp11_v2/src/libraries/tools/OgreBulletUtils.h (modified)
	* code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.h (modified)
	* code/branches/cpp11_v2/src/modules/invader/Invader.cc (modified)
	* code/branches/cpp11_v2/src/modules/invader/Invader.h (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderShip.h (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc (modified)
	* code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/Jump.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/Jump.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpBoots.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpItem.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpItem.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpRocket.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpScore.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpShield.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpShield.h (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc (modified)
	* code/branches/cpp11_v2/src/modules/jump/JumpSpring.h (modified)
	* code/branches/cpp11_v2/src/orxonox/chat/ChatManager.cc (modified)
	* code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc (modified)

	merged branch cpp11 to cpp11_v2


Sat, 31 Oct 2015 16:41:17 GMT landauf [10732]
	* code/branches/cpp11_v2 (copied)

	created new branch for cpp11


Sat, 31 Oct 2015 15:07:29 GMT gania [10731]
	* code/branches/AI_HS15/data/levels/AITest.oxw (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified)
	* code/branches/AI_HS15/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/AI_HS15/src/orxonox/worldentities/pawns/Pawn.h (modified)

	added a little bit of firing functionality


Sat, 31 Oct 2015 12:51:45 GMT bhatiab [10730]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Worked on lua.fog, fogFields is working now, but I'm having problemes ...


Sat, 31 Oct 2015 11:20:00 GMT gania [10729]
	* code/branches/AI_HS15/data/levels/AITest.oxw (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified)

	move functions were added, everyone stays in formations


Sat, 31 Oct 2015 10:33:08 GMT landauf [10728]
	* code/trunk/src/orxonox/graphics/Model.cc (modified)

	disable LOD for MSVC and ogre version 1.8 because it leads to crashes


Sat, 31 Oct 2015 10:06:37 GMT landauf [10727]
	* code/trunk/src/libraries/tools/Shader.cc (modified)
	* code/trunk/src/libraries/tools/Shader.h (modified)
	* code/trunk/src/modules/pong/PongAI.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified)
	* code/trunk/src/orxonox/Scene.cc (modified)

	fixed warnings with MSVC14


Fri, 30 Oct 2015 22:52:18 GMT landauf [10726]
	* code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (modified)
	* code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h (modified)
	* code/trunk/src/external/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (modified)
	* code/trunk/src/external/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.h (modified)

	fixed alignment warnings in MSVC14 (caused by SSE instructions in
	bullet)


Fri, 30 Oct 2015 22:07:34 GMT gania [10725]
	* code/branches/AI_HS15/data/levels/AITest.oxw (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified)
	* code/branches/AI_HS15/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	fixed pointers


Fri, 30 Oct 2015 18:51:49 GMT fvultier [10724]
	* code/branches/fabienHS15/data/levels/includes/pickups.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsGhost.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsH2.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsPirate.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi (modified)
	* code/branches/fabienHS15/data/levels/pickups.oxw (modified)
	* code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h (modified)
	* code/branches/fabienHS15/src/modules/pickup/items/BoostPickup.cc (added)
	* code/branches/fabienHS15/src/modules/pickup/items/BoostPickup.h (added)
	* code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified)
	* code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified)
	* code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	The weapon system HUD rescales properly if the window size changes.


Fri, 30 Oct 2015 18:51:04 GMT fvultier [10723]
	* data/trunk/images/effects/icon_flash.png (added)
	* data/trunk/images/overlay/WSHUD_MunitionSeparate.png (modified)
	* data/trunk/images/overlay/WSHUD_MunitionShare.png (modified)
	* data/trunk/materials/Pickups.material (modified)




Fri, 30 Oct 2015 11:08:30 GMT gania [10722]
	* code/branches/AI_HS15/data/levels/AITest.oxw (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified)

	created destructor functions and improved findNewLeader and ...


Thu, 29 Oct 2015 22:27:32 GMT fvultier [10721]
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi (modified)
	* code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h (modified)
	* code/branches/fabienHS15/src/modules/pickup/items/MunitionContainer.cc (added)
	* code/branches/fabienHS15/src/modules/pickup/items/MunitionContainer.h (added)
	* code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (modified)
	* code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified)




Thu, 29 Oct 2015 22:26:28 GMT fvultier [10720]
	* data/trunk/images/effects/arrow.png (deleted)
	* data/trunk/images/effects/arrowdown.png (added)
	* data/trunk/images/effects/arrowup.png (added)
	* data/trunk/images/effects/damage.png (modified)
	* data/trunk/images/overlay/WSHUD_MunitionSeparate.png (modified)
	* data/trunk/images/overlay/WSHUD_MunitionShare.png (modified)
	* data/trunk/images/overlay/WSHUD_MunitionStack.png (modified)
	* data/trunk/images/overlay/WSHUD_Ready.png (modified)
	* data/trunk/images/overlay/WSHUD_Reloading.png (modified)
	* data/trunk/images/overlay/WSHUD_Replenish.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_EnergyDrink.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_FusionFire.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_GravityBombFire.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_HsW01.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_IceGun.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_LaserFire.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_LightningGun.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_RocketFire.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_SimpleRocketFire.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_SplitGun.png (modified)
	* data/trunk/images/overlay/WSHUD_WM_Unknown.png (modified)
	* data/trunk/materials/Pickups.material (modified)




Thu, 29 Oct 2015 19:02:23 GMT gania [10719]
	* code/branches/AI_HS15/data/levels/AITest.oxw (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (added)
	* code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (added)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (added)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (added)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified)

	All compiling, WingmanControllers actually find LeaderControllers and ...


Thu, 29 Oct 2015 12:17:02 GMT gania [10718]
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)

	bugfix


Thu, 29 Oct 2015 10:53:45 GMT gania [10717]
	* code/branches/AI_HS15/data/levels/AITest.oxw (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (deleted)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (deleted)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified)

	Wingmen and Leaders look for their leaders


Wed, 28 Oct 2015 21:56:16 GMT landauf [10716]
	* code/trunk/cmake/tools/TargetUtilities.cmake (modified)

	let orxonox_main depend on plugins too. this means that every plugin ...


Tue, 27 Oct 2015 20:08:40 GMT fvultier [10715]
	* code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified)
	* code/branches/fabienHS15/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (modified)
	* code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified)




Mon, 26 Oct 2015 22:36:27 GMT fvultier [10714]
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified)




Mon, 26 Oct 2015 22:34:23 GMT fvultier [10713]
	* code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified)




Mon, 26 Oct 2015 20:33:19 GMT landauf [10712]
	* code/trunk/test/util/output/ConsoleWriterTest.cc (modified)

	fixed build with MSVC14


Mon, 26 Oct 2015 19:30:26 GMT paulsc [10711]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)
	* code/branches/campaignHS15/data/levels/missionOne.oxw (modified)

	Fixed some errors, fixed teams. @bhatiab: Commenting out lua tags in ...


Mon, 26 Oct 2015 16:49:01 GMT paulsc [10710]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Started work on docking. Needs work tho.


Mon, 26 Oct 2015 16:44:31 GMT gania [10709]
	* code/branches/AI_HS15/data/levels/AITest.oxw (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified)

	Restructured


Mon, 26 Oct 2015 15:07:58 GMT meierman [10708]
	* code/branches/hoverHS15/data/levels/Hover.oxw (modified)
	* code/branches/hoverHS15/src/modules/hover/CMakeLists.txt (modified)
	* code/branches/hoverHS15/src/modules/hover/Hover.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h (modified)

	HoverWall introduced


Mon, 26 Oct 2015 15:07:58 GMT hzuellig [10707]
	* code/branches/planetLevelHS15/data/levels/betterearth.oxw (modified)

	Changing the thexture of the earth.


Mon, 26 Oct 2015 15:03:57 GMT holzerj [10706]
	* code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt (modified)
	* code/branches/particleEffectsHS15/data/particle/engine.particle (added)

	New engine effect


Mon, 26 Oct 2015 14:49:14 GMT bhatiab [10705]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Started Work on includes/fog.lua


Mon, 26 Oct 2015 14:48:10 GMT luhug [10704]
	* code/branches/planetLevelHS15/data/levels/flightTest.oxw (modified)

	Added Portals to flightTest.oxw


Mon, 26 Oct 2015 14:41:25 GMT bhatiab [10703]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	added asteroids


Mon, 26 Oct 2015 13:35:28 GMT luhug [10702]
	* code/branches/planetLevelHS15/data/levels/flightTest.oxw (modified)

	dito


Mon, 26 Oct 2015 13:04:42 GMT luhug [10701]
	* code/branches/planetLevelHS15/data/levels/flightTest.oxw (modified)

	Updated flightTest.oxw


Mon, 26 Oct 2015 13:02:31 GMT meierman [10700]
	* code/branches/hoverHS15/data/levels/Hover.oxw (modified)

	Hover level update


Mon, 26 Oct 2015 12:58:52 GMT bhatiab [10699]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	changed the waypoints for the transporter...


Mon, 26 Oct 2015 12:50:28 GMT hzuellig [10698]
	* code/branches/planetLevelHS15/data/levels/betterearth.oxw (added)

	testing better earth SVN


Mon, 26 Oct 2015 12:49:40 GMT meierman [10697]
	* code/branches/hoverHS15/data/levels/Hover.oxw (modified)

	First time with HoverShip


Mon, 26 Oct 2015 12:47:15 GMT bhatiab [10696]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Changed position of Station c


Mon, 26 Oct 2015 12:45:50 GMT bhatiab [10695]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	changed health and position of stations


Mon, 26 Oct 2015 12:36:43 GMT bucyril [10694]
	* code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified)

	Made the code compile


Sun, 25 Oct 2015 21:48:18 GMT landauf [10693]
	* code/trunk/src/libraries/core/ClassTreeMask.h (modified)

	fixed undefined reference with msvc14 (only occurred in buildmode ...


Sun, 25 Oct 2015 18:09:11 GMT fvultier [10692]
	* code/branches/fabienHS15/data/levels/includes/pickups.oxi (modified)
	* code/branches/fabienHS15/data/levels/pickups.oxw (modified)
	* code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/fabienHS15/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/fabienHS15/src/modules/pickup/items/DronePickup.h (modified)
	* code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (added)
	* code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h (added)
	* code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified)




Sun, 25 Oct 2015 18:04:23 GMT fvultier [10691]
	* data/trunk/gui/imagesets/PickupInventory.imageset (modified)
	* data/trunk/images/effects/damage.png (added)
	* data/trunk/images/effects/damageLarge.png (deleted)
	* data/trunk/images/effects/damageMedium.png (deleted)
	* data/trunk/images/effects/damageSmall.png (deleted)
	* data/trunk/images/effects/munition.png (added)
	* data/trunk/images/effects/splash.png (added)
	* data/trunk/images/effects/unknown.png (added)
	* data/trunk/images/gui/pickup.png (modified)
	* data/trunk/materials/3arrowsup.material (deleted)
	* data/trunk/materials/Arrow.material (deleted)
	* data/trunk/materials/Cross.material (deleted)
	* data/trunk/materials/Eye.material (deleted)
	* data/trunk/materials/Pickups.material (added)
	* data/trunk/materials/Shield.material (deleted)
	* data/trunk/materials/Shrink.material (deleted)
	* data/trunk/materials/damageLarge.material (deleted)
	* data/trunk/materials/damageMedium.material (deleted)
	* data/trunk/materials/damageSmall.material (deleted)




Sun, 25 Oct 2015 10:13:49 GMT paulsc [10690]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Replaced shuttle Waypoints with Billboards and started work on ...


Sat, 24 Oct 2015 23:26:44 GMT paulsc [10689]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Made further improvements to events and quests. Some things need ...


Sat, 24 Oct 2015 20:51:18 GMT fvultier [10688]
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified)
	* code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified)
	* code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (added)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (added)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (added)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (added)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (added)
	* code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h (added)
	* code/branches/fabienHS15/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.h (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.cc (added)
	* code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.h (added)
	* code/branches/fabienHS15/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted)
	* code/branches/fabienHS15/src/modules/weapons/munitions/ReplenishingMunition.h (deleted)
	* code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/projectiles/GravityBombField.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/IceGun.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/LaserFire.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/CMakeLists.txt (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (added)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (added)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.h (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified)

	There is now a HUD that shows the status of the weapon system: all ...


Sat, 24 Oct 2015 20:12:07 GMT fvultier [10687]
	* data/trunk/images/overlay/WSHUD_Empty.png (added)
	* data/trunk/images/overlay/WSHUD_MunitionSeparate.png (added)
	* data/trunk/images/overlay/WSHUD_MunitionShare.png (added)
	* data/trunk/images/overlay/WSHUD_MunitionStack.png (added)
	* data/trunk/images/overlay/WSHUD_Ready.png (added)
	* data/trunk/images/overlay/WSHUD_Reloading.png (added)
	* data/trunk/images/overlay/WSHUD_Replenish.png (added)
	* data/trunk/images/overlay/WSHUD_WM_EnergyDrink.png (added)
	* data/trunk/images/overlay/WSHUD_WM_FusionFire.png (added)
	* data/trunk/images/overlay/WSHUD_WM_GravityBombFire.png (added)
	* data/trunk/images/overlay/WSHUD_WM_HsW01.png (added)
	* data/trunk/images/overlay/WSHUD_WM_IceGun.png (added)
	* data/trunk/images/overlay/WSHUD_WM_LaserFire.png (added)
	* data/trunk/images/overlay/WSHUD_WM_LightningGun.png (added)
	* data/trunk/images/overlay/WSHUD_WM_RocketFire.png (added)
	* data/trunk/images/overlay/WSHUD_WM_SimpleRocketFire.png (added)
	* data/trunk/images/overlay/WSHUD_WM_SplitGun.png (added)
	* data/trunk/images/overlay/WSHUD_WM_Unknown.png (added)
	* data/trunk/images/overlay/WSHUD_Weapon.png (added)

	new icons: PNG images


Sat, 24 Oct 2015 19:54:59 GMT fvultier [10686]
	* data/trunk/materials/Orxonox.material (modified)

	new icons


Sat, 24 Oct 2015 19:46:36 GMT fvultier [10685]
	* code/branches/fabienHS15 (copied)




Sat, 24 Oct 2015 16:37:29 GMT paulsc [10684]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Started work on narrative notifications


Sat, 24 Oct 2015 16:15:03 GMT paulsc [10683]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added Station C, started work on events.


Fri, 23 Oct 2015 12:18:32 GMT gania [10682]
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified)

	Set a layout for WingmanController and LeaderController


Fri, 23 Oct 2015 05:44:20 GMT gania [10681]
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified)

	refactoring in process


Wed, 21 Oct 2015 14:48:52 GMT bhatiab [10680]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Fixed Coordinates


Tue, 20 Oct 2015 18:23:56 GMT gania [10679]
	* code/branches/AI_HS15/DivisionBrit.png (added)
	* code/branches/AI_HS15/Four_Finger_Squadron.PNG (added)
	* code/branches/AI_HS15/data/levels/AITest.oxw (modified)

	Diagrams in root


Tue, 20 Oct 2015 18:17:50 GMT gania [10678]
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (added)
	* code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (added)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (added)
	* code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (added)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (added)
	* code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (added)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (added)
	* code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (added)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (added)
	* code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (added)

	Didn't delete old structure, but intend to replace it with new: ...


Mon, 19 Oct 2015 20:49:41 GMT fvultier [10677]
	* code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (modified)

	Fixed minor issue in the WeaponsettingsASSF: The left and the right ...


Mon, 19 Oct 2015 20:30:27 GMT paulsc [10676]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Uniformized formatting, partially automatically.

	The rules are now ...


Mon, 19 Oct 2015 20:20:29 GMT fvultier [10675]
	* code/branches/towerdefenseFabien (deleted)

	Delete merged branch.


Mon, 19 Oct 2015 20:07:28 GMT paulsc [10674]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added enemy WaypointPatrolController with Attacher waypoint


Mon, 19 Oct 2015 15:15:17 GMT gania [10673]
	* code/branches/AI_HS15/data/levels/AITest.oxw (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.h (modified)

	added setDesiredPositionOfSlaves() to FormationController, Vector3* ...


Mon, 19 Oct 2015 14:11:17 GMT luhug [10672]
	* code/branches/planetLevelHS15/data/levels/flightTest.oxw (added)

	Added flightTest.oxw level


Mon, 19 Oct 2015 14:08:23 GMT holzerj [10671]
	* code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/particleEffectsHS15/data/levels/pong.oxw (modified)
	* code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt (modified)
	* code/branches/particleEffectsHS15/data/particle/engineglow.particle (modified)
	* code/branches/particleEffectsHS15/data/particle/ice.particle (added)
	* code/branches/particleEffectsHS15/data/particle/rocketfire.particle (modified)

	New particleeffects


Mon, 19 Oct 2015 14:01:54 GMT gania [10670]
	* code/branches/AI_HS15/src/libraries/util/Math.cc (modified)
	* code/branches/AI_HS15/src/libraries/util/Math.h (modified)
	* code/branches/AI_HS15/src/modules/docking/DockingController.cc (modified)
	* code/branches/AI_HS15/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.h (modified)
	* code/branches/AI_HS15/test/util/MathTest.cc (modified)

	hold position in formation with waypoints


Mon, 19 Oct 2015 14:00:00 GMT vaydin [10669]
	* code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/branches/explosionChunksHS15/data/levels/templates/spaceshipEscort.oxt (modified)
	* code/branches/explosionChunksHS15/src/orxonox/worldentities/BigExplosion.cc (modified)
	* code/branches/explosionChunksHS15/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/explosionChunksHS15/src/orxonox/worldentities/VaydinExplosion.cc (added)
	* code/branches/explosionChunksHS15/src/orxonox/worldentities/VaydinExplosion.h (added)
	* code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	created new explosion class


Mon, 19 Oct 2015 13:59:23 GMT meierman [10668]
	* code/branches/hoverHS15/data/levels/Hover.oxw (modified)

	update levelfile


Mon, 19 Oct 2015 13:47:08 GMT bhatiab [10667]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added Waypoints for Transporter - Coordinates for A, B and the ...


Mon, 19 Oct 2015 13:26:21 GMT bhatiab [10666]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added General Level-structure.


Mon, 19 Oct 2015 13:17:40 GMT bucyril [10665]
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified)




Mon, 19 Oct 2015 13:15:11 GMT meierman [10664]
	* code/branches/hoverHS15/data/levels/Hover.oxw (modified)
	* code/branches/hoverHS15/src/modules/hover/Hover.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/Hover.h (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified)

	First (emptz) functioning version


Mon, 19 Oct 2015 13:08:34 GMT paulsc [10663]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added quest structure, spawn trigger and comment sections


Mon, 19 Oct 2015 13:06:53 GMT bucyril [10662]
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified)

	M    src/modules/hover/HoverShip.h


Mon, 19 Oct 2015 12:53:51 GMT bucyril [10661]
	* code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified)

	Removed custom code

	M    hover/HoverShip.cc
	M    hover/HoverShip.h


Mon, 19 Oct 2015 12:51:49 GMT meierman [10660]
	* code/branches/hoverHS15/data/levels/Hover.oxw (added)
	* code/branches/hoverHS15/src/modules/hover/Hover.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/Hover.h (modified)

	new level file


Mon, 19 Oct 2015 12:40:08 GMT bucyril [10659]
	* code/branches/hoverHS15/src/modules/hover/Hover.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/Hover.h (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h (added)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified)

	1234

	M    hover/Hover.cc
	M    hover/Hover.h
	M    ...


Mon, 19 Oct 2015 12:32:32 GMT meierman [10658]
	* code/branches/hoverHS15/src/modules/hover/CMakeLists.txt (added)
	* code/branches/hoverHS15/src/modules/hover/Hover.cc (added)
	* code/branches/hoverHS15/src/modules/hover/Hover.h (added)

	new basic files added to Hover


Mon, 19 Oct 2015 12:22:28 GMT bucyril [10657]
	* code/branches/hoverHS15/src/modules/hover/HoverShip.cc (added)
	* code/branches/hoverHS15/src/modules/hover/HoverShip.h (added)

	Copied files from another module

	A    hover/HoverShip.cc
	A    ...


Mon, 19 Oct 2015 12:03:58 GMT meierman [10656]
	* code/branches/hoverHS15/src/modules/CMakeLists.txt (modified)
	* code/branches/hoverHS15/src/modules/hover (added)

	new folder for minigame hover


Sun, 18 Oct 2015 18:57:24 GMT gania [10655]
	* code/branches/AI_HS15/data/levels/AITest.oxw (added)




Sun, 18 Oct 2015 18:53:37 GMT gania [10654]
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.h (modified)

	changed AIController -> collecting data about spaceships with each ...


Sun, 18 Oct 2015 12:35:35 GMT fvultier [10653]
	* data/trunk/images/effects/flare_energy.xcf (deleted)
	* data/trunk/materials/stunweapon.material (modified)

	Fixed bug in the material of a weapon of SpaceshipASSFF2. There is no ...


Fri, 16 Oct 2015 13:25:17 GMT gania [10652]
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified)

	deleted old behaviour of AIController (partly), forced ships to form ...


Tue, 13 Oct 2015 16:11:01 GMT gania [10651]
	* code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.h (modified)

	Old AIController default behaviour is commented out


Mon, 12 Oct 2015 20:57:00 GMT fvultier [10650]
	* code/trunk/data/levels/includes/weaponSettingsRing.oxi (modified)
	* code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/Weapon.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSet.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	There is now a spaceship that uses the gravity bomb. Minor ...


Mon, 12 Oct 2015 16:40:48 GMT paulsc [10649]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added waypoint-transporter and music


Mon, 12 Oct 2015 16:28:15 GMT fvultier [10648]
	* code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified)

	Removed EnergyDrink Weapon from SpaceshipASSFF. Improved ...


Mon, 12 Oct 2015 13:16:36 GMT hzuellig [10647]
	* code/branches/planetLevelHS15/test.txt (deleted)
	* code/branches/planetLevelHS15/text.txt (deleted)

	deleted


Mon, 12 Oct 2015 13:15:28 GMT hzuellig [10646]
	* code/branches/planetLevelHS15/test.txt (added)
	* code/branches/planetLevelHS15/text.txt (added)

	test&textfiles


Mon, 12 Oct 2015 13:14:46 GMT bhatiab [10645]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (modified)

	Added Transporter to level...


Mon, 12 Oct 2015 13:06:36 GMT fvultier [10644]
	* code/branches/particleEffectsHS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:31:56 GMT gstalder [10643]
	* code/branches/hoverHS15/README (modified)

	testphase


Mon, 12 Oct 2015 12:27:16 GMT paulsc [10642]
	* code/branches/campaignHS15/data/levels/Campaign1.oxw (added)

	First campaing level added


Mon, 12 Oct 2015 12:22:30 GMT fvultier [10641]
	* code/branches/explosionChunksHS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:22:02 GMT fvultier [10640]
	* code/branches/AI_HS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:20:29 GMT fvultier [10639]
	* code/branches/campaignHS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:20:15 GMT meierman [10638]
	* code/branches/hoverHS15/README (modified)

	fuck


Mon, 12 Oct 2015 12:19:33 GMT fvultier [10637]
	* code/branches/planetLevelHS15 (copied)

	New branch for PPS


Mon, 12 Oct 2015 12:09:59 GMT gstalder [10636]
	* code/branches/hoverHS15/README (modified)

	schwach