Commit Graph

  • 8a89ed5857 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-14 19:16:00 +02:00
  • 87b866eca1 xx Applevangelist 2024-07-14 19:15:33 +02:00
  • b5d1cee96b #documentation Applevangelist 2024-07-14 19:15:19 +02:00
  • 6557a6cf0b Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-14 18:49:23 +02:00
  • 0128381f4f Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-14 18:49:17 +02:00
  • 4511a68a2b Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-14 18:48:44 +02:00
  • 9ecaca365f xx Applevangelist 2024-07-14 18:48:23 +02:00
  • e6aa341863 Dynamic Slots - fixes for #GROUP, #UNIT, #CSAR and #CTLD Applevangelist 2024-07-14 18:48:07 +02:00
  • 504e56e827 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-14 17:49:53 +02:00
  • 3595afe0cc #DATABASE- stage 1 fix for dynamic client slots Applevangelist 2024-07-14 17:49:25 +02:00
  • cfc0cc66b2 xxx Applevangelist 2024-07-14 17:48:48 +02:00
  • 2442adfd2f Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-13 15:22:18 +02:00
  • a833703731 xx Applevangelist 2024-07-13 15:21:51 +02:00
  • 0b21cb687e Various fixes Applevangelist 2024-07-13 15:21:35 +02:00
  • af85745433 CONTROLLABLE:TaskLandAtVec2( Vec2, Duration , CombatLanding, DirectionAfterLand) Applevangelist 2024-07-12 19:33:35 +02:00
  • ef58cae59f Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 19:33:17 +02:00
  • 8a21fe80de #CONTROLLABLE - Added combat and direction options in CONTROLLABLE:TaskLandAtVec2( Vec2, Duration , CombatLanding, DirectionAfterLand) Applevangelist 2024-07-12 19:32:55 +02:00
  • 86fc8db9e6 #AUFTRAG LANDATCOORDINATE - added combat land options Applevangelist 2024-07-12 19:32:24 +02:00
  • 7bc7fee6d7 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-12 13:38:35 +02:00
  • 46c5b50077 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 13:38:30 +02:00
  • 5c54f47527 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 13:37:46 +02:00
  • 51eb3a2e82 #AIRBASE - corrections for South Atlantic/Falklands Applevangelist 2024-07-12 13:37:04 +02:00
  • d9aad161b0 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-12 13:31:21 +02:00
  • fea2098c40 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 13:31:17 +02:00
  • 03f8b1e301 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 13:30:51 +02:00
  • ec8bfb32b4 events Applevangelist 2024-07-12 13:30:29 +02:00
  • d298ed2a83 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-12 12:20:53 +02:00
  • 515ac2c060 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 12:20:50 +02:00
  • 6a31e47705 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 12:20:16 +02:00
  • e6dda35f3d Typos Applevangelist 2024-07-12 12:19:58 +02:00
  • 70e4454fa9 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-12 11:46:38 +02:00
  • 82b4f4ee58 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 11:46:35 +02:00
  • 925233709b xx Applevangelist 2024-07-12 11:46:12 +02:00
  • 0af15699f3 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 11:45:53 +02:00
  • 9d2896d088 EVENTS - additional events from last release Applevangelist 2024-07-12 11:44:24 +02:00
  • 5b596516fe Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 11:37:27 +02:00
  • 036cc9d211 #Afghanistan additions Applevangelist 2024-07-12 11:36:43 +02:00
  • df6c97bec8 #EASYGCICAP - avoid launching intercepts if airwing conquered by other coalition Applevangelist 2024-07-12 09:36:29 +02:00
  • c7e73f3b1a #EASYGCICAP - fix launching interceptors from conquered, wrong coalition wings Applevangelist 2024-07-12 08:38:42 +02:00
  • ccc7b431dc Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-12 08:10:24 +02:00
  • 079e60163d Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 08:10:20 +02:00
  • 29fb03e903 xx Applevangelist 2024-07-12 08:09:59 +02:00
  • 6e917049af Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-12 08:09:39 +02:00
  • e6484c1598 various Applevangelist 2024-07-12 08:08:57 +02:00
  • c8d49916df #RAT - dimensions workaround for Saab 340 Applevangelist 2024-07-12 08:08:32 +02:00
  • 32297da2b0 #AWACS - MS TTS - fix spelling out B-R-A in Threat call Applevangelist 2024-07-11 08:35:32 +02:00
  • 336ac9eddb #AWACS - MS TTS - fix spelling out B-R-A in Threat call Applevangelist 2024-07-11 08:35:16 +02:00
  • 1d64ac3469 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-09 11:32:28 +02:00
  • 26adb7934e Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-09 11:32:23 +02:00
  • c51a6da5ff Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-09 11:31:33 +02:00
  • 5629a8fcd6 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-09 11:31:29 +02:00
  • 65c7b0d12f Docu fixes Applevangelist 2024-07-09 11:30:22 +02:00
  • 1a0e2e0ea1 OPS Frank 2024-07-07 23:15:20 +02:00
  • bdec6eb82d Merge branch 'FF/Ops' into FF/OpsDev Frank 2024-07-07 11:33:44 +02:00
  • f74c0e29a5 Merge branch 'master' into develop Frank 2024-07-07 11:32:08 +02:00
  • 9f8e7f4f3c Merge pull request #2144 from FlightControl-Master/FF/MasterDevel Frank 2024-07-07 11:05:05 +02:00
  • b215d0e7d4 Update Range.lua Frank 2024-07-07 11:03:03 +02:00
  • 6f3d9a497a Update Chief.lua Frank 2024-07-06 21:51:20 +02:00
  • 13b272b6e5 Update Range.lua Frank 2024-07-06 21:48:07 +02:00
  • f9031dba42 Merge branch 'master' into FF/MasterDevel Frank 2024-07-06 19:15:05 +02:00
  • ead7844e5f Merge branch 'master' into develop Frank 2024-07-05 21:36:12 +02:00
  • 29a4f7c160 Update Event.lua Frank 2024-07-05 21:35:55 +02:00
  • d25d89afbb Merge branch 'master' into develop Frank 2024-07-05 17:54:06 +02:00
  • 55a9c7e020 Update Event.lua Frank 2024-07-05 17:53:50 +02:00
  • e30fb1c9bd Merge branch 'master' into develop Frank 2024-07-03 23:17:49 +02:00
  • 84dd1fa21c Update Range.lua Frank 2024-07-03 23:17:37 +02:00
  • 64039ae770 Merge branch 'master' into develop Frank 2024-07-03 17:45:33 +02:00
  • 42979093b8 Update Range.lua Frank 2024-07-03 17:45:21 +02:00
  • 0aa78ec0c8 Merge branch 'master' into develop Frank 2024-07-03 09:47:07 +02:00
  • edf7f4677c Update Range.lua Frank 2024-07-03 09:46:51 +02:00
  • 8958d7b71f Update Range.lua Frank 2024-07-02 18:04:36 +02:00
  • 6083191f32 Update Range.lua Frank 2024-07-02 18:02:33 +02:00
  • 34698a1b4e Merge branch 'master' into develop Frank 2024-07-02 15:52:55 +02:00
  • 8e0446c594 Update Range.lua Frank 2024-07-02 15:52:44 +02:00
  • 083bedcc2d Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-02 12:48:15 +02:00
  • aad17f97fc Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-07-02 12:48:09 +02:00
  • 6a83b48429 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-07-02 12:46:50 +02:00
  • 77a1150037 #EASYGCICAP - add options to set default despawn after holding or landing Applevangelist 2024-07-02 12:46:45 +02:00
  • 19ff7ce9a0 #EASYGCICAP - add options to set default despawn after holding or landing Applevangelist 2024-07-02 12:46:35 +02:00
  • 86508d49ee Merge branch 'master' into develop Frank 2024-07-01 22:15:39 +02:00
  • 7e20a0a0dc Merge pull request #2142 from FlightControl-Master/FF/MasterDevel Frank 2024-07-01 22:14:49 +02:00
  • 58139b34a8 Update ATIS.lua Frank 2024-07-01 22:13:55 +02:00
  • 9ceb26c7b1 ATIS Frank 2024-07-01 22:07:55 +02:00
  • 9bdacfbcf7 Merge branch 'develop' into FF/OpsDev Frank 2024-07-01 16:46:22 +02:00
  • 0058383e64 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-30 16:02:11 +02:00
  • 1549ca1cc4 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-30 16:01:22 +02:00
  • 7abb6680b4 fixes Applevangelist 2024-06-30 16:01:02 +02:00
  • 9ca30fc00c Fixes Applevangelist 2024-06-30 16:00:49 +02:00
  • 9479b338c5 xxx Applevangelist 2024-06-30 15:57:09 +02:00
  • b6ac1e86e4 xx Applevangelist 2024-06-30 15:20:23 +02:00
  • a4b187d561 xx Applevangelist 2024-06-30 15:20:17 +02:00
  • 335bd897d5 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-30 11:31:51 +02:00
  • 1ba1738aa0 Merge branch 'master' into FF/MasterDevel Frank 2024-06-29 13:59:50 +02:00
  • c8cdbeac5c Update ATIS.lua Frank 2024-06-29 13:57:51 +02:00
  • 4b12b04840 Merge pull request #2140 from DarthZyll/patch-3 Frank 2024-06-28 23:02:24 +02:00
  • c571d32d0e Update UserFlag.lua for incorrect documentation Mike Young 2024-06-27 19:48:17 -04:00
  • be2eda25df Merge branch 'develop' into FF/OpsDev Frank 2024-06-27 21:31:24 +02:00
  • 897a0d4f40 xxx Applevangelist 2024-06-25 13:41:31 +02:00
  • 7229439d84 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-06-25 13:09:55 +02:00
  • 1be62b9c4e Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-25 13:09:48 +02:00