Commit Graph

  • fde398e80b Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-16 11:07:40 +02:00
  • dae78d7ac1 #Positionable, Unit - remove pcall Applevangelist 2023-06-16 11:06:46 +02:00
  • f28d92e865 Merge pull request #1963 from FlightControl-Master/FF/Ops Frank 2023-06-15 19:15:34 +02:00
  • bffb3e7778 OPS Frank 2023-06-15 19:12:26 +02:00
  • fd2e9fbafc Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-15 14:52:40 +02:00
  • 15e93cc60d Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-15 14:52:36 +02:00
  • d4c2de9dd1 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-15 14:52:09 +02:00
  • ab5425bd83 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-15 14:52:02 +02:00
  • 254468c723 #NET * Improvements Applevangelist 2023-06-15 14:51:36 +02:00
  • b2c95e37ae Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-15 14:50:30 +02:00
  • aec3eee3a5 #NET * Slight improvements Applevangelist 2023-06-15 14:50:11 +02:00
  • eec7e5f8d9 Merge branch 'develop' into FF/Ops Frank 2023-06-15 01:25:10 +02:00
  • a9b51cca93 Update Auftrag.lua Frank 2023-06-15 01:24:59 +02:00
  • 14ddba69b0 Merge pull request #1962 from ttrebuchon/tt/ops-chief-RecruitAssetsForZone-nmin-nmax-typo-fix Frank 2023-06-15 00:39:45 +02:00
  • a7806deb76 Recruit assets using resource Nmin and Nmax, rather than Nmax and Nmax. ttrebuchon 2023-06-14 12:41:05 -04:00
  • 1da1b9d2cb Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-14 17:42:23 +02:00
  • 978c953e0d Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-14 17:41:43 +02:00
  • 0cf35b664f Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-14 17:41:13 +02:00
  • 71be4d99d6 #POSITIONABLE:GetRelativeCoordinate( x, y, z ) Applevangelist 2023-06-14 17:40:33 +02:00
  • 27011f3ce6 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-14 17:25:33 +02:00
  • cd5ac59c40 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-14 17:25:28 +02:00
  • c3ffffbb52 Merge branch 'master' into develop Frank 2023-06-13 21:53:29 +02:00
  • f86fc845e7 Update Timer.lua Frank 2023-06-13 21:53:19 +02:00
  • d96a55d83c Merge pull request #1961 from ttrebuchon/tt/flightgroup-getparkingspot-ship-fix Frank 2023-06-13 19:09:42 +02:00
  • 83353d710d Use GetRelativeCoordinate in FLIGHTGROUP:GetParkingSpot ttrebuchon 2023-06-13 13:04:24 -04:00
  • 9a4c09d249 Merge branch 'master' into develop Frank 2023-06-13 19:03:11 +02:00
  • cc907b9c14 Update Unit.lua Frank 2023-06-13 19:02:55 +02:00
  • c825191556 Add POSITIONABLE:GetRelativeCoordinate ttrebuchon 2023-06-13 12:54:38 -04:00
  • e2e2b44fb8 Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-13 18:01:46 +02:00
  • a8be273479 FIXES Applevangelist 2023-06-13 18:01:13 +02:00
  • 27e85e921f Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-13 18:00:18 +02:00
  • c120a48879 #UNIT * Test to not return a stored DCS Object if the API doesn't think it's still there Applevangelist 2023-06-13 18:00:15 +02:00
  • 4a03074571 Merge branch 'develop' of https://github.com/FlightControl-Master/MOOSE into develop Frank 2023-06-13 16:02:00 +02:00
  • 8855b117a8 Update OpsGroup.lua Frank 2023-06-13 16:01:47 +02:00
  • 2cedb5e996 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-13 08:40:21 +02:00
  • 241b2beee1 * Makes calls for GetAmmo() and GetVec3() safer with pcall() * Small docu fix Ben-Gurion Applevangelist 2023-06-13 08:39:56 +02:00
  • 9e84c6af1b Merge remote-tracking branch 'origin/develop' into develop Applevangelist 2023-06-13 08:35:53 +02:00
  • 84e7460a67 Merge remote-tracking branch 'origin/master' into develop Applevangelist 2023-06-13 08:35:48 +02:00
  • 8802709d3c Merge remote-tracking branch 'origin/Apple/Develop' into develop Applevangelist 2023-06-13 08:35:30 +02:00
  • 253ed62d46 Fixes Applevangelist 2023-06-13 08:35:27 +02:00
  • 0af68cd780 Merge branch 'master' into develop Frank 2023-06-12 23:01:36 +02:00
  • 12f260e857 Update Unit.lua Frank 2023-06-12 23:01:19 +02:00
  • 4d247e75f2 Airbase fixes (#1958) Thomas 2023-06-12 06:29:24 +02:00
  • 6a58748cd1 Airbase (#1954) Thomas 2023-06-12 06:27:52 +02:00
  • 096d145cf9 Update Airbase.lua (#1957) Thomas 2023-06-12 06:22:51 +02:00
  • d31db1351a Merge pull request #1956 from FlightControl-Master/FF/Ops Frank 2023-06-11 22:52:28 +02:00
  • 0f33603ecc AUFTRAG Frank 2023-06-11 22:45:59 +02:00
  • b3883301a2 Update Airbase.lua Thomas 2023-06-11 12:33:01 +02:00
  • 3bbd55cfc2 Merge pull request #1953 from ttrebuchon/tt/fix-opsgroup-getlifepoints-typo Frank 2023-06-11 00:52:13 +02:00
  • 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