Commit Graph

  • 545c0886fa Merge pull request #1416 from Applevangelist/patch-31 Frank 2021-01-01 16:39:31 +01:00
  • 721d027fb3 Update AI_Cargo_Helicopter.lua Applevangelist 2021-01-01 16:37:55 +01:00
  • f1e7d8bd06 Merge branch 'master' into develop Frank 2021-01-01 10:16:58 +01:00
  • 5185ea35fe Merge pull request #1415 from acrojason/naval-cargo Frank 2021-01-01 02:21:41 +01:00
  • ec039f2999 Multiple ship types, set default cargobay limit, fixed doc bug acrojason 2020-12-31 17:04:21 -08:00
  • c0fc649f8b Client Frank 2021-01-01 01:46:14 +01:00
  • c49497e68c Merge branch 'master' into FF/MasterDevel Frank 2020-12-31 21:39:37 +01:00
  • 1328ac061e Merge branch 'master' into develop Frank 2020-12-31 21:22:59 +01:00
  • 57bc6de12b Merge pull request #1414 from acrojason/naval-cargo Frank 2020-12-31 20:38:30 +01:00
  • 1b80d68f50 Add support for naval logistics acrojason 2020-12-31 10:15:32 -08:00
  • 787151597c Client Frank 2020-12-31 17:17:15 +01:00
  • f725039da5 Client and Event updates Frank 2020-12-31 00:51:54 +01:00
  • a4f15a0830 Merge branch 'master' into FF/MasterDevel Frank 2020-12-30 12:43:31 +01:00
  • 391f0fc9af Merge branch 'master' into develop Frank 2020-12-29 23:38:44 +01:00
  • 084f00afad Update SpawnStatic.lua Frank 2020-12-29 23:38:27 +01:00
  • 38cf5be738 Update Airbase.lua Frank 2020-12-29 22:51:10 +01:00
  • 1bb70b8697 Update Warehouse.lua Frank 2020-12-29 22:28:36 +01:00
  • 6e35b80daf Update Warehouse.lua Frank 2020-12-29 21:41:15 +01:00
  • a171c22ce4 Merge branch 'develop' into FF/Ops Frank 2020-12-29 11:23:04 +01:00
  • f56457bc28 Update Intelligence.lua Frank 2020-12-29 11:22:47 +01:00
  • 87f4ebee64 Clients Frank 2020-12-29 01:10:40 +01:00
  • a0276821d9 Merge pull request #1412 from FlightControl-Master/FF/MasterDevel Frank 2020-12-27 22:39:56 +01:00
  • 9708de70c7 Merge branch 'master' into develop Frank 2020-12-27 17:59:57 +01:00
  • 01a5b523da Arty v1.2.0 Frank 2020-12-27 17:59:39 +01:00
  • 13477e17ec Merge pull request #1411 from Applevangelist/patch-30 Frank 2020-12-27 17:54:59 +01:00
  • c32cec4c5b Mantis.lua 0.3.5 Applevangelist 2020-12-27 16:24:13 +01:00
  • d68589bb70 Merge branch 'master' into develop Frank 2020-12-23 16:10:07 +01:00
  • e08df3f9ce Update Timer.lua Frank 2020-12-23 16:09:49 +01:00
  • 16eb38782a Merge branch 'master' into develop Frank 2020-12-23 10:54:57 +01:00
  • f958130b92 Merge pull request #1408 from Applevangelist/patch-28 Frank 2020-12-23 10:53:27 +01:00
  • 9a19dd254e Mantis 0.3.0 - added advanced mode options Applevangelist 2020-12-22 15:19:29 +01:00
  • 2175e9c0d6 Merge branch 'master' into develop Frank 2020-12-22 09:49:08 +01:00
  • 4869ae4baa cargo Frank 2020-12-21 22:52:51 +01:00
  • 1fd41eaa55 Merge pull request #1405 from Applevangelist/patch-25 Frank 2020-12-21 15:13:40 +01:00
  • 25a7260d7f Merge pull request #1404 from Applevangelist/patch-24 Frank 2020-12-21 15:13:13 +01:00
  • 478934ddd1 Update Sead.lua to 0.2.2 Applevangelist 2020-12-21 10:31:06 +01:00
  • 3d7234de19 Update to 0.2.6 Applevangelist 2020-12-21 10:02:41 +01:00
  • 9abd71f681 Merge branch 'develop' into FF/Ops Frank 2020-12-21 00:13:09 +01:00
  • d1dc829136 Merge branch 'master' into develop Frank 2020-12-20 23:48:28 +01:00
  • fed1fb2839 Update Artillery.lua Frank 2020-12-20 23:48:13 +01:00
  • eda672bdc6 Merge branch 'develop' into FF/Ops Frank 2020-12-19 12:48:12 +01:00
  • 0e5dbbea79 Merge branch 'master' into develop Frank 2020-12-19 01:18:17 +01:00
  • 08ba001b45 Update AI_Air_Engage.lua Frank 2020-12-19 01:18:01 +01:00
  • f5809ef302 Merge branch 'develop' into FF/Ops Frank 2020-12-18 23:50:59 +01:00
  • 457ce1ece1 Merge branch 'master' into develop Frank 2020-12-18 13:52:23 +01:00
  • ce5aaf0b48 Update Airbase.lua Frank 2020-12-18 13:52:08 +01:00
  • 9c9841332f Merge branch 'master' into develop Frank 2020-12-17 13:55:38 +01:00
  • ee6954a4b9 Update AI_Air_Engage.lua Frank 2020-12-17 13:54:59 +01:00
  • 9470d3a2ef Merge branch 'master' into develop Frank 2020-12-17 12:34:59 +01:00
  • 8356271f8d Merge branch 'master' into develop Frank 2020-12-17 12:34:04 +01:00
  • 6b6e845a18 Merge pull request #1402 from Applevangelist/patch-23 Frank 2020-12-17 12:20:07 +01:00
  • c01b94518f Update to Mantis 0.2.5 Applevangelist 2020-12-17 11:16:30 +01:00
  • 9cf5f74e5e Merge pull request #1401 from Applevangelist/patch-22 Frank 2020-12-16 11:31:14 +01:00
  • 4fda0414a0 Add new Routing Function to Controllable.lua Applevangelist 2020-12-16 10:10:46 +01:00
  • 42a6f3272d Merge branch 'master' into develop Frank 2020-12-16 00:12:38 +01:00
  • effa4af3a1 Merge pull request #1400 from Applevangelist/patch-21 Frank 2020-12-15 13:00:50 +01:00
  • 80b7e49eed Update Mantis.lua Applevangelist 2020-12-15 11:59:10 +01:00
  • 362b242c41 Merge pull request #1398 from Applevangelist/patch-20 Frank 2020-12-15 00:36:57 +01:00
  • 7ace7b49ca Merge branch 'develop' into FF/Ops Frank 2020-12-15 00:14:15 +01:00
  • 7cd902e924 Merge branch 'master' into develop Frank 2020-12-15 00:11:34 +01:00
  • e3c14678e2 Error in FlightGroup.lua in line 2390 as detected by HRP Zero Applevangelist 2020-12-14 13:37:17 +01:00
  • 63748c3841 Merge pull request #1397 from Applevangelist/patch-19 Frank 2020-12-14 13:01:38 +01:00
  • 1c68b66047 Merge pull request #1396 from Applevangelist/patch-18 Frank 2020-12-14 12:51:04 +01:00
  • bfaca75a7d Merge branch 'master' into develop Frank 2020-12-14 12:37:45 +01:00
  • 6c9dce70e7 SPAWNSTATIC Frank 2020-12-14 12:36:02 +01:00
  • 5515aa43d6 Update Modules.lua Applevangelist 2020-12-14 10:42:11 +01:00
  • 47c461e504 SPAWNSTATIC Frank 2020-12-14 00:08:30 +01:00
  • 65174ceaae Create Mantis.lua Applevangelist 2020-12-13 16:06:57 +01:00
  • 5aecd8c255 Ops Frank 2020-12-10 18:53:49 +01:00
  • cfc0f1a1f7 Merge branch 'master' into develop Frank 2020-12-03 23:18:32 +01:00
  • 2500cfb3c7 RANGE v2.3.0 Frank 2020-12-03 23:17:40 +01:00
  • 7e673271ee Merge pull request #1391 from Applevangelist/patch-16 Frank 2020-12-02 21:26:31 +01:00
  • e165cb156c Update Task.lua Applevangelist 2020-12-02 17:25:57 +01:00
  • 82bfb0cc55 Issue ##1383 never ending flash messages Applevangelist 2020-12-01 19:47:29 +01:00
  • b0fe0663f1 Merge pull request #1389 from Applevangelist/patch-14 Frank 2020-12-01 18:07:40 +01:00
  • 1bd5193786 Taskinfo.lua - Issue #1388 - don't just assume this is a string Applevangelist 2020-12-01 16:10:55 +01:00
  • edf657c65c Merge branch 'master' into develop Frank 2020-11-30 11:40:34 +01:00
  • 801d00fa26 Stuff Frank 2020-11-30 11:38:36 +01:00
  • 64c3fb985a Merge pull request #1386 from Applevangelist/patch-12 Frank 2020-11-26 17:21:19 +01:00
  • 1536c94319 Merge pull request #1387 from Applevangelist/patch-13 Frank 2020-11-26 17:20:57 +01:00
  • eeffa31282 Update ChiefOfStaff.lua Frank 2020-11-26 11:47:05 +01:00
  • 206528a530 Merge branch 'FF/Ops' into FF/OpsDev Frank 2020-11-26 10:56:17 +01:00
  • e7efd89d7a Update Task_A2A_Dispatcher.lua Applevangelist 2020-11-26 10:30:07 +01:00
  • c486167b01 Update Task_A2G_Dispatcher.lua Applevangelist 2020-11-26 10:28:51 +01:00
  • e5201f3363 Merge pull request #1384 from Applevangelist/patch-11 Frank 2020-11-25 22:56:39 +01:00
  • ff4927dbb7 Update AI_Air.lua Applevangelist 2020-11-25 12:38:31 +01:00
  • 41690fdf7b Merge pull request #1385 from FlightControl-Master/FF/Ops Frank 2020-11-25 11:34:41 +01:00
  • 5b83f8e45b OPS Frank 2020-11-25 11:27:07 +01:00
  • 94863ed8ae Update OpsGroup.lua Frank 2020-11-24 22:00:36 +01:00
  • 5842562ce1 Update AI_Air.lua Applevangelist 2020-11-24 16:23:22 +01:00
  • 5f545fd3c5 Merge pull request #1382 from Applevangelist/patch-10 Frank 2020-11-23 13:37:05 +01:00
  • aab2f20280 Update Sead.lua Applevangelist 2020-11-23 12:32:00 +01:00
  • 76ac68ce51 Merge pull request #1381 from Applevangelist/patch-9 Frank 2020-11-22 20:55:59 +01:00
  • f034e3680c Update Controllable.lua Applevangelist 2020-11-22 17:39:56 +01:00
  • e5c57269bb Update Controllable.lua Applevangelist 2020-11-22 17:24:56 +01:00
  • e63b99c890 Merge pull request #1379 from Applevangelist/patch-7 Frank 2020-11-22 15:54:03 +01:00
  • e8542743b4 Merge pull request #1380 from Applevangelist/patch-8 Frank 2020-11-22 15:53:14 +01:00
  • 309e1208c2 Update Sead.lua Applevangelist 2020-11-22 14:17:42 +01:00
  • 3e0db05664 Update Controllable.lua Applevangelist 2020-11-22 13:01:26 +01:00
  • 9573d92cc0 Update Controllable.lua Applevangelist 2020-11-22 12:07:49 +01:00