weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-27 17:11:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,086 Commits 15 Branches 93 Tags
99a55a3c8a0fce6175ef67dbc3fd3c94de5c50c9
Commit Graph

8086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FlightControl e41d45e1eb Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
 2016-07-08 05:13:56 +02:00
FlightControl 348130c993 Commit 2016-07-08 05:11:30 +02:00
HellRayzr 2faef0e85b Added ANAPA and 2nd runway at TBLISI-LOCHINI 2016-07-08 01:08:02 +02:00
HellRayzr 85f07c0807 Merge pull request #105 from FlightControl-Master/AIRBASEPOLICE 
Airbasepolice
 2016-07-07 21:47:49 +02:00
HellRayzr 59446a012d Merge remote-tracking branch 'refs/remotes/origin/master' into AIRBASEPOLICE 2016-07-07 21:45:32 +02:00
HellRayzr ce553183c9 Static 2016-07-07 21:44:09 +02:00
Sven Van de Velde ab8c8dee4d Merge pull request #104 from FlightControl-Master/AIRBASEPOLICE 
Airbasepolice - Added the AIRBASEPOLICE_NEVADA class
 2016-07-07 21:43:20 +02:00
HellRayzr b1f7d02f25 Merge remote-tracking branch 'refs/remotes/origin/master' into AIRBASEPOLICE 2016-07-07 21:40:38 +02:00
HellRayzr 6a39f6f1e3 Added AirbasePolice for Nevada 2016-07-07 21:40:06 +02:00
FlightControl c5cc069e46 Progress, got now task acceptance working 2016-07-07 13:11:31 +02:00
FlightControl bba6aa8fb6 Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 
# Conflicts:
#	Moose Test
Missions/Moose_Test_DETECTION/Moose_Test_DETECTION_Laser.miz
 2016-07-06 22:26:23 +02:00
FlightControl c26f5e2dbc Deleted Moose_Test_DETECTION_Laser files 2016-07-06 15:39:07 +02:00
FlightControl e0314a4598 Updated test missions 2016-07-06 10:41:46 +02:00
FlightControl 6f14927544 Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
#	Moose Test Missions/Moose_Test_AIBALANCER/Moose_Test_AIBALANCER.miz
#	Moose Test
Missions/Moose_Test_AIRBASEPOLICE/Moose_Test_AIRBASEPOLICE.miz
#	Moose Test
Missions/Moose_Test_BASE/Moose_Test_AIRBLANCER_with_Moose.miz
#	Moose Test
Missions/Moose_Test_BASE/Moose_Test_AIRBLANCER_without_Moose.miz
#	Moose Test Missions/Moose_Test_BASE/Moose_Test_BASE.miz
#	Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz
#	Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz
#	Moose Test Missions/Moose_Test_DETECTION/Moose_Test_DETECTION.miz
#	Moose Test
Missions/Moose_Test_DETECTION/Moose_Test_DETECTION_Laser.miz
#	Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz
#	Moose Test Missions/Moose_Test_FAC/Moose_Test_FAC.miz
#	Moose Test
Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz
#	Moose Test Missions/Moose_Test_PATROLZONE/MOOSE_Test_PATROLZONE.miz
#	Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz
#	Moose Test Missions/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.miz
#	Moose Test Missions/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz
#	Moose Test Missions/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz
#	Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz
#	Moose Test
Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz
#	Moose Test
Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz
#	Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz
#	Moose Test Missions/Moose_Test_ZONE/Moose_Test_ZONE.miz
#	Moose Test
Missions/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz
#	Moose Test Missions/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz
#	Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz
 2016-07-06 08:31:28 +02:00
Sven Van de Velde b12372c758 Merge pull request #100 from FlightControl-Master/Bugfix 
Added 3 new test missions and updated and fixed some documentation issues.
 2016-07-06 08:18:55 +02:00
FlightControl 61d539b2d5 Regenerate Moose.lua 2016-07-06 08:18:18 +02:00
FlightControl 0938fc6d80 Added 3 new test missions and updated and fixed some documentation issues. 2016-07-06 08:17:36 +02:00
FlightControl fd548484c9 Merge remote-tracking branch 'refs/remotes/origin/master' into Bugfix 2016-07-06 06:20:10 +02:00
FlightControl 6acc1cfcb6 Updated MOOSE as static 2016-07-05 09:16:28 +02:00
Sven Van de Velde 5318597907 Merge pull request #99 from FlightControl-Master/Bugfix 
Added a couple of functions to allow Respawning of a group morre efficiently.
 2016-07-05 08:30:21 +02:00
FlightControl 49dd2b6f2a Added a couple of function to allow Respawning of GROUPS more efficiently. 2016-07-05 08:29:16 +02:00
FlightControl 50a770d755 Bugfixing 2016-07-05 06:25:36 +02:00
FlightControl d39f38b524 Merge remote-tracking branch 'refs/remotes/origin/master' into Bugfix 2016-07-05 06:25:19 +02:00
FlightControl 2218fdd0b2 Updates 2016-07-05 06:24:57 +02:00
FlightControl 06b2ba007e Updates 2016-07-05 06:24:35 +02:00
FlightControl 376b0d08a5 Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
#	Moose Test Missions/Moose_Test_AIBALANCER/Moose_Test_AIBALANCER.miz
#	Moose Test
Missions/Moose_Test_AIRBASEPOLICE/Moose_Test_AIRBASEPOLICE.miz
#	Moose Test
Missions/Moose_Test_BASE/Moose_Test_AIRBLANCER_with_Moose.miz
#	Moose Test
Missions/Moose_Test_BASE/Moose_Test_AIRBLANCER_without_Moose.miz
#	Moose Test Missions/Moose_Test_BASE/Moose_Test_BASE.miz
#	Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz
#	Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz
#	Moose Test Missions/Moose_Test_DETECTION/Moose_Test_DETECTION.miz
#	Moose Test
Missions/Moose_Test_DETECTION/Moose_Test_DETECTION_Laser.miz
#	Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz
#	Moose Test Missions/Moose_Test_FAC/Moose_Test_FAC.miz
#	Moose Test
Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz
#	Moose Test Missions/Moose_Test_PATROLZONE/MOOSE_Test_PATROLZONE.miz
#	Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz
#	Moose Test Missions/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.miz
#	Moose Test Missions/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz
#	Moose Test Missions/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz
#	Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz
#	Moose Test
Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz
#	Moose Test
Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz
#	Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz
#	Moose Test Missions/Moose_Test_ZONE/Moose_Test_ZONE.miz
#	Moose Test
Missions/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz
#	Moose Test Missions/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz
#	Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz
 2016-07-04 19:43:53 +02:00
FlightControl a9d54b7d02 Fixed bug with Restart Group after landing and engine shutdown... 
- Due to rename GetDCSGroup to GetDCSObject.
 2016-07-04 16:49:17 +02:00
FlightControl 093f12b57a Updated 2016-07-03 09:41:25 +02:00
FlightControl d91ba031aa OK, SEADING is now working completely 
with a target zone, and with routing and seading task active in
parallel.
 2016-07-03 09:31:02 +02:00
Sven Van de Velde eda2794373 Merge pull request #98 from FlightControl-Master/Bugfix 
Bugfix for ZONE_UNIT
 2016-07-03 07:55:17 +02:00
FlightControl 123dc13532 Fixed a bug in ZONE_UNIT 
GetRandomVec2() did not work for ZONE_UNIT
 2016-07-03 07:54:37 +02:00
FlightControl 23ea389b8f Progress on Route 2016-07-03 07:49:26 +02:00
FlightControl 4ac962a87a OK. got workiing prototype now, works! 2016-07-02 09:26:00 +02:00
FlightControl ae1aeac6ce DONE! Prototype of hierarchical state machine is works!!! 2016-07-02 09:06:29 +02:00
FlightControl d668b0a0f7 Progress hierarchical state machine 
- sub fsm call is working
- return from fsm to parent fsm is in progress
 2016-07-02 08:17:33 +02:00
FlightControl 7b66589cca Got a first test mission working 2016-07-01 09:16:16 +02:00
FlightControl 6b942590bd Cleaned 2016-07-01 06:15:43 +02:00
FlightControl 65391223d5 SEAD task is working! 2016-07-01 06:13:26 +02:00
FlightControl e2250dc92f Statemachine 2016-06-30 10:52:37 +02:00
FlightControl 7ab52025fd Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 2016-06-28 12:35:41 +02:00
FlightControl 626b95fb46 Merge remote-tracking branch 'refs/remotes/origin/master' into Bugfix 2016-06-28 12:17:27 +02:00
Sven Van de Velde eb863416ee Merge pull request #96 from FlightControl-Master/Bugfix 
Fixed GetID bug
- Due to rework, the function GetID got "lost". Added it back.
- Also fixed the OBJECT class now owning the GetID() method.
- Derived methods IDENTIFIABLE and POSITIONABLE fixed.
- Fixed AIRBASE class
 2016-06-28 12:02:13 +02:00
FlightControl 27bb51e69c Fixed GetID bug detected in missiletrainer class. 
- Was part of a larger issue related to the class hierarchy between
Object -> Identifiable -> Positionable ...
- Also fixed AIRBASE class fitting now the class hierarchy.
 2016-06-28 11:59:30 +02:00
FlightControl dc644df47e Merge remote-tracking branch 'refs/remotes/origin/master' into Bugfix 2016-06-28 11:19:11 +02:00
FlightControl 3a01fb76bf progress 2016-06-28 11:19:01 +02:00
FlightControl 4056e5d66d Merge remote-tracking branch 'refs/remotes/origin/master' into Detection 2016-06-26 07:45:34 +02:00
Sven Van de Velde 1187e46e89 Merge pull request #95 from FlightControl-Master/Remove-routines.scheduleFunction 
Removed completely routines.scheduleFunction
 2016-06-26 07:41:37 +02:00
FlightControl fefe5382af Removed completely routines.scheduleFunction 2016-06-26 07:41:01 +02:00
Sven Van de Velde e842c7a042 Merge pull request #94 from FlightControl-Master/Bugfix-Polygon-zone-test 
Fixed the raycasting of ZONE_POLYGON_BASE
 2016-06-26 07:22:25 +02:00
FlightControl 9d7f196075 Fixed the raycasting of ZONE_POLYGON_BASE 
- The raycasting was wrong when the vertices of the polygon were not
closed.
Now after this fix, the raycasting of the polygon is correctly
performed. The begin and end vertices of the polygon don't need to be
closed anymore within the mission editor. Check the test mission
Moose_Test_ZONE_POLYGON.miz
 2016-06-26 07:21:56 +02:00