# # ChangeLog for code/branches/campaignHS15 # # Generated by Trac 1.0.9 # Dec 1, 2024, 1:38:59 PM 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: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 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 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: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 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: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 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 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 15:06:00 GMT paulsc [10921] * code/branches/campaignHS15/data/levels/expeditionSector.oxw (modified) Finished (events in) expedition level. 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 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: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 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 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: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 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 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 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 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? Fri, 27 Nov 2015 12:41:26 GMT gania [10875] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (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/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) fixed library dependencies Fri, 27 Nov 2015 08:51:59 GMT gania [10874] * code/branches/campaignHS15/DivisionBrit.png (deleted) * code/branches/campaignHS15/Four_Finger_Squadron.PNG (deleted) deleted pictures that I don't need anymore Fri, 27 Nov 2015 08:49:16 GMT gania [10873] * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) introduced spread Fri, 27 Nov 2015 08:45:24 GMT gania [10872] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) fixed a bug when loop wouldn't transfer to a slave when master died, ... Fri, 27 Nov 2015 08:25:52 GMT gania [10871] * 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/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/FightingController.cc (added) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (added) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (added) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (added) Split up CommonController, so it is easier to debug Fri, 27 Nov 2015 08:00:14 GMT gania [10870] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) Fri, 27 Nov 2015 07:39:46 GMT gania [10869] * 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/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) fixed a bug and got rid of unnecessary Rank enumeration, used ... Thu, 26 Nov 2015 21:40:59 GMT gania [10868] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.cc (modified) * code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.h (modified) first stable version Thu, 26 Nov 2015 13:39:07 GMT bhatiab [10867] * code/branches/campaignHS15/data/levels/expeditionSector.oxw (modified) Worked on expeditionSector.oxw, added EnemyBase and Enemies, they ... Thu, 26 Nov 2015 12:10:26 GMT gania [10866] * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) just some todo comments Thu, 26 Nov 2015 08:08:11 GMT gania [10864] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (added) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (added) * 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/DivisionController.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) split up some code Wed, 25 Nov 2015 21:07:48 GMT gania [10863] * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.cc (deleted) * code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.h (deleted) * code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.cc (added) * code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.h (added) Wed, 25 Nov 2015 19:46:09 GMT gania [10861] * code/branches/campaignHS15/data/levels/AITest.oxw (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/SectionController.cc (modified) finished everything, demos are commented out in AITest.oxw Wed, 25 Nov 2015 17:46:20 GMT gania [10859] * code/branches/campaignHS15/data/levels/AITest.oxw (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/LeaderController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) almost all works now, check AITest.oxw Wed, 25 Nov 2015 13:53:58 GMT gania [10858] * 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) should work, didn't compile Wed, 25 Nov 2015 13:05:43 GMT gania [10856] * 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/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) fixed loops Wed, 25 Nov 2015 12:51:10 GMT gania [10855] * code/branches/campaignHS15/data/levels/AITest.oxw (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/worldentities/ActionPoint.cc (modified) * code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.h (modified) introduced loops Wed, 25 Nov 2015 11:07:22 GMT gania [10854] * code/branches/campaignHS15/data/levels/AITest.oxw (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/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) Fixed some bugs, only DivisionController works for now Tue, 24 Nov 2015 21:37:28 GMT gania [10851] * code/branches/campaignHS15/data/levels/AITest.oxw (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/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) works for the most part, still need to fix Section and Wingman Tue, 24 Nov 2015 16:52:43 GMT gania [10850] * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) ok, now you can use attack and protect just like in my level, but I ... Tue, 24 Nov 2015 16:21:03 GMT gania [10849] * code/branches/campaignHS15/data/levels/AITest.oxw (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) major change: introduced Actionpoints, look AITest.oxw. Only FLY ... Tue, 24 Nov 2015 12:47:43 GMT gania [10848] * 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/worldentities/ActionPoint.h (modified) still not compilable Tue, 24 Nov 2015 10:54:47 GMT gania [10847] * code/branches/campaignHS15/data/levels/AITest.oxw (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/worldentities/ActionPoint.cc (modified) * code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.h (modified) * code/branches/campaignHS15/src/orxonox/worldentities/CMakeLists.txt (modified) I hope that you don't code today, that version is not compilable just yet Mon, 23 Nov 2015 20:12:23 GMT gania [10844] * code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.cc (added) * code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.h (added) same as above Mon, 23 Nov 2015 20:08:28 GMT gania [10843] * code/branches/campaignHS15/data/levels/AITest.oxw (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/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/CMakeLists.txt (modified) gani check in before a major change Mon, 23 Nov 2015 16:01:15 GMT paulsc [10841] * code/branches/campaignHS15/data/levels/shuttleAttack.oxw (modified) * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (modified) Worked on retaliation level. Mon, 23 Nov 2015 15:56:50 GMT gania [10840] * code/branches/campaignHS15/data/levels/AITest.oxw (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/SectionController.cc (modified) action PROTECT works. Look FUCK Mon, 23 Nov 2015 14:58:23 GMT bhatiab [10839] * code/branches/campaignHS15/data/levels/expeditionSector.oxw (modified) Worked on the Prologue Mon, 23 Nov 2015 14:50:59 GMT gania [10838] * code/branches/campaignHS15/data/levels/AITest.oxw (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/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/worldentities/SpawnPoint.h (modified) * code/branches/campaignHS15/src/orxonox/worldentities/TeamSpawnPoint.cc (modified) * code/branches/campaignHS15/src/orxonox/worldentities/TeamSpawnPoint.h (modified) Gani changed something Mon, 23 Nov 2015 12:24:51 GMT maxima [10834] * code/branches/campaignHS15 (modified) * code/branches/campaignHS15/DivisionBrit.png (copied) * code/branches/campaignHS15/Four_Finger_Squadron.PNG (copied) * code/branches/campaignHS15/data/levels/AITest.oxw (copied) * code/branches/campaignHS15/src/libraries/util/Math.cc (modified) * code/branches/campaignHS15/src/libraries/util/Math.h (modified) * code/branches/campaignHS15/src/modules/docking/DockingController.cc (modified) * code/branches/campaignHS15/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (copied) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (copied) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (copied) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h (copied) * code/branches/campaignHS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/LeaderController.cc (copied) * code/branches/campaignHS15/src/orxonox/controllers/LeaderController.h (copied) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (copied) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (copied) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (copied) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (copied) * code/branches/campaignHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/campaignHS15/test/util/MathTest.cc (modified) AI_HS15 merged into campaignHS15 Sun, 22 Nov 2015 14:09:51 GMT paulsc [10824] * code/branches/campaignHS15/data/levels/shuttleAttack.oxw (moved) Renamed shuttle level to shuttleAttack.oxw Sun, 22 Nov 2015 14:07:53 GMT paulsc [10823] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) * code/branches/campaignHS15/data/levels/expeditionSector.oxw (added) * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (added) Completed shuttle level (also added station names and such), added ... Mon, 16 Nov 2015 15:30:49 GMT paulsc [10812] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Tried new tactic with mission failing, but still does not work... Mon, 16 Nov 2015 14:36:39 GMT bhatiab [10809] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Changed lookat var for Defender Mon, 16 Nov 2015 14:31:43 GMT paulsc [10808] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) ended quests, added mission accomplishment Sat, 14 Nov 2015 23:05:48 GMT paulsc [10804] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) * code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt (added) Started work on spaceshipShuttle.oxt, furthered quests. Sat, 14 Nov 2015 15:31:10 GMT paulsc [10802] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Furthered quests, started work on pickups for quest 6. Mon, 09 Nov 2015 16:56:56 GMT paulsc [10792] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Made number of enemies increase over time, added fps undock, advanced ... Mon, 09 Nov 2015 12:57:59 GMT bhatiab [10783] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Finished descriptions for the quests Sun, 08 Nov 2015 16:21:46 GMT bhatiab [10779] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Added a few Descriptions Thu, 05 Nov 2015 20:48:41 GMT paulsc [10767] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Changed coordinates to (y,z,x) and implemented FPSPlayer. Undocking ... Wed, 04 Nov 2015 21:55:50 GMT paulsc [10766] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Corrected formatting, improved allies, introduced lua coordinates and ... Mon, 02 Nov 2015 15:33:32 GMT paulsc [10758] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Corrected ally behavoiur. Friendly fire needs fixing though Mon, 02 Nov 2015 14:29:36 GMT bhatiab [10754] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Changed the number of enemies per waves, need to test it, if it works ... Mon, 02 Nov 2015 13:56:51 GMT bhatiab [10750] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Changed the mass for the stations Mon, 02 Nov 2015 13:25:06 GMT bhatiab [10749] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Added planets, changed skybox, fixed asteroids, changed starting ... Mon, 02 Nov 2015 13:10:11 GMT paulsc [10748] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Added Allies. Sun, 01 Nov 2015 14:52:16 GMT paulsc [10743] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Did some more work in quests. Sun, 01 Nov 2015 13:26:37 GMT bhatiab [10741] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Added a planet with a ring Sun, 01 Nov 2015 13:04:55 GMT paulsc [10740] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Did some work on narrative and events, labelled TODO and FIXME, ... Sat, 31 Oct 2015 18:15:11 GMT paulsc [10735] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Implemented EffectBeacon for quest 2.1 and added platform for ... Sat, 31 Oct 2015 12:51:45 GMT bhatiab [10730] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Worked on lua.fog, fogFields is working now, but I'm having problemes ... Mon, 26 Oct 2015 19:30:26 GMT paulsc [10711] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) * code/branches/campaignHS15/data/levels/missionOne.oxw (modified) Fixed some errors, fixed teams. @bhatiab: Commenting out lua tags in ... Mon, 26 Oct 2015 16:49:01 GMT paulsc [10710] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Started work on docking. Needs work tho. Mon, 26 Oct 2015 14:49:14 GMT bhatiab [10705] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Started Work on includes/fog.lua Mon, 26 Oct 2015 14:41:25 GMT bhatiab [10703] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) added asteroids