8149 Commits

Author SHA1 Message Date
Applevangelist
14a851d582 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 17:56:34 +01:00
Applevangelist
58032b0075 * AIRBASE.SouthAtlantic.Rio_Turbio 2023-01-25 17:56:03 +01:00
Applevangelist
e106ca3da5 * AIRBASE added airfields Falklands
* RANGE  added google key usage
2023-01-25 17:55:34 +01:00
Applevangelist
bdc08a530d #AB 2023-01-25 17:54:13 +01:00
Applevangelist
6ab1632b4b #RANGE
* Set Google Key if given

#AIRBASE
* Added 3 Falklands AB to the enumerator
2023-01-25 17:53:29 +01:00
Applevangelist
262c8ffc59 Merge remote-tracking branch 'origin/develop' into develop 2023-01-25 17:19:03 +01:00
Applevangelist
affde2f030 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 17:18:59 +01:00
Applevangelist
3055793cff Merge remote-tracking branch 'origin/develop' into develop 2023-01-25 17:18:22 +01:00
Applevangelist
1e749747b4 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 17:18:16 +01:00
Thomas
cec865b9fb
UTILS - exclude 243 MHz and 121.5 MHz 2023-01-25 13:37:56 +01:00
Thomas
a4982bd24e
Update Utils.lua (#1886) (#1887) 2023-01-24 20:58:24 +01:00
Thomas
d763e924a9
Update Utils.lua (#1886) 2023-01-24 20:16:46 +01:00
Applevangelist
3d86aee249 Merge remote-tracking branch 'origin/develop' into develop 2023-01-24 15:28:00 +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
6a4356fa94 #1885
#PSEUDOATC - Menu shows Waypoint name if it has been set
2023-01-24 10:06:40 +01:00
Applevangelist
f344084791 #1885
#PSEUDOATC - Menu shows Waypoint name if it has been set
2023-01-24 10:06:05 +01:00
Applevangelist
95d149274f #1885
#PSEUDOATC - Menu shows Waypoint name if it has been set
2023-01-24 10:05:39 +01:00
Applevangelist
3880c3deac Merge remote-tracking branch 'origin/develop' into develop 2023-01-23 17:13:59 +01:00
Applevangelist
8c68a6d9ce Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
2023-01-23 17:13:51 +01:00
Applevangelist
2ec8d94e38 #CONTROLLABLE
* Added CommandActivateACLS()
* Added CommandDeactivateACLS()
2023-01-23 17:12:01 +01:00
Applevangelist
be68314c3a #CONTROLLABLE
* Added CommandActivateACLS()
* Added CommandDeactivateACLS()
2023-01-23 17:11:18 +01:00
Applevangelist
67cad1963f #CONTROLLABLE
* Added CommandActivateACLS()
* Added CommandDeactivateACLS()
2023-01-23 17:10:52 +01:00
Thomas
cad8f8678e
Adding ACLS 2023-01-23 10:53:58 +01:00
Applevangelist
cb0de264e8 Merge remote-tracking branch 'origin/develop' into develop 2023-01-22 13:23:18 +01:00
Applevangelist
30654806e8 Merge remote-tracking branch 'origin/master' into develop 2023-01-22 13:23:11 +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
a6c194f5c4 Merge remote-tracking branch 'origin/develop' into develop 2023-01-21 15:40:47 +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
6b7fe137ca Merge remote-tracking branch 'origin/develop' into develop 2023-01-20 10:36:17 +01:00
Applevangelist
d12def4a97 Merge remote-tracking branch 'origin/master' into develop 2023-01-20 10:36:09 +01:00
Frank
d0d21a6b5d Merge branch 'master' into develop 2023-01-19 19:11:09 +01:00
Frank
1d52e27668 Update Controllable.lua
- Added enroute task SEAD
2023-01-19 19:10:56 +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
8648b0a24d Merge remote-tracking branch 'origin/develop' into develop 2023-01-19 15:01:45 +01:00
Applevangelist
511ca918f4 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 15:01:34 +01:00
Applevangelist
6e666b0ac8 #UTILS - make LoadSetOfGroups save(r) for groups spawned with SpawnScheduled 2023-01-19 15:00:49 +01:00
Applevangelist
a51176967c #UTILS - make LoadSetOfGroups save(r) for groups spawned with SpawnScheduled 2023-01-19 15:00:18 +01:00
Applevangelist
6ec867196c #UTILS - make LoadSetOfGroups save(r) for groups spawned with SpawnScheduled 2023-01-19 14:59:54 +01:00
Applevangelist
47684e8717 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 10:35:02 +01:00
Applevangelist
9a8727f499 Merge remote-tracking branch 'origin/develop' into develop 2023-01-19 10:34:17 +01:00
Applevangelist
03ea4ccd44 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 10:34:10 +01:00