Commit Graph

  • 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
  • 30fd2230b0 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-25 13:09:16 +02:00
  • b350243e50 Docu fix Applevangelist 2024-06-25 13:08:46 +02:00
  • 50ff9f162a Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-06-25 10:46:55 +02:00
  • e94a918bbe Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-25 10:46:51 +02:00
  • af261048a6 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-25 10:46:17 +02:00
  • 042b82d3a6 #ARTY Fixed counting the right shells for artillery and some logic problems Applevangelist 2024-06-25 10:45:24 +02:00
  • 2fc2f5d798 #ARTY fixed counting the right artillery shells and some logic problems Applevangelist 2024-06-25 10:44:53 +02:00
  • ba41d6421d FLIGHTGROUP Frank 2024-06-25 09:38:29 +02:00
  • faadbdecfb Merge branch 'master' into develop Frank 2024-06-24 23:55:13 +02:00
  • 62ef56684b Update Templates Frank 2024-06-24 23:55:01 +02:00
  • 21b5823bc0 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-06-23 19:19:19 +02:00
  • 81c38d2221 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-23 19:19:16 +02:00
  • a994942a02 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-23 19:18:47 +02:00
  • 1033b975f8 #UNIT - improved GetAmmunition() to also report Tank HE and AP shells and added query functions for arti, HE and AP type of ammunition Applevangelist 2024-06-23 19:18:27 +02:00
  • bd6d23c7f8 #UNIT - improved GetAmmunition() to also report Tank HE and AP shells and added query functions for arti, HE and AP type of ammunition Applevangelist 2024-06-23 19:17:32 +02:00
  • f15e89e7aa xxx Applevangelist 2024-06-23 19:15:57 +02:00
  • 7bb5e324f9 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-06-22 11:54:58 +02:00
  • 209149b8de Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-22 11:54:55 +02:00
  • b701fa61fa xxx Applevangelist 2024-06-22 11:54:35 +02:00
  • 97abe32f75 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-22 11:54:19 +02:00
  • 11a05f1333 UNIT:IsPlayer() Small fix for an error that is I think produced by the swapr script Applevangelist 2024-06-22 11:53:52 +02:00
  • ef7d354109 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-06-20 18:10:11 +02:00
  • f5551e202d Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-20 18:10:06 +02:00
  • 796b71474b Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-06-20 18:08:55 +02:00
  • 662412dd02 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-20 18:08:52 +02:00
  • 8cdf8677c1 #UTILS Added AH64 and Kiowa Callsign enumerators Applevangelist 2024-06-20 18:08:24 +02:00
  • e1706c94af Merge branch 'master' into FF/MasterDevel Frank 2024-06-20 17:19:57 +02:00
  • 97c1653614 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-06-20 08:53:11 +02:00
  • 07dc55b284 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-20 08:53:08 +02:00
  • cc925271aa Merge remote-tracking branch 'origin/develop' into develop-2 Applevangelist 2024-06-20 08:52:50 +02:00
  • 753cbaa2b9 xxx Applevangelist 2024-06-20 08:52:47 +02:00
  • b8f7cf44cc Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-06-20 08:52:28 +02:00
  • 7d6f9fc4b5 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-20 08:52:25 +02:00
  • f9f0a8e866 #COORDINATE - Fix is day/night for Kola locations when the sun either never rises or never sets. Applevangelist 2024-06-20 08:51:54 +02:00
  • fa8e1d2a56 Merge branch 'FF/Ops' into FF/OpsDev Frank 2024-06-19 07:53:54 +02:00
  • 3fac5ac9f0 Update FlightGroup.lua FF/OpsRat Frank 2024-06-18 23:15:50 +02:00
  • d83cabbab6 Merge branch 'master' into develop Frank 2024-06-18 09:21:12 +02:00
  • 5f9d4405b1 AIRBOSS Frank 2024-06-18 09:20:59 +02:00
  • bdd9efa2cc Update FlightControl.lua Frank 2024-06-17 18:08:45 +02:00
  • a778e910f7 Merge pull request #2139 from FlightControl-Master/FF/Ops Frank 2024-06-17 16:11:40 +02:00
  • 24b09e22f7 Update FlightControl.lua Frank 2024-06-17 16:09:01 +02:00
  • b40331b04e Kiowa type name fix (#2138) Thomas 2024-06-15 08:14:58 +02:00
  • 2d1fcb9be8 Update CTLD.lua Thomas 2024-06-15 08:12:54 +02:00
  • 5fcd394ddd Update CSAR.lua Thomas 2024-06-15 08:11:14 +02:00
  • fe6d69fdcc xxx Applevangelist 2024-06-14 16:37:36 +02:00
  • 7a0f53ebf3 docu fix Applevangelist 2024-06-14 16:37:21 +02:00
  • af17265efc Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2024-06-11 10:21:32 +02:00
  • 12b8740bad Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-11 10:21:27 +02:00
  • a2580122de Merge remote-tracking branch 'origin/master' into develop Applevangelist 2024-06-11 10:20:52 +02:00