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
2,846 Commits 10 Branches 87 Tags
Commit Graph

1550 Commits

Author SHA1 Message Date
Jonathan Toppins
c952f134d8 a2a-dispatcher: remove fuel check in OnEventLand() handler 
This effectivally reverts the change made in commit
ea96a5e0a38b ("Planes remaining at airfield fixed") to declutter
airbases of aircraft which land at incorrect bases.

The problem with the logic is an RTB command will not be issued until
the fuel threshold is reached. Therefore the check will always be true
resulting the the unit always being deleted.

Bug: 875
Signed-off-by: Jonathan Toppins <jtoppins@users.sourceforge.net>
 2018-06-28 00:38:08 -04:00
Van De Velde
3ed9555705 Revert "Merge pull request #929 from Lugghawk/918_Fix_FindByName_Error_Flag" 
This reverts commit d6cdc098ceedcdb7df4b925e7bf2ae17643f1b29, reversing
changes made to 6b04237a3fc8186be6322f713cf84e085a4001b6.
 2018-06-24 20:47:41 +02:00
Sven Van de Velde
17e9538740
Merge pull request #927 from jtoppins/code-cleanup 
cleanup: remove unreferenced variables
 2018-06-24 09:20:19 +02:00
Sven Van de Velde
d6cdc098ce
Merge pull request #929 from Lugghawk/918_Fix_FindByName_Error_Flag 
Error flag fixed.
 2018-06-24 09:11:50 +02:00
FlightControl-User
6b04237a3f Fixed Offset issue. 2018-06-24 08:49:36 +02:00
Van De Velde
07aff74126 Merge branch 'develop' of https://github.com/FlightControl-Master/MOOSE into develop 2018-06-22 05:59:45 +02:00
Van De Velde
ea89c6255b Documentation improvements 2018-06-22 05:59:28 +02:00
funkyfranky
7d90a94927 ARTY 
Updated docs.
Added SetSpeed() function.
 2018-06-19 23:10:08 +02:00
funkyfranky
82d40759b5 Get Fuel Min 
AI_A2A_Dispatcher
Changed tac display from ave fuel to min fuel
 2018-06-18 23:55:31 +02:00
funkyfranky
19197bf234 Min Fuel Fixes 
AI_A2A and AI_Patrol:
Changed average fuel for controllable to new min fuel function. Hopefully provides better RTB behavior.

CONTROLLABLE:
Added GetFuelMin and GetFuelAve functions to ensure polymorphic behavior.

UNIT:
Added GetFuelMin and GetFuelAve functions for completeness and potential polymorphism.
 2018-06-18 23:13:21 +02:00
Jonathan Toppins
64c4d57a7b cleanup: remove unreferenced variables 
PatrolManageFuel seems to have been forgotten after a code refactor
in commit ce0be4dcf75d ("Fixing TASK_DISPATCHER and optimizing reports")

$ git rev-parse --show-toplevel
projects/moose
$ pwd
projects/moose
$ git grep "PatrolManageFuel"
Moose Development/Moose/AI/AI_A2A.lua:  self.PatrolManageFuel = true
Moose Development/Moose/AI/AI_Patrol.lua:  self.PatrolManageFuel = true

Signed-off-by: Jonathan Toppins <jtoppins@users.sourceforge.net>
 2018-06-18 16:05:35 -04:00
Frank
99963c28e9
Merge pull request #923 from ezietsman/feature/zone-unit-offsets 
Feature/zone unit offsets
 2018-06-18 19:58:41 +02:00
Jonathan Toppins
20c1f6bab4 GROUP: provide a new GetFuelMin() method 
Taking the average fuel available across an entire flight is not really
realistic and does not present an accurate representation of if a group
needs to be sent to refuel or rtb.

An example, a flight of 2 planes; plane 1 has 45% and plane 2 has 25%
(45 + 25)/2 = 35, and 25% is the RTB threshold, plane 2 needs to go home
now. However with the current averaging function plane 2 will have as
little as 15% fuel (assume equal consumption) before the flight
gets ordered home.

Signed-off-by: Jonathan Toppins <jtoppins@users.sourceforge.net>
 2018-06-18 12:52:42 -04:00
Dave Lugg
6bdf0122e4 Error flag fixed. 2018-06-18 12:48:27 -04:00
FlightControl_Master
16b279c5db Documentation first version 2018-06-17 07:38:02 +02:00
funkyfranky
8c76314884 Merge branch 'develop' into FF/Develop 2018-06-16 19:03:58 +02:00
funkyfranky
79d8113df3 ARTY v1.0.4 
Minor adjustments.
Fixed bug that coordinates from mark points are always at an altitude of 5 meters.
 2018-06-16 19:03:44 +02:00
Ewald Zietsman
601c00e637
Merge branch 'develop' into feature/zone-unit-offsets 2018-06-16 15:39:14 +02:00
Ewald Zietsman
58e5ffa283 Changed offsets argument to use a table for clarity. 2018-06-16 15:33:59 +02:00
Ewald Zietsman
ec0b32321a Added Rho/Theta offset handling to ZoneUnit 2018-06-15 19:58:26 +02:00
funkyfranky
ca2eec8878 ARTY v1.0.3 
Fixed bug in illu and smoke shell impementation.
 2018-06-15 00:07:35 +02:00
funkyfranky
851c55e985 ARTY v1.0.3 buggy 
something wrong with nuke, illu smoke
 2018-06-13 23:00:05 +02:00
funkyfranky
6c9c4432cc ARTY v1.0.3 
Added "set" mark commands for rearming place and rearming group.
 2018-06-13 00:12:26 +02:00
Frank
5c7312cd41
Merge pull request #914 from alexproust/patch-1 
Update Routines.lua
 2018-06-12 23:15:46 +02:00
funkyfranky
89e67ba54d ARTY v1.0.2 
Changed behavior that if no arty group is addressed explicitly, nothing is happening. Before all groups were addressed.
 2018-06-12 19:50:21 +02:00
funkyfranky
3fee4a87da ARTY v1.0.1 
Added cluster and alias assignment via marks.
 2018-06-11 20:29:58 +02:00
funkyfranky
d5d2de7577 Controllable alarm state 
ships don't have option to change alarm state to other than green
 2018-06-10 23:41:07 +02:00
funkyfranky
8241f9de60 Merge branch 'develop' into FF/Develop 2018-06-10 23:36:20 +02:00
funkyfranky
ba2d359af2 ARTY 1.0.0 
- Added pseudo functions for FMS states.
- Fixed a few bugs.
 2018-06-10 23:35:22 +02:00
gunterlund
5ebf0b8d6c Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2018-06-10 07:13:46 -07:00
Ewald Zietsman
804b8a800e Added basic offset support to ZoneUnit 2018-06-10 01:46:22 +02:00
funkyfranky
e8ff153427 ARTY v0.9.96 
Improved marker logic.
 2018-06-10 00:05:55 +02:00
funkyfranky
403f22bd2b ARTY v0.9.95 
Reworked rearming behavior for selected weapons.
Many other improvements.
 2018-06-09 18:33:20 +02:00
funkyfranky
c6fc571c95 ARTY 
adjusted docu
some improvemens
 2018-06-08 00:00:41 +02:00
alexproust
8b3d7ebf04
Update Routines.lua 
Correction MessageToBlue function
 2018-06-07 12:57:10 +02:00
funkyfranky
38a03f4cbc ARTY v0.9.94 
Bug fixes and improvements.
 2018-06-06 22:57:04 +02:00
funkyfranky
a2790f500c ARTY v0.9.93 
added new mark parameters
LLDMS coordinate assignment
 2018-06-06 00:51:59 +02:00
funkyfranky
927ae59f75 Merge branch 'develop' into FF/Develop 2018-06-05 00:29:06 +02:00
funkyfranky
8b667071b7 ARTY v0.9.92 
- adjusted DB
- other minor fixes and improvements
 2018-06-05 00:28:52 +02:00
funkyfranky
0a34cfdafa ARTY v0.9.91 
- Added automatic relocation if not in firing range.
- Added first version of ARTY DB with artillery unit parameters min/max firing range.
 2018-06-03 23:38:15 +02:00
FlightControl_Master
2d43af7c0d docu 2018-06-03 22:02:26 +02:00
FlightControl_Master
83fab80d88 Updated documentation. 2018-06-03 21:50:07 +02:00
FlightControl_Master
6a71921270 Documentation AI 2018-06-03 18:07:00 +02:00
funkyfranky
8ff3530916 Merge branch 'develop' into FF/Develop 2018-06-03 09:40:46 +02:00
FlightControl_Master
bd7c822def Documentation 2018-06-03 09:14:27 +02:00
FlightControl_Master
7b3f84f468 orbit with speed 2018-06-03 08:05:42 +02:00
funkyfranky
bf7523fa85 messages clearsceen 2018-06-03 01:00:16 +02:00
funkyfranky
0d246d3f49 ARTY v0.9.9 
ARTY:
Fixed CTD bug. Caused by group:ClearTasks() when no task is assigned (group arrived).
Many other improvements
Cleared up function location.
MESSAGES:
Added optional clear screen parameter.
 2018-06-03 00:58:24 +02:00
funkyfranky
e9a055219e ARTY v0.9.8-buggy 
Improved marker assignments.
There is a bug that makes DCS crash when a group is ordered to move and reaches its destination, i.e. arrives.
 2018-06-02 19:13:26 +02:00
FlightControl_Master
d9d53db53f Documentation improvements. 2018-06-02 18:23:06 +02:00