# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 22, 2024, 5:44:22 PM Fri, 25 Dec 2015 20:07:12 GMT muemart [10976] * code/branches/cpp11_v2/src/libraries/util/Math.h (modified) * code/branches/cpp11_v2/src/libraries/util/MultiType.h (modified) Add some static asserts Wed, 23 Dec 2015 18:16:33 GMT muemart [10975] * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) * code/branches/cpp11_v2/test/core/command/FunctorTest.cc (modified) Extend Functor to handle any callable objects (lambdas!). Had to ... Mon, 14 Dec 2015 10:31:30 GMT maxima [10974] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/AITest.oxw (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.h (modified) merged campaign and presentation Mon, 14 Dec 2015 10:24:35 GMT fvultier [10973] * data/trunk/materials/101.material (modified) * data/trunk/materials/CityGround.material (modified) * data/trunk/materials/CityGroundLamps.material (added) * data/trunk/materials/Glasstower1.material (modified) * data/trunk/materials/Hausc1.material (modified) * data/trunk/materials/PrimeTower.material (modified) * data/trunk/models/101.mesh (modified) * data/trunk/models/CityGround.mesh (modified) * data/trunk/models/CityGroundLamps.mesh (modified) * data/trunk/models/Glasstower1.mesh (modified) * data/trunk/models/Hausc1.mesh (modified) * data/trunk/models/PrimeTower.mesh (modified) Converted some models to Ogre 1.4 Fri, 11 Dec 2015 21:07:29 GMT fvultier [10972] * data/contentcreation/pps/FabienVultier/JumpModelle (added) * data/contentcreation/pps/FabienVultier/JumpModelle/Jump.blend (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpBoots.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy1.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy2.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy2Wing.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy3.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy4.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpFigure.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpFigureLeftHand.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpFigureRightHand.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform01.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform02.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform03.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform04.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform05.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform06.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpProjectile.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPropeller.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpRocket.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpShield.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpSpring.png (added) * data/contentcreation/pps/HendrikZuellig (added) * data/contentcreation/pps/HendrikZuellig/101.blend (added) * data/contentcreation/pps/HendrikZuellig/101.png (added) * data/contentcreation/pps/HendrikZuellig/101tryhard.blend (added) * data/contentcreation/pps/HendrikZuellig/CityGround.jpg (added) * data/contentcreation/pps/HendrikZuellig/CityGroundLights.blend (added) * data/contentcreation/pps/HendrikZuellig/CityGroundLights.jpg (added) * data/contentcreation/pps/HendrikZuellig/ETH.blend (added) * data/contentcreation/pps/HendrikZuellig/ETHNEW.png (added) * data/contentcreation/pps/HendrikZuellig/Glasstower1.jpg (added) * data/contentcreation/pps/HendrikZuellig/Prime.blend (added) * data/contentcreation/pps/HendrikZuellig/Working prime.blend (added) * data/contentcreation/pps/HendrikZuellig/citylamps.jpg (added) * data/contentcreation/pps/HendrikZuellig/ctg.jpg (added) * data/contentcreation/pps/HendrikZuellig/eth.png (added) * data/contentcreation/pps/HendrikZuellig/glasstower1.blend (added) * data/contentcreation/pps/HendrikZuellig/glasstower2.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc1.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc1.png (added) * data/contentcreation/pps/HendrikZuellig/hausc1tryhard.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc2.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc2.png (added) * data/contentcreation/pps/HendrikZuellig/hausc2tryhard.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc3.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc3.png (added) * data/contentcreation/pps/HendrikZuellig/lamps.png (added) * data/contentcreation/pps/HendrikZuellig/plane.blend (added) * data/contentcreation/pps/HendrikZuellig/prim.png (added) * data/contentcreation/pps/JannisHolzer (added) * data/contentcreation/pps/JannisHolzer/Mine (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine.material (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine.png (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine_Core.mesh (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine_Core.mesh.xml (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine_Ring.mesh (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine_Ring.mesh.xml (added) * data/contentcreation/pps/JannisHolzer/Mine/mine.blend (added) * data/contentcreation/pps/JannisHolzer/Sounds (added) * data/contentcreation/pps/JannisHolzer/Sounds/mineactivate.ogg (added) * data/contentcreation/pps/JannisHolzer/Sounds/minesound.ogg (added) * data/contentcreation/pps/SpaceStation (added) * data/contentcreation/pps/SpaceStation/Renders (added) * data/contentcreation/pps/SpaceStation/barrel_1.blend (added) * data/contentcreation/pps/SpaceStation/barrel_1.blend1 (added) * data/contentcreation/pps/SpaceStation/barrel_1.blend2 (added) * data/contentcreation/pps/SpaceStation/barrel_1.jpg (added) * data/contentcreation/pps/SpaceStation/barrel_1.png (added) * data/contentcreation/pps/SpaceStation/barrel_1.psd (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly.blend1 (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly.blend2 (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly.png (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad1.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad1.blend1 (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad2.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad3.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad4.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad4.blend1 (added) * data/contentcreation/pps/SpaceStation/can.blend (added) * data/contentcreation/pps/SpaceStation/can.jpg (added) * data/contentcreation/pps/SpaceStation/can.png (added) * data/contentcreation/pps/SpaceStation/can_a.jpg (added) * data/contentcreation/pps/SpaceStation/chair_2.blend (added) * data/contentcreation/pps/SpaceStation/chair_2.jpg (added) * data/contentcreation/pps/SpaceStation/chair_2.psd (added) * data/contentcreation/pps/SpaceStation/chair_2_bump.jpg (added) * data/contentcreation/pps/SpaceStation/char_1.blend (added) * data/contentcreation/pps/SpaceStation/companys (added) * data/contentcreation/pps/SpaceStation/companys/Ganymed.jpg (added) * data/contentcreation/pps/SpaceStation/companys/Ganymed.psd (added) * data/contentcreation/pps/SpaceStation/companys/can.psd (added) * data/contentcreation/pps/SpaceStation/companys/orxnet.jpg (added) * data/contentcreation/pps/SpaceStation/companys/orxnet.psd (added) * data/contentcreation/pps/SpaceStation/companys/redgas.jpg (added) * data/contentcreation/pps/SpaceStation/companys/redgas.psd (added) * data/contentcreation/pps/SpaceStation/cylinder_1.blend (added) * data/contentcreation/pps/SpaceStation/cylinder_1.blend1 (added) * data/contentcreation/pps/SpaceStation/cylinder_1.jpg (added) * data/contentcreation/pps/SpaceStation/cylinder_1.psd (added) * data/contentcreation/pps/SpaceStation/door.blend (added) * data/contentcreation/pps/SpaceStation/door_1.blend (added) * data/contentcreation/pps/SpaceStation/door_1.blend1 (added) * data/contentcreation/pps/SpaceStation/door_1.jpg (added) * data/contentcreation/pps/SpaceStation/door_1.psd (added) * data/contentcreation/pps/SpaceStation/explosa.psd (added) * data/contentcreation/pps/SpaceStation/flag.blend (added) * data/contentcreation/pps/SpaceStation/flag.png (added) * data/contentcreation/pps/SpaceStation/flag_AEAN.blend (added) * data/contentcreation/pps/SpaceStation/flag_AEAN.blend1 (added) * data/contentcreation/pps/SpaceStation/flag_AEAN.jpg (added) * data/contentcreation/pps/SpaceStation/flag_cau.blend (added) * data/contentcreation/pps/SpaceStation/flag_cau.jpg (added) * data/contentcreation/pps/SpaceStation/flag_csa.blend (added) * data/contentcreation/pps/SpaceStation/flag_csa.jpg (added) * data/contentcreation/pps/SpaceStation/flag_eu.blend (added) * data/contentcreation/pps/SpaceStation/flag_eu.blend1 (added) * data/contentcreation/pps/SpaceStation/flag_eu.jpg (added) * data/contentcreation/pps/SpaceStation/flag_room_1.blend (added) * data/contentcreation/pps/SpaceStation/flag_room_1.blend1 (added) * data/contentcreation/pps/SpaceStation/flag_room_1.blend2 (added) * data/contentcreation/pps/SpaceStation/flag_room_1.jpg (added) * data/contentcreation/pps/SpaceStation/flag_room_1.png (added) * data/contentcreation/pps/SpaceStation/flag_room_1.psd (added) * data/contentcreation/pps/SpaceStation/flag_room_2.jpg (added) * data/contentcreation/pps/SpaceStation/flag_room_3.jpg (added) * data/contentcreation/pps/SpaceStation/flag_room_4.jpg (added) * data/contentcreation/pps/SpaceStation/flag_uca.jpg (added) * data/contentcreation/pps/SpaceStation/flags (added) * data/contentcreation/pps/SpaceStation/flags/AEAN_flag.png (added) * data/contentcreation/pps/SpaceStation/flags/AEAN_flag.psd (added) * data/contentcreation/pps/SpaceStation/flags/cau flag.png (added) * data/contentcreation/pps/SpaceStation/flags/cau flag.psd (added) * data/contentcreation/pps/SpaceStation/flags/csa.png (added) * data/contentcreation/pps/SpaceStation/flags/csa.psd (added) * data/contentcreation/pps/SpaceStation/flags/eu_flag.png (added) * data/contentcreation/pps/SpaceStation/flags/eu_flag.psd (added) * data/contentcreation/pps/SpaceStation/flags/uca_flag.png (added) * data/contentcreation/pps/SpaceStation/flags/uca_flag.psd (added) * data/contentcreation/pps/SpaceStation/machine.blend (added) * data/contentcreation/pps/SpaceStation/mauer.blend (added) * data/contentcreation/pps/SpaceStation/mauer.blend1 (added) * data/contentcreation/pps/SpaceStation/mauer.blend2 (added) * data/contentcreation/pps/SpaceStation/mauer.png (added) * data/contentcreation/pps/SpaceStation/mauer_ad2.blend (added) * data/contentcreation/pps/SpaceStation/presentation (added) * data/contentcreation/pps/SpaceStation/presentation/Ganymed.png (added) * data/contentcreation/pps/SpaceStation/presentation/Ganymed.psd (added) * data/contentcreation/pps/SpaceStation/presentation/Renders (added) * data/contentcreation/pps/SpaceStation/presentation/attachment.ashx.blend1 (added) * data/contentcreation/pps/SpaceStation/presentation/box_2_lowpoly_ad2.3ds (added) * data/contentcreation/pps/SpaceStation/presentation/flag_room_1_1.blend (added) * data/contentcreation/pps/SpaceStation/presentation/flag_room_1_1.blend1 (added) * data/contentcreation/pps/SpaceStation/presentation/pic.blend (added) * data/contentcreation/pps/SpaceStation/presentation/presentation.blend (added) * data/contentcreation/pps/SpaceStation/presentation/presentation2.blend (added) * data/contentcreation/pps/SpaceStation/sleep_capsule.blend (added) * data/contentcreation/pps/SpaceStation/soda.jpg (added) * data/contentcreation/pps/SpaceStation/soda.psd (added) * data/contentcreation/pps/SpaceStation/spind_1.blend (added) * data/contentcreation/pps/SpaceStation/spind_1.blend2 (added) * data/contentcreation/pps/SpaceStation/spind_1.jpg (added) * data/contentcreation/pps/SpaceStation/spind_1.psd (added) * data/contentcreation/pps/SpaceStation/spind_1_bump.jpg (added) * data/contentcreation/pps/SpaceStation/spind_2.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2.psd (added) * data/contentcreation/pps/SpaceStation/ss_box_2_ad1.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_ad2.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_bump.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_bump.psd (added) * data/contentcreation/pps/SpaceStation/ss_box_2_ganymede.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_ganymede.psd (added) * data/contentcreation/pps/SpaceStation/ss_box_2_none.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_none.psd (added) * data/contentcreation/pps/SpaceStation/ss_box_2_redgas.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_redgas.psd (added) * data/contentcreation/pps/SpaceStation/ss_mauer.jpg (added) * data/contentcreation/pps/SpaceStation/ss_mauer.psd (added) * data/contentcreation/pps/SpaceStation/ss_mauer_ad2.jpg (added) * data/contentcreation/pps/SpaceStation/ss_mauer_bump.jpg (added) * data/contentcreation/pps/SpaceStation/table_1.blend (added) * data/contentcreation/pps/SpaceStation/table_1.jpg (added) * data/contentcreation/pps/SpaceStation/table_1.png (added) * data/contentcreation/pps/SpaceStation/table_1.psd (added) * data/contentcreation/pps/SpaceStation/table_crack.blend (added) * data/contentcreation/pps/SpaceStation/table_crack.blend1 (added) * data/contentcreation/pps/SpaceStation/table_crack.blend2 (added) * data/contentcreation/pps/SpaceStation/table_crack.jpg (added) * data/contentcreation/pps/SpaceStation/table_crack.psd (added) * data/contentcreation/pps/SpaceStation/textures (added) * data/contentcreation/pps/SpaceStation/textures/AluminumBrush.png (added) * data/contentcreation/pps/SpaceStation/textures/Broken_Laptop_Screen.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Bubble Grip.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Clover Steel.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Coated Metal.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Heat Phase.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Heated Metal.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Imprinted Metal.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Jupiter's Alloy.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Kirk's Entry.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Needlepoint Steel.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Plastic-2923d.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Qwerty.svg.png (added) * data/contentcreation/pps/SpaceStation/textures/Red_Mahogany_Wood_Texture_by_SweetSoulSister.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/01.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/02.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/03.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/04.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/05.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/06.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/07.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/08.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/09.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/10.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/11.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/12.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/13.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/14.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/15.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/16.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/17.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-daughterofsnape.abr (added) * data/contentcreation/pps/SpaceStation/textures/Seamless_Wood_Planks_Texture_by_cfrevoir.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Star_Wars_Galaxy_Map_KOTOR_Quest.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Steel Vault.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Stressed Tin.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Tileable metal scratch rust texture (3).jpg (added) * data/contentcreation/pps/SpaceStation/textures/brushed-metal-texture.jpg (added) * data/contentcreation/pps/SpaceStation/textures/chessboard_display_large.jpg (added) * data/contentcreation/pps/SpaceStation/textures/plastic_0050_01.jpg (added) * data/contentcreation/pps/SpaceStation/textures/seamless_carpet_dark_by_hhh316-d30v2ul.jpg (added) * data/contentcreation/pps/SpaceStation/textures/seamless_rough_plastic_texture_gb_by_blueamnesiac-d4mxpuj.png (added) * data/contentcreation/pps/SpaceStation/textures/sources.txt (added) * data/contentcreation/pps/SpaceStation/tube curve.jpg (added) * data/contentcreation/pps/SpaceStation/tube curve.psd (added) * data/contentcreation/pps/SpaceStation/tube curve_bump.jpg (added) * data/contentcreation/pps/SpaceStation/tube.blend (added) * data/contentcreation/pps/SpaceStation/tube.jpg (added) * data/contentcreation/pps/SpaceStation/tube.psd (added) * data/contentcreation/pps/SpaceStation/tube_bump.jpg (added) * data/contentcreation/pps/SpaceStation/tube_curve.blend (added) * data/contentcreation/pps/SpaceStation/tube_curve.blend1 (added) * data/contentcreation/pps/SpaceStation/tube_curve.blend2 (added) * data/contentcreation/pps/SpaceStation/tube_f.blend (added) * data/contentcreation/pps/SpaceStation/tube_t without.jpg (added) * data/contentcreation/pps/SpaceStation/tube_t_with_door.blend (added) * data/contentcreation/pps/SpaceStation/tube_t_without_door.blend (added) * data/contentcreation/pps/SpaceStation/tube_x.blend (added) * data/contentcreation/pps/SpaceStation/tube_x.jpg (added) * data/contentcreation/pps/SpaceStation/tube_x.psd (added) * data/contentcreation/pps/SpaceStation/tube_x_bump.jpg (added) * data/contentcreation/pps/SpaceStation/wall.jpg (added) * data/contentcreation/pps/SpaceStation/wall.psd (added) * data/contentcreation/pps/TobiasGatschet (added) * data/contentcreation/pps/TobiasGatschet/SpaceShipTransporter068.blend (added) * data/contentcreation/pps/TobiasGatschet/orbitalstation14.blend (added) * data/contentcreation/pps/TobiasGatschet/spaceshiptransporter.png (added) New content from PPS HS15 Fri, 11 Dec 2015 14:32:33 GMT gania [10971] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) referenced the testing level in headers of child classes Fri, 11 Dec 2015 14:26:20 GMT maxima [10970] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/defaultConfig/orxonox.ini (modified) * code/branches/presentationHS15/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/presentationHS15/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/presentationHS15/data/levels/AITest.oxw (copied) * code/branches/presentationHS15/data/levels/expeditionSector.oxw (copied) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/shuttleAttack.oxw (copied) * code/branches/presentationHS15/data/levels/shuttleRetaliation.oxw (copied) * code/branches/presentationHS15/data/levels/templates/spaceshipShuttle.oxt (copied) * code/branches/presentationHS15/src/libraries/util/Math.cc (modified) * code/branches/presentationHS15/src/libraries/util/Math.h (modified) * code/branches/presentationHS15/src/modules/docking/DockingController.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.cc (copied) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/worldentities/SpawnPoint.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/test/util/MathTest.cc (modified) Merged campaign and presentation. Everything seems to work fine. Fri, 11 Dec 2015 14:20:17 GMT gania [10969] * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) follow-up commit Fri, 11 Dec 2015 14:16:48 GMT gania [10968] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) a little clean up Fri, 11 Dec 2015 13:21:20 GMT maxima [10967] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/planetLevelHS15.oxw (copied) Added planetLevel to presentation. This level does not yet work on ... Thu, 10 Dec 2015 20:07:29 GMT luhug [10966] * data/trunk/images/textures/101.png (added) * data/trunk/images/textures/CityGround.jpg (added) * data/trunk/images/textures/ctg.jpg (added) * data/trunk/images/textures/hausc2.png (added) * data/trunk/images/textures/hausc3.jpg (added) * data/trunk/images/textures/hausc3.png (added) * data/trunk/materials/101.material (added) * data/trunk/materials/CityGround.material (added) * data/trunk/materials/Example.material (modified) * data/trunk/materials/Example.material~ (added) * data/trunk/materials/Glasstower1Material.material (added) * data/trunk/materials/Hausc2.material (added) * data/trunk/materials/Sky.material (added) * data/trunk/materials/cgt.material (added) * data/trunk/materials/hausc3.material (added) * data/trunk/models/101.mesh (added) * data/trunk/models/CityGround.mesh (added) * data/trunk/models/CityGroundLamps.mesh (added) * data/trunk/models/ETH.mesh (modified) * data/trunk/models/Hausc2.mesh (added) * data/trunk/models/PrimeTower.mesh (modified) * data/trunk/models/hausc3.mesh (added) Added all models for Planet/City level Thu, 10 Dec 2015 19:59:23 GMT luhug [10965] * code/branches/planetLevelHS15/data/levels/planetLevelHS15.oxw (modified) Finished! Wed, 09 Dec 2015 16:50:50 GMT fvultier [10964] * data/trunk/images/overlay/WSHUD_WM_MineGun.png (added) * data/trunk/materials/Orxonox.material (modified) Image of the MineGun for the weapon HUD. Wed, 09 Dec 2015 15:56:39 GMT maxima [10963] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/emptyLevel.oxw (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi (added) * code/branches/presentationHS15/data/levels/mineLevel.oxw (added) * code/branches/presentationHS15/data/levels/pong.oxw (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt (added) * code/branches/presentationHS15/data/particle/MineExpl.particle (copied) * code/branches/presentationHS15/data/particle/MineExpl1.particle (copied) * code/branches/presentationHS15/data/particle/MineExpl2.particle (copied) * code/branches/presentationHS15/data/particle/engine.particle (copied) * code/branches/presentationHS15/data/particle/engineglow.particle (modified) * code/branches/presentationHS15/data/particle/ice.particle (copied) * code/branches/presentationHS15/data/particle/mineparticle.particle (copied) * code/branches/presentationHS15/data/particle/psygun.particle (copied) * code/branches/presentationHS15/data/particle/rocketfire.particle (modified) * code/branches/presentationHS15/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.cc (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.h (copied) * code/branches/presentationHS15/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.cc (copied) * code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.h (copied) * code/branches/presentationHS15/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc (copied) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.h (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) Merged presentation and particleEffects branches. Added a new level, ... Wed, 09 Dec 2015 15:03:59 GMT maxima [10962] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/HeavyCruiser.oxw (modified) * code/branches/presentationHS15/data/levels/emptyLevel.oxw (modified) * code/branches/presentationHS15/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/branches/presentationHS15/data/levels/kecks.oxw (modified) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/templates/FPS.oxt (modified) * code/branches/presentationHS15/data/levels/templates/FPS_HS14.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/branches/presentationHS15/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/presentationHS15/data/levels/templates/bigship.oxt (modified) * code/branches/presentationHS15/data/levels/templates/enemyInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipH2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHXY.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRing.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTransporter.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTurret.oxt (modified) * code/branches/presentationHS15/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/presentationHS15/src/libraries/tools/ParticleInterface.h (modified) * code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/presentationHS15/src/modules/invader/Invader.cc (modified) * code/branches/presentationHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationHS15/src/orxonox/items/ShipPart.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/BigExplosion.cc (deleted) * code/branches/presentationHS15/src/orxonox/worldentities/BigExplosion.h (deleted) * code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc (copied) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Merged presentation and exlposionChunks branches. Works fine. Added ... Wed, 09 Dec 2015 13:45:58 GMT maxima [10961] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentationHS15/data/gui/scripts/InGameMenu.lua (modified) * code/branches/presentationHS15/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/presentationHS15/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/branches/presentationHS15/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/presentationHS15/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/branches/presentationHS15/data/levels/includes/pickups.oxi (modified) * code/branches/presentationHS15/data/levels/includes/towerWeaponSettings.oxi (deleted) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/pickups.oxw (modified) * code/branches/presentationHS15/data/levels/presentationHS13.oxw (modified) * code/branches/presentationHS15/data/levels/shieldTest.oxw (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/branches/presentationHS15/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/presentationHS15/data/levels/templates/bigship.oxt (modified) * code/branches/presentationHS15/data/levels/templates/enemyInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRing.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTurret.oxt (modified) * code/branches/presentationHS15/data/levels/templates/towerdefensetower.oxt (modified) * code/branches/presentationHS15/data/levels/towerDefense.oxw (modified) * code/branches/presentationHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentationHS15/data/overlays/HoverHUD.oxo (modified) * code/branches/presentationHS15/data/overlays/InvaderHUD.oxo (modified) * code/branches/presentationHS15/data/overlays/jumpHUD.oxo (modified) * code/branches/presentationHS15/src/modules/overlays/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.h (copied) * code/branches/presentationHS15/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentationHS15/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.h (copied) * code/branches/presentationHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.h (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.h (copied) * code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/presentationHS15/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/FusionMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/GravityBombMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LaserMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.cc (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.h (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted) * code/branches/presentationHS15/src/modules/weapons/munitions/ReplenishingMunition.h (deleted) * code/branches/presentationHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/RocketMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/branches/presentationHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentationHS15/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentationHS15/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentationHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/StaticEntity.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged presentation and fabiens branch. Had to modify hoverHUD and ... Wed, 09 Dec 2015 11:47:30 GMT maxima [10960] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/Hover.oxw (copied) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHover.oxi (copied) * code/branches/presentationHS15/data/levels/templates/spaceshipHover.oxt (copied) * code/branches/presentationHS15/data/overlays/HoverHUD.oxo (copied) * code/branches/presentationHS15/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/hover (copied) * code/branches/presentationHS15/src/modules/hover/CMakeLists.txt (copied) * code/branches/presentationHS15/src/modules/hover/FlagHUD.cc (copied) * code/branches/presentationHS15/src/modules/hover/FlagHUD.h (copied) * code/branches/presentationHS15/src/modules/hover/Hover.cc (copied) * code/branches/presentationHS15/src/modules/hover/Hover.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverFlag.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverFlag.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverOrigin.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverOrigin.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverPrereqs.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverShip.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverShip.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverWall.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverWall.h (copied) * code/branches/presentationHS15/src/modules/hover/TimeHUD.cc (copied) * code/branches/presentationHS15/src/modules/hover/TimeHUD.h (copied) Merged presentation and hover branches. Hover minigame works fine. Wed, 09 Dec 2015 11:14:46 GMT maxima [10959] * code/branches/presentationHS15 (copied) New branch for PPS-presentation Tue, 08 Dec 2015 12:02:25 GMT gania [10958] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.h (modified) separated MasterController from my hierarchy Tue, 08 Dec 2015 10:15:47 GMT bhatiab [10957] * code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt (modified) Fixed collisionshapes and camera angles for the spaceshuttle Tue, 08 Dec 2015 09:32:07 GMT bhatiab [10956] * code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt (modified) Fixed Lighteffects for moving and breaking as well as the direction ... Mon, 07 Dec 2015 21:24:20 GMT gania [10955] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) cleaned up a bit Mon, 07 Dec 2015 19:45:07 GMT gania [10954] * code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc (added) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.h (added) added Master Mon, 07 Dec 2015 19:42:03 GMT gania [10953] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) converted hack to a legal class Mon, 07 Dec 2015 16:29:43 GMT fvultier [10952] * code/branches/hoverHS15/data/levels/includes/weaponSettingsHover.oxi (added) * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) Missing include added. Mon, 07 Dec 2015 16:04:44 GMT luhug [10951] * code/branches/planetLevelHS15/data/levels/luaTest.oxw (modified) * code/branches/planetLevelHS15/data/levels/planetLevelHS15.oxw (added) Put together the elements of our project in a new Level, ... Mon, 07 Dec 2015 15:42:46 GMT paulsc [10950] * code/branches/campaignHS15/data/defaultConfig/orxonox.ini (modified) * code/branches/campaignHS15/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/campaignHS15/data/gui/scripts/CampaignMenu.lua (modified) Improved campaign menu Mon, 07 Dec 2015 15:18:39 GMT holzerj [10949] * data/trunk/audio/sounds/mineactivate.ogg (added) Activation sound effect for mine Mon, 07 Dec 2015 15:15:07 GMT holzerj [10948] * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) Mine activation sound effect Mon, 07 Dec 2015 15:09:39 GMT gstalder [10947] * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) hover weapon template added Mon, 07 Dec 2015 15:06:37 GMT gania [10946] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) fix for sigsegv? Mon, 07 Dec 2015 15:03:07 GMT holzerj [10945] * data/trunk/audio/sounds/minesound.ogg (added) Added Mine Explosion Sound Effect Mon, 07 Dec 2015 15:01:06 GMT holzerj [10944] * code/branches/particleEffectsHS15/data/particle/MineExpl.particle (modified) * code/branches/particleEffectsHS15/data/particle/MineExpl1.particle (modified) * code/branches/particleEffectsHS15/data/particle/MineExpl2.particle (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.h (modified) Polished Mine Mon, 07 Dec 2015 14:49:51 GMT gstalder [10943] * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) Added model and collision shapes to hover ship template Mon, 07 Dec 2015 14:48:07 GMT vaydin [10942] * code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc (modified) added comments to the file Mon, 07 Dec 2015 14:47:59 GMT bucyril [10941] * data/trunk/images/textures/hovership_body.png (added) * data/trunk/images/textures/hovership_gun.png (added) * data/trunk/images/textures/hvoership_engine.png (added) * data/trunk/materials/hovership_body.material (added) * data/trunk/materials/hovership_engine.material (added) * data/trunk/materials/hovership_gun.material (added) * data/trunk/models/hovership_body.mesh (added) * data/trunk/models/hovership_engine.mesh (added) * data/trunk/models/hovership_gun.mesh (added) Added hovership model Mon, 07 Dec 2015 14:34:58 GMT meierman [10940] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) Invisible plate over the level Mon, 07 Dec 2015 14:34:08 GMT vaydin [10939] * code/branches/explosionChunksHS15/src/orxonox/worldentities/BigExplosion.cc (deleted) * code/branches/explosionChunksHS15/src/orxonox/worldentities/BigExplosion.h (deleted) forgot to delete bigexplosion Mon, 07 Dec 2015 14:32:10 GMT meierman [10938] * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) Removed some warnings Mon, 07 Dec 2015 14:32:07 GMT vaydin [10937] * code/branches/explosionChunksHS15/data/levels/HeavyCruiser.oxw (modified) * code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/explosionChunksHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/explosionChunksHS15/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/explosionChunksHS15/src/libraries/tools/ParticleInterface.h (modified) * code/branches/explosionChunksHS15/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/explosionChunksHS15/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/explosionChunksHS15/src/modules/invader/Invader.cc (modified) * code/branches/explosionChunksHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/explosionChunksHS15/src/orxonox/items/ShipPart.cc (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.h (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) Finalized everything deleted now unnecessary BigExplosion Mon, 07 Dec 2015 14:21:41 GMT bucyril [10936] * data/trunk/images/overlay/flag.png (added) * data/trunk/materials/hover_wall.jpg (added) Added flag overlay image and material Mon, 07 Dec 2015 14:14:40 GMT gania [10935] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) cleaned source up a bit Mon, 07 Dec 2015 13:49:46 GMT gania [10934] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) fixed bugs that are not supposed to even exist by initializing a ... Mon, 07 Dec 2015 13:49:30 GMT bhatiab [10933] * data/trunk/images/textures/spaceshiptransporter.png (added) * data/trunk/materials/Transporterspaceship.material (added) * data/trunk/models/Transporterspaceship.mesh (added) Added new Spaceship: templatename is spaceshipShuttle; Creator: ... Mon, 07 Dec 2015 13:37:44 GMT bhatiab [10932] * code/branches/campaignHS15/data/levels/expeditionSector.oxw (modified) * code/branches/campaignHS15/data/levels/shuttleAttack.oxw (modified) * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (modified) * code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt (modified) Added the screenshots to the levels, please UPDATE data_extern Branch ... Mon, 07 Dec 2015 13:37:04 GMT bhatiab [10931] * data/trunk/images/levelpreviews/expeditionSector.png (added) * data/trunk/images/levelpreviews/retailiation.png (added) * data/trunk/images/levelpreviews/shuttleProtect.png (added) Added 3 Screenshots for the campaign Mon, 07 Dec 2015 13:32:47 GMT meierman [10930] * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) * code/branches/hoverHS15/src/modules/hover/Hover.h (modified) * code/branches/hoverHS15/src/modules/hover/HoverFlag.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverFlag.h (modified) * code/branches/hoverHS15/src/modules/hover/HoverOrigin.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverOrigin.h (modified) * code/branches/hoverHS15/src/modules/hover/HoverWall.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverWall.h (modified) Finished with comments Mon, 07 Dec 2015 13:26:27 GMT bucyril [10929] * code/branches/hoverHS15/src/modules/hover/FlagHUD.cc (modified) * code/branches/hoverHS15/src/modules/hover/FlagHUD.h (modified) * code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified) * code/branches/hoverHS15/src/modules/hover/TimeHUD.cc (modified) * code/branches/hoverHS15/src/modules/hover/TimeHUD.h (modified) Added documentation Mon, 07 Dec 2015 13:05:58 GMT meierman [10928] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverFlag.cc (modified) Before finishing touch Mon, 07 Dec 2015 12:56:45 GMT gania [10927] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) fixed? Mon, 07 Dec 2015 12:26:23 GMT meierman [10926] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/hoverHS15/src/modules/hover/HoverWall.cc (modified) Fully functional Mon, 07 Dec 2015 08:41:38 GMT gania [10925] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) synchronized AI with a static tick counter Mon, 07 Dec 2015 08:04:38 GMT gania [10924] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) checking in Mon, 07 Dec 2015 07:34:20 GMT gania [10923] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) check in Sun, 06 Dec 2015 17:06:39 GMT landauf [10922] * code/branches/cpp11_v2/test/core/CMakeLists.txt (modified) * code/branches/cpp11_v2/test/core/command/FunctorPtrTest.cc (modified) * code/branches/cpp11_v2/test/core/command/FunctorTest.cc (added) moved functor-tests to new file Sun, 06 Dec 2015 15:06:00 GMT paulsc [10921] * code/branches/campaignHS15/data/levels/expeditionSector.oxw (modified) Finished (events in) expedition level. Sun, 06 Dec 2015 13:51:14 GMT landauf [10920] * code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectList.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectListIterator.h (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/cpp11_v2/src/modules/jump/Jump.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.cc (modified) * code/branches/cpp11_v2/src/orxonox/Radar.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/cpp11_v2/test/core/object/IteratorTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ListableTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ObjectListIteratorTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ObjectListTest.cc (modified) no static functions anymore in ObjectList. you need to instantiate an ... Sat, 05 Dec 2015 21:47:51 GMT landauf [10919] * code/branches/cpp11_v2/src/libraries/core/BaseObject.cc (modified) * code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Core.cc (modified) * code/branches/cpp11_v2/src/libraries/core/CoreConfig.cc (modified) * code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Game.cc (modified) * code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/NamespaceNode.cc (modified) * code/branches/cpp11_v2/src/libraries/core/ThreadPool.cc (modified) * code/branches/cpp11_v2/src/libraries/core/WindowEventListener.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/Super.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/JoyStickQuantityListener.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Client.cc (modified) * code/branches/cpp11_v2/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Connection.cc (modified) * code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Host.cc (modified) * code/branches/cpp11_v2/src/libraries/network/MasterServer.cc (modified) * code/branches/cpp11_v2/src/libraries/network/PeerList.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Server.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/ServerInformation.h (modified) * code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/branches/cpp11_v2/src/libraries/util/Serialise.h (modified) * code/branches/cpp11_v2/src/modules/docking/Dock.cc (modified) * code/branches/cpp11_v2/src/modules/docking/DockingEffect.cc (modified) * code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/cpp11_v2/src/modules/invader/Invader.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc (modified) * code/branches/cpp11_v2/src/modules/objects/Attacher.cc (modified) * code/branches/cpp11_v2/src/modules/objects/ForceField.cc (modified) * code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/branches/cpp11_v2/src/modules/objects/eventsystem/EventListener.cc (modified) * code/branches/cpp11_v2/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/Tetris.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/branches/cpp11_v2/src/orxonox/LevelManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/MoodManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/PlayerManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/Radar.cc (modified) * code/branches/cpp11_v2/src/orxonox/Scene.cc (modified) * code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.cc (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Mission.cc (modified) * code/branches/cpp11_v2/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/NotificationListener.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/PickupListener.cc (modified) * code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/branches/cpp11_v2/test/util/MathTest.cc (modified) use range-based for-loop where it makes sense (e.g. ObjectList) Sat, 05 Dec 2015 18:10:56 GMT muemart [10918] * code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Game.cc (modified) * code/branches/cpp11_v2/src/libraries/core/LuaState.cc (modified) * code/branches/cpp11_v2/src/libraries/core/LuaState.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/cpp11_v2/src/libraries/network/FunctionCall.cc (modified) * code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/DebugDrawer.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/DynamicLines.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/IcoSphere.cc (modified) * code/branches/cpp11_v2/src/libraries/util/SubString.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.cc (modified) * code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongAI.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.cc (modified) Use emplace_back instead of push_back if beneficial Wed, 02 Dec 2015 22:32:08 GMT landauf [10917] * code/branches/cpp11_v2/src/libraries/core/Language.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified) * code/branches/cpp11_v2/src/libraries/core/NamespaceNode.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/DynLibManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/branches/cpp11_v2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupManager.cc (modified) * code/branches/cpp11_v2/src/modules/pong/Pong.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/Tetris.cc (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc (modified) made mapEntry const& wherever possible Wed, 02 Dec 2015 22:22:03 GMT landauf [10916] * code/branches/cpp11_v2/src/libraries/core/BaseObject.cc (modified) * code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Core.cc (modified) * code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Game.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Language.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified) * code/branches/cpp11_v2/src/libraries/core/LuaState.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Namespace.cc (modified) * code/branches/cpp11_v2/src/libraries/core/NamespaceNode.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Resource.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/Shell.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclThreadList.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileSection.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/Button.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/JoyStick.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/Mouse.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/DynLibManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/Context.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/Listable.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.cc (modified) * code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/FunctionCall.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Host.cc (modified) * code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/DebugDrawer.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/IcoSphere.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/Shader.cc (modified) * code/branches/cpp11_v2/src/libraries/util/DisplayStringConversions.h (modified) * code/branches/cpp11_v2/src/libraries/util/Serialise.h (modified) * code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc (modified) * code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc (modified) * code/branches/cpp11_v2/src/libraries/util/StringUtils.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/OutputListener.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.cc (modified) * code/branches/cpp11_v2/src/modules/docking/Dock.cc (modified) * code/branches/cpp11_v2/src/modules/docking/DockingAnimation.cc (modified) * code/branches/cpp11_v2/src/modules/docking/DockingEffect.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/cpp11_v2/src/modules/jump/Jump.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/branches/cpp11_v2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/cpp11_v2/src/modules/objects/Attacher.cc (modified) * code/branches/cpp11_v2/src/modules/objects/Script.cc (modified) * code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupCollection.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupManager.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/cpp11_v2/src/modules/pong/Pong.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongAI.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/Quest.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestEffect.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestListener.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/Tetris.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/cpp11_v2/src/orxonox/Level.cc (modified) * code/branches/cpp11_v2/src/orxonox/LevelInfo.cc (modified) * code/branches/cpp11_v2/src/orxonox/LevelManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/Scene.cc (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/WaypointController.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/cpp11_v2/src/orxonox/items/ShipPart.cc (modified) * code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) use actual types instead of 'auto'. only exception is for complicated ... Wed, 02 Dec 2015 09:31:23 GMT gania [10915] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) little fix Wed, 02 Dec 2015 08:23:00 GMT bhatiab [10914] * code/branches/campaignHS15/data/levels/expeditionSector.oxw (modified) Finished Storyline and description, finished waypontpatrols for the 5 ... Tue, 01 Dec 2015 18:04:24 GMT gania [10913] * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) quick fix Tue, 01 Dec 2015 18:03:32 GMT gania [10912] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) defaultPatrol and defaultFightAll XML commands Tue, 01 Dec 2015 16:52:53 GMT fvultier [10911] * code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.h (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) Tue, 01 Dec 2015 15:33:46 GMT gania [10910] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) didn'change any behaviour yet, but implemented some methods that I ... Tue, 01 Dec 2015 09:03:10 GMT gania [10909] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) decided to get rid of action timer and call action in tick instead: ... Mon, 30 Nov 2015 21:55:38 GMT fvultier [10908] * code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.h (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile2.cc (deleted) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile2.h (deleted) * code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.h (modified) Mine damages pawns within range. Mon, 30 Nov 2015 21:25:57 GMT paulsc [10907] * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (modified) Almost done with retaliation level. Mon, 30 Nov 2015 20:34:54 GMT gania [10906] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) tried to fix fighting whn fps is low Mon, 30 Nov 2015 19:31:31 GMT luhug [10905] * code/branches/planetLevelHS15/data/levels/luaTest.oxw (modified) Mon, 30 Nov 2015 16:41:43 GMT paulsc [10904] * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (modified) Did nothing today. Mon, 30 Nov 2015 16:39:43 GMT gania [10903] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) AI attacks targets that are close Mon, 30 Nov 2015 16:37:42 GMT holzerj [10902] * data/trunk/images/textures/Mine.png (added) * data/trunk/images/textures/glow_effect.png (added) * data/trunk/images/textures/ice_crystal.png (added) * data/trunk/materials/Mine.material (added) * data/trunk/materials/PE_materials.material (modified) * data/trunk/models/Mine_Core.mesh (added) * data/trunk/models/Mine_Ring.mesh (added) New particle effects for the mine Mon, 30 Nov 2015 16:23:15 GMT holzerj [10901] * code/branches/particleEffectsHS15/data/particle/MineExpl.particle (added) * code/branches/particleEffectsHS15/data/particle/MineExpl1.particle (added) * code/branches/particleEffectsHS15/data/particle/MineExpl2.particle (added) * code/branches/particleEffectsHS15/data/particle/mineparticle.particle (added) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile2.cc (added) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile2.h (added) Added explosions effects when the mine explodes. Mon, 30 Nov 2015 15:38:28 GMT meierman [10900] * code/branches/hoverHS15/data/overlays/HoverHUD.oxo (modified) * code/branches/hoverHS15/src/modules/hover/FlagHUD.cc (modified) * code/branches/hoverHS15/src/modules/hover/FlagHUD.h (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/TimeHUD.cc (modified) Judihui it works Mon, 30 Nov 2015 15:05:08 GMT maxima [10899] * data/trunk/images/textures/flag.png (added) * data/trunk/materials/flag.material (added) Flag files for Hover Game Mon, 30 Nov 2015 15:04:16 GMT gania [10898] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.h (modified) commented some stuff Mon, 30 Nov 2015 14:56:38 GMT landauf [10897] * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.h (modified) register event-source Mon, 30 Nov 2015 14:56:04 GMT bhatiab [10896] * code/branches/campaignHS15/data/levels/expeditionSector.oxw (modified) * code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt (modified) Added Waypoints for enemies Mon, 30 Nov 2015 14:55:02 GMT bucyril [10895] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) * code/branches/hoverHS15/data/overlays/HoverHUD.oxo (added) * code/branches/hoverHS15/src/modules/hover/CMakeLists.txt (modified) * code/branches/hoverHS15/src/modules/hover/FlagHUD.cc (added) * code/branches/hoverHS15/src/modules/hover/FlagHUD.h (added) * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) * code/branches/hoverHS15/src/modules/hover/TimeHUD.cc (added) * code/branches/hoverHS15/src/modules/hover/TimeHUD.h (added) Added HUD and stuff Mon, 30 Nov 2015 14:47:42 GMT meierman [10894] * code/branches/hoverHS15/src/modules/hover/CMakeLists.txt (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/HoverFlag.cc (added) * code/branches/hoverHS15/src/modules/hover/HoverFlag.h (added) * code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h (modified) Flag generator implemented Mon, 30 Nov 2015 14:07:22 GMT bucyril [10893] * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) Changed control parameters Mon, 30 Nov 2015 13:20:57 GMT bhatiab [10892] * code/branches/campaignHS15/data/levels/expeditionSector.oxw (modified) * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (modified) Edited planets in expeditionsector and shuttlerealiation Mon, 30 Nov 2015 12:08:21 GMT gania [10891] * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) hotfix for isnan Mon, 30 Nov 2015 09:26:22 GMT bhatiab [10890] * code/branches/campaignHS15/data/levels/expeditionSector.oxw (modified) removed the other enemystations, as one should be enough, added ... Sun, 29 Nov 2015 20:05:26 GMT fvultier [10889] * code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/particleEffectsHS15/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.h (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.h (modified) promised wor for Jannis. Sun, 29 Nov 2015 17:36:21 GMT gania [10888] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.h (modified) started working on pickups Sun, 29 Nov 2015 17:07:43 GMT paulsc [10887] * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (modified) Almost finished retaliation level. Some things don't quite wanna work ... Sun, 29 Nov 2015 11:14:43 GMT gania [10886] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/LeaderController.cc (deleted) * code/branches/campaignHS15/src/orxonox/controllers/LeaderController.h (deleted) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) improved dodging Sat, 28 Nov 2015 21:30:56 GMT gania [10885] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/LeaderController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/LeaderController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) * code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.cc (modified) * code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.h (modified) added other weapons Sat, 28 Nov 2015 19:20:10 GMT fvultier [10884] * data/contentcreation/pps/FabienVultier (added) * data/contentcreation/pps/FabienVultier/TD Modelle (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/Coordinates.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/Coordinates.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/Coordinates.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/IceBolt.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/IceBolt.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/IceBolt.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/IceStar.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/IceStar.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/IceStar.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_O1.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_O1.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_O1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S1.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S1.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S2.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S2.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S2.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S3.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S3.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S3.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S4.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S4.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S4.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S5.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S5.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_S5.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T1.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T1.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T2.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T2.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T2.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T3.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T3.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T3.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T4.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T4.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T4.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T5.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T5.mesh.xml (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export Blender/TD_T5.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/Coordinates.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/Coordinates.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/Coordinates.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/IceBolt.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/IceBolt.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/IceBolt.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/IceStar.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/IceStar.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/IceStar.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_O1.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_O1.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_O1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S1.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S1.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S2.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S2.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S2.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S3.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S3.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S3.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S4.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S4.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S4.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S5.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S5.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_S5.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T1.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T1.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T2.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T2.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T2.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T3.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T3.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T3.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T4.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T4.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T4.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T5.material (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T5.mesh (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Export QTME/TD_T5.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/TD.blend (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/Coordinates.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/GravityBomb.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/IceBolt.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/IceBolt.xcf (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/IceStar.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/IceStar.xcf (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_F1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_O1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_O1.xcf (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S1.xcf (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S2.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S2.xcf (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S3.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S3.xcf (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S4.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S4.xcf (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S5.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_S5.xcf (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_Selection.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_T1.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_T2.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_T3.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_T4.png (added) * data/contentcreation/pps/FabienVultier/TD Modelle/Texturen/TD_T5.png (added) Blender file and textures of the models for the towerdefense minigame Sat, 28 Nov 2015 10:46:05 GMT gania [10883] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) ships spread before fight Sat, 28 Nov 2015 09:16:31 GMT gania [10882] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) fixed a bug in DivisionController, made action transitions smoother Sat, 28 Nov 2015 08:17:24 GMT gania [10881] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) finished fixing FlyingController: AI is flying as smooth as possible ... Fri, 27 Nov 2015 21:37:59 GMT gania [10880] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) cut smoothness, gained performance Fri, 27 Nov 2015 18:58:44 GMT gania [10879] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) finished copyOrientation function. Now ships move smoothly Fri, 27 Nov 2015 17:49:54 GMT fvultier [10878] * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.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/weaponSettingsFPS.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.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/weaponSettingsHXY.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/weaponSettingsImmTest.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/weaponSettingsTurret.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (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/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/controllers/HumanController.cc (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 (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (modified) Fri, 27 Nov 2015 15:42:14 GMT gania [10877] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/LeaderController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) CommonController now has static methods only. Replace with a namespace?