FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
528 Commits 10 Branches 87 Tags
Commit Graph

106 Commits

Author SHA1 Message Date
FlightControl
2b421fc1f1 Changes 2016-07-21 15:36:52 +02:00
FlightControl
2eeaf7b92d Added JTAC to DETECTION_DISPATCHER 
Added Process_JTAC to coordinate this activity during a CAS or BAI.
Removed TASK_CAS and TASK BAI into a generic TASK_A2G task.
 2016-07-21 15:28:53 +02:00
FlightControl
8e8fcef266 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
 2016-07-21 10:30:38 +02:00
FlightControl
ffe8ef06d0 Commit new test mission 2016-07-21 09:00:32 +02:00
FlightControl
0c9162aca0 Merge remote-tracking branch 'refs/remotes/origin/master' into Scheduler-bugfix-and-test-mission 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
 2016-07-21 08:58:13 +02:00
FlightControl
bee6e8d7c6 Fixed bug with GetPointVec2 function that was renamed ... 2016-07-21 08:53:56 +02:00
FlightControl
01d0cd71f1 Commit 2016-07-21 08:34:42 +02:00
FlightControl
38f18d7b28 commit 2016-07-20 18:25:50 +02:00
FlightControl
0a9eb84264 Updated presentation 2016-07-19 23:31:45 +02:00
FlightControl
5e77d30caa Fixed a bug in the event handler due to a stupid added trace. removed the trace. 2016-07-19 22:03:39 +02:00
FlightControl
9b15ec1988 Removed flushes 2016-07-19 18:18:49 +02:00
FlightControl
d5671a5f65 Working version of the DETECTION classes 2016-07-19 18:12:26 +02:00
FlightControl
86b283c7f0 SEAD working correctly + readjust test missions not to loose anything. 2016-07-13 09:08:08 +02:00
FlightControl
ce19e3bc03 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_SPAWN_Limit_Scheduled/MOOSE_Test_SPAWN_Limit_Scheduled.miz
 2016-07-13 06:14:36 +02:00
FlightControl
947474eab0 Fixed SPAWN bug, where more units were spawned beyond the Limit() parameters. 2016-07-12 08:57:42 +02:00
FlightControl
153ff7bd58 Inform state changes 2016-07-10 14:44:55 +02:00
FlightControl
17abcb7b7f Updated detection algorithm 
Now the detected sets are kept consistent to previous sets. New
algorithm developed. This is important to keep assigned tasks consistent
with the detected sets.
 2016-07-10 09:11:05 +02:00
FlightControl
40a9c1f7d1 Improved it 2016-07-08 18:02:22 +02:00
FlightControl
e8a7200de7 Added velocity fix for AIBalancer 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
 2016-07-08 17:22:22 +02:00
FlightControl
6a82b223f6 Fixed velocity. had wrong formula but is now corrected. 2016-07-08 17:20:24 +02:00
FlightControl
0c13744309 First prototype of task dispatching with menu 2016-07-08 16:16:48 +02:00
FlightControl
6ba6390b5d 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_AIRBASEPOLICE/Moose_Test_AIRBASEPOLICE.miz
#	Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz
#	Moose Test
Missions/Moose_Test_GROUP_SwitchWayPoint/MOOSE_Test_GROUP_SwitchWayPoint.miz
 2016-07-08 06:24:34 +02:00
FlightControl
6f26394bcf Fixed speed, and # of warnings 2016-07-08 05:46:47 +02:00
HellRayzr
2faef0e85b Added ANAPA and 2nd runway at TBLISI-LOCHINI 2016-07-08 01:08:02 +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
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
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
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
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
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
fefe5382af Removed completely routines.scheduleFunction 2016-06-26 07:41:01 +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
FlightControl
c3da8ac008 Done fixed for SLMOD. Need to retest. 2016-06-25 13:29:58 +02:00
FlightControl
c581fe1551 Implemented DETECTION and FAC first classes 2016-06-25 08:53:19 +02:00
FlightControl
a34c04e0f2 Updates in test 2016-06-24 21:22:18 +02:00
FlightControl
5e6043aeb3 Progress reworking object model. 2016-06-24 12:52:52 +02:00