Commit Graph

  • 163273096c Set life0 based on itself, rather than off of life ttrebuchon 2023-06-10 18:08:29 -04:00
  • 3d4eb1545e Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-10 19:12:04 +02:00
  • 5006d01932 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-10 19:11:59 +02:00
  • 3a7521c492 #UTILS * Sinai TIme Applevangelist 2023-06-10 19:04:40 +02:00
  • caa5a96235 fix Applevangelist 2023-06-10 19:06:22 +02:00
  • cee1c592ba #UTILS * Sinai TIme Applevangelist 2023-06-10 19:04:40 +02:00
  • ccc11623c3 #UTILS * Sinai Time Applevangelist 2023-06-10 19:04:18 +02:00
  • 6d1030925c Merge branch 'master' into develop Frank 2023-06-10 10:08:35 +02:00
  • f1fc9f0b27 Update Utils.lua Frank 2023-06-10 10:08:22 +02:00
  • dd5399a41d Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-09 15:17:20 +02:00
  • 9da6b2a4f5 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-09 15:17:12 +02:00
  • dabe8a58d1 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-09 15:16:41 +02:00
  • 16cf6693ab Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-09 15:16:38 +02:00
  • e9adcb0dd5 #AIRBASE * Sinai airfield enumerator Applevangelist 2023-06-09 15:13:45 +02:00
  • 23e71e991f #AIRBASE * Sinai airfield enumerator Applevangelist 2023-06-09 15:13:20 +02:00
  • 8658804c82 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-09 13:25:54 +02:00
  • fd51ec6932 #FIX Applevangelist 2023-06-09 13:25:29 +02:00
  • 7a16a5dda8 Merge pull request #1952 from FlightControl-Master/FF/Ops Frank 2023-06-08 19:55:30 +02:00
  • 1b6648996c OPSGROUP Frank 2023-06-08 19:51:09 +02:00
  • f45a22fe78 Merge branch 'develop' into FF/Ops Frank 2023-06-08 15:52:25 +02:00
  • afe2b675e5 #RAT * Fixes from dev Applevangelist 2023-06-08 13:59:59 +02:00
  • 77c4eb0d54 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-08 13:59:05 +02:00
  • 238640ec91 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-08 13:58:58 +02:00
  • 2c14ee74b0 #SCORING * Can leave text empty on some instances Applevangelist 2023-06-08 13:58:22 +02:00
  • 4314959cbb Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-08 13:57:03 +02:00
  • fad85ef7ed #PLAYERTASK * Added basic scoring Applevangelist 2023-06-08 13:56:59 +02:00
  • 0a0a4684f8 #PLAYERTASKCONTROLLER * Added basic scoring Applevangelist 2023-06-08 13:55:52 +02:00
  • 569b3df6af Merge branch 'master' into develop Frank 2023-06-08 09:46:24 +02:00
  • f351d2a37e Merge pull request #1951 from FlightControl-Master/FF/MasterDevel Frank 2023-06-08 09:45:49 +02:00
  • 4cb0e70184 Update RAT.lua Frank 2023-06-08 09:43:11 +02:00
  • 910da86caf Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-07 17:25:49 +02:00
  • 73ff2c576d Fix typo from TRANSPORT. to OPSTRANSPORT. (#1950) ttrebuchon 2023-06-07 11:26:20 -04:00
  • d5ffb48548 #PLAYERTASK * Fix for one tts output Applevangelist 2023-06-07 17:25:45 +02:00
  • 8ce371f898 WAREHOUSE Frank 2023-06-07 09:03:01 +02:00
  • a12f874e34 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-06 16:29:22 +02:00
  • 6f02f23240 PlayerTask.lua (#1948) Thomas 2023-06-06 16:20:16 +02:00
  • 00f89f0855 PLAYERTASK * Small fix in TTS text Applevangelist 2023-06-06 16:13:23 +02:00
  • 0a1d469c68 Fix Offset values being saved to the ZONE_UNIT class itself (#1947) ttrebuchon 2023-06-03 14:15:33 -04:00
  • 4cc14b93b6 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-03 12:35:59 +02:00
  • f5aa294c70 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-03 12:35:54 +02:00
  • 823f8fb4fb Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-03 12:35:05 +02:00
  • 41bb2551d3 #CTLD * Ensure new menus can be build if player changes helos Applevangelist 2023-06-03 12:34:18 +02:00
  • bb17e8cc1f #CTLD * Ensure new menus can be build if player changes helos Applevangelist 2023-06-03 12:34:09 +02:00
  • 69f2acae72 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-02 08:46:56 +02:00
  • 00ecbc98ba Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-02 08:46:48 +02:00
  • f7e64bc9b5 #UNIT #CTLD * Stabilize that sometimes a unit coordinate cannot be found Applevangelist 2023-06-02 08:45:35 +02:00
  • 065c59f167 #UNIT #CTLD * Stabilize that sometimes a unit coordinate cannot be found Applevangelist 2023-06-02 08:44:43 +02:00
  • 55ed394782 #UNIT #CTLD * Stabilize that sometimes a unit coordinate cannot be found Applevangelist 2023-06-02 08:44:14 +02:00
  • 261f79851c Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-01 10:03:34 +02:00
  • dd7a883a33 Fixes Applevangelist 2023-06-01 10:02:51 +02:00
  • 878169f51c Fixes Applevangelist 2023-06-01 10:00:31 +02:00
  • d9ee3a2323 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-30 12:06:46 +02:00
  • 6773ac7841 #PLAYERTASK * Added FSM event "Progress" that will be triggered if the targetcount goes down for a task, but is not yet zero. This will bubble up to PLAYERTASKCONTROLLER Applevangelist 2023-05-30 12:06:03 +02:00
  • 5afad6e313 #PLAYERTASK * Added FSM event "Progress" that will be triggered if the targetcount goes down for a task, but is not yet zero. This will bubble up to PLAYERTASKCONTROLLER Applevangelist 2023-05-30 12:05:51 +02:00
  • 631d82216e SET Applevangelist 2023-05-30 11:53:15 +02:00
  • 0b7148f675 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-30 07:40:41 +02:00
  • b03f03bf06 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-30 07:40:32 +02:00
  • 39f29b066b Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-30 07:38:48 +02:00
  • f7acbc3928 #CSAR * Corrected flare distance to kms Applevangelist 2023-05-30 07:38:19 +02:00
  • cf39f494f8 #CSAR * Corrected flare distance to kms Applevangelist 2023-05-30 07:38:05 +02:00
  • ca9a5187f6 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-28 15:29:40 +02:00
  • f8201ffed7 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-28 15:29:30 +02:00
  • b70780162b #SPAWN * Logic fix for the last parameter of NewFromTemplate() Applevangelist 2023-05-28 15:29:01 +02:00
  • 246879c003 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-28 15:28:37 +02:00
  • 2318578126 #SPAWN * Logic fix for the last parameter of NewFromTemplate() Applevangelist 2023-05-28 15:27:34 +02:00
  • da312cd5ac Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-27 16:31:12 +02:00
  • 709621967d Merge pull request #1945 from FlightControl-Master/FF/Ops Frank 2023-05-27 14:38:30 +02:00
  • 0c376aec63 OPSTRANSPORT Frank 2023-05-27 14:28:53 +02:00
  • 725efc3e70 Merge pull request #1944 from FlightControl-Master/FF/Ops Frank 2023-05-26 11:42:26 +02:00
  • 81abe422de Merge branch 'develop' into FF/Ops Frank 2023-05-26 11:38:26 +02:00
  • fb202012da AUFTRAG Frank 2023-05-26 11:37:19 +02:00
  • 5938e1426e Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-26 08:29:28 +02:00
  • f695639839 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-26 08:29:22 +02:00
  • 89223ae142 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-26 08:28:45 +02:00
  • 3e6f25f17c #UTILS * Added UTILS.PrintTableToLog() 2.7.20 Applevangelist 2023-05-26 08:28:08 +02:00
  • 016fbe0a10 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-25 09:00:44 +02:00
  • dd496d35a8 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-25 09:00:33 +02:00
  • 158ffde780 #CONTROLLER * Fix for Link4 Applevangelist 2023-05-25 08:58:21 +02:00
  • 2967de8f6e #CONTROLLER * Fix for Link4 Applevangelist 2023-05-25 08:57:54 +02:00
  • 0cd6a59ce4 #CONTROLLER * Fix for Link4 Applevangelist 2023-05-25 08:57:15 +02:00
  • 402674470f Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-25 08:26:23 +02:00
  • 31174ae97c Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-25 08:26:06 +02:00
  • 9c5260f801 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-25 08:24:35 +02:00
  • 4d9ce80c98 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-25 08:24:16 +02:00
  • 91a445961b #RESCUEHELO * Small fix to get the coordinate of an ejected/crashed unit Applevangelist 2023-05-25 08:23:27 +02:00
  • 4c7239c5ec Bugfixes Applevangelist 2023-05-25 08:22:51 +02:00
  • ee055531b6 Merge branch 'master' into develop Frank 2023-05-24 11:16:36 +02:00
  • 749e9b7e08 Update Event.lua Frank 2023-05-24 11:16:01 +02:00
  • c9b90e884d Merge pull request #1943 from FlightControl-Master/FF/Ops Frank 2023-05-23 01:46:51 +02:00
  • 21db80afad Merge branch 'develop' into FF/Ops Frank 2023-05-23 01:29:04 +02:00
  • d9d5458450 OPS Frank 2023-05-23 01:28:52 +02:00
  • 93a63cc868 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-22 17:58:28 +02:00
  • b5aa3dd869 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-22 17:58:21 +02:00
  • 0575b366dd #SPAWN * Tweaked NewFromTemplate, and gave a better example Applevangelist 2023-05-22 17:57:50 +02:00
  • 905d29b279 #SPAWN * Tweaked NewFromTemplate, and gave a better example Applevangelist 2023-05-22 17:57:03 +02:00
  • a69e62a66b #SPAWN * Tweaked NewFromTemplate, and gave a better example Applevangelist 2023-05-22 17:56:53 +02:00
  • 7c3fa4ebc2 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-05-20 12:14:23 +02:00
  • 668162845c Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-20 12:14:16 +02:00
  • 034b2444ff Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-05-20 12:13:35 +02:00
  • 5f97299cb2 Small Fix Applevangelist 2023-05-20 12:12:18 +02:00