weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-12 04:31:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,632 Commits 17 Branches 93 Tags
2fdbdb40581b69f90afef0a7cc44292a70b0d708
Commit Graph

2730 Commits

Author SHA1 Message Date
Applevangelist 5b8f840d6e Merge remote-tracking branch 'origin/master' into develop 2023-01-29 18:37:19 +01:00
Applevangelist 2f4f98cfe0 #CTLD - nobuildmenu option 2023-01-29 18:36:44 +01:00
Applevangelist ab4bf1f0a8 Merge remote-tracking branch 'origin/develop' into develop 2023-01-29 17:21:30 +01:00
Applevangelist 332dcf9fe5 Merge remote-tracking branch 'origin/master' into develop 2023-01-29 17:21:16 +01:00
Frank 694ad5d33d Merge branch 'develop' into FF/Ops 2023-01-29 12:57:09 +01:00
Frank 383ee00e71 Merge branch 'master' into develop 2023-01-29 12:54:13 +01:00
Frank ac1f202c19 Update Airboss.lua 
- Added CJS Superhornet Mod
 2023-01-29 12:53:50 +01:00
Frank c279ab6311 Update Auftrag.lua 2023-01-29 12:19:04 +01:00
Frank 4cc1db1365 Update Auftrag.lua 
- condition success and failure evaluation
 2023-01-28 22:31:53 +01:00
Frank 50ee1ae922 Merge branch 'master' into FF/MasterDevel 2023-01-28 11:09:08 +01:00
Frank cfb3004142 Merge pull request #1893 from FlightControl-Master/FF/Ops 
OPS
 2023-01-28 10:47:49 +01:00
Thomas 5ec18d45a2 Merge (#1890) 
* #CSAR - Add Persistence (#1889)

* Adds a modified version of ops.CTLD's Persistence to ops.CSAR

* Update Marker.lua

---------

Co-authored-by: Jason du Plessis <33880363+TheChosenOn3@users.noreply.github.com>
 2023-01-27 18:36:38 +01:00
Jason du Plessis 0d5b6d4c3e #CSAR - Add Persistence (#1889) 
* Adds a modified version of ops.CTLD's Persistence to ops.CSAR
 2023-01-26 21:11:15 +01:00
Applevangelist cd8845299f #CTLD added documentation 2023-01-24 15:27:50 +01:00
Applevangelist 1099e8e876 #CTLD added documentation 2023-01-24 15:27:09 +01:00
Applevangelist 57a30621e1 #CTLD added documentation 2023-01-24 15:26:32 +01:00
Applevangelist 24d47ef353 Merge remote-tracking branch 'origin/master' into develop 2023-01-22 13:11:13 +01:00
Applevangelist b62058b36a changes 2023-01-22 13:10:45 +01:00
Applevangelist 53cff8229b #CTLD 
* Added option movecratesbeforebuild
* Added option surfacetypes for build-in reloads
* Inject function can optionally take surfacetypes
* Inject function can use the center of the zone instead of a random position

#EVENT
* Handle landing event if the place is a SCENERY object (helopad on a map, but not an airbase)

#ZONE
* docu corrections
 2023-01-22 13:10:27 +01:00
Frank 76ebf8df07 Merge branch 'develop' into FF/Ops 2023-01-21 22:43:11 +01:00
Frank a4e52c6c3c Legion 
- Added enroute task SEAD to escort
 2023-01-21 22:42:57 +01:00
Applevangelist 23553f0f4c #AUFTRAG 
* Added checking of bespoke conditions within the status call of AUFTRAG and not only when AUFTRAG is done already
 2023-01-21 15:40:18 +01:00
Applevangelist 285f8d102b #AUFTRAG 
* Added checking of bespoke conditions within the status call of AUFTRAG and not only when AUFTRAG is done already
 2023-01-21 15:39:44 +01:00
Applevangelist dcacba6803 F 2023-01-19 17:03:07 +01:00
Applevangelist ff58a47244 #FG - added nil check on GetClosestAirbase() 2023-01-19 17:01:59 +01:00
Applevangelist df9a572656 #FG - nil check on GetClosestAirbase() 2023-01-19 16:58:31 +01:00
Applevangelist 9a8727f499 Merge remote-tracking branch 'origin/develop' into develop 2023-01-19 10:34:17 +01:00
Applevangelist 0d0292385f #OPSGROUP - added docu 2023-01-19 10:33:26 +01:00
Applevangelist 5943ae0a46 #ATIS docu fix 2023-01-17 09:25:58 +01:00
Applevangelist b04624bd60 #ATIS docu fix 2023-01-17 09:25:24 +01:00
Applevangelist fabab9bfbb #ATIS docu fix 2023-01-17 09:25:01 +01:00
Applevangelist 26d675dc26 Merge remote-tracking branch 'origin/master' into develop 2023-01-15 17:40:24 +01:00
Applevangelist 56c4a11626 #CSAR 
* Docu corrections
 2023-01-15 17:39:28 +01:00
Applevangelist d82bce79c9 #CSAR 
* Docu corrections
 2023-01-15 17:38:54 +01:00
Applevangelist 28df12c1a9 Merge remote-tracking branch 'origin/master' into develop 2023-01-12 13:21:23 +01:00
Applevangelist f0f42df374 #CTLD - Adde Shark III typename 2023-01-12 13:20:44 +01:00
Applevangelist 55fcaf1c05 #CTLD - Adde Shark III typename 2023-01-12 13:20:12 +01:00
Applevangelist 5898bc7f07 #PLAYERTASK 
* Even nicer MGRS readouts
 2023-01-10 17:09:17 +01:00
Applevangelist 44f6f0fd40 #PLAYERTASK 
* Even nicer MGRS readouts
 2023-01-10 17:08:08 +01:00
Applevangelist 43123ec93e #AWACS 
* Fixed initial screen text on bogey dope just being x group(s)
#PLAYERTASK
* Improved logic to declare task succes even if not player is assigned
 2023-01-10 12:45:34 +01:00
Applevangelist 0fa4be7c4a #AWACS 
* Fixed initial screen text on bogey dope just being x group(s)
#PLAYERTASK
* Improved logic to declare task succes even if not player is assigned
 2023-01-10 12:45:17 +01:00
Applevangelist 5dd48cbd23 Merge remote-tracking branch 'origin/develop' into develop 2023-01-10 07:32:02 +01:00
Frank 4e68e33ec7 Update OpsZone.lua 
- Remove marker
 2023-01-09 23:03:01 +01:00
Applevangelist cf4d6f46b5 Merge remote-tracking branch 'origin/develop' into develop 2023-01-08 18:38:56 +01:00
Applevangelist a7c8954740 Docu typo 2023-01-08 18:38:12 +01:00
Applevangelist ef0b76a632 #PLAYERTASK 
* Added FSM events PlayerJoinedTask and PlayerAbortedTask
 2023-01-08 18:09:22 +01:00
Applevangelist 4b19cbcf67 #PLAYERTASK 
* Added FSM events PlayerJoinedTask and PlayerAbortedTask
 2023-01-08 18:08:53 +01:00
Applevangelist 85aa46ad2b Merge remote-tracking branch 'origin/develop' into develop 2023-01-08 14:50:11 +01:00
Frank ca11e724ab Merge branch 'develop' into FF/Ops 2023-01-07 17:12:04 +01:00
Frank ab272da46e FLIGHTGROUP 
- Increased dealy before Route to base to 1.0 sec. Previous delay of 0.1 sec was apparently too short for the stop flag to take effect and the task was not called done. Hence the mission was also not done.
 2023-01-07 17:04:34 +01:00