1207 Commits

Author SHA1 Message Date
Applevangelist
58032b0075 * AIRBASE.SouthAtlantic.Rio_Turbio 2023-01-25 17:56:03 +01:00
Applevangelist
95d149274f #1885
#PSEUDOATC - Menu shows Waypoint name if it has been set
2023-01-24 10:05:39 +01:00
Applevangelist
6f5e6240bc Merge remote-tracking branch 'origin/master' into develop 2023-01-10 07:49:37 +01:00
Applevangelist
581b5b3de9 fix 2023-01-10 07:48:13 +01:00
Applevangelist
6501e89fa2 #PSEUDOATC
* Fix for debug messages
2023-01-10 07:47:56 +01:00
Thomas
d34d902413
Develop (#1874)
* #FG
* make us AB the default

* OPS

**CHIEF**
- Fixed bugs of polygon opszones
- Added option to use CAPTUREZONE auftrag for opszones

**OPSZONE**
- Fixed bug when marker off

**ZONE_POLYGON_BASE**
- Added `GetRadius()` function

**LEGION**
- Improved Reinforcement

* AWACS -correct error in SetAwacsDetails (#1873)

Corrected setting of Angels

Co-authored-by: Frank <frank@inter-zone.de>
2023-01-04 09:24:57 +01:00
Applevangelist
d3ba0bbb22 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:22:55 +01:00
Applevangelist
b0eef34146 #CONTROLLABLE
* Docu fix

#WAREHOUSE
* Changes from dev

#ZONE
* Additions to ZONE_POLYGON
2023-01-03 10:15:16 +01:00
Thomas
dcd9915fe0
Merge master in Apple-Dev (#1871)
* #TIMER
* Added `StartIf()`

* PseudoATC - Option to display playername (#1870)

Use `myatc:SetReportPlayername()` to switch this on #1864
2023-01-02 14:34:12 +01:00
Thomas
cdd240abb7
PseudoATC - Option to display playername (#1870)
Use `myatc:SetReportPlayername()` to switch this on #1864
2023-01-02 14:28:35 +01:00
Thomas
4373ee8d13
Develop (#1869)
* #TIMER
* Added `StartIf()`

* OPS

request

* AUFTRAG CAP

- Fixed mission speed (unit conversion)

* ZONE

Co-authored-by: Frank <frank@inter-zone.de>
2023-01-02 13:56:55 +01:00
Applevangelist
7865be43bb * Minor fixes 2022-12-01 13:27:58 +01:00
Applevangelist
3281b669ae * minor fixes 2022-12-01 13:23:57 +01:00
Thomas
53d71d9766
Update RAT.lua
Fix #1848
2022-11-28 17:42:09 +01:00
Thomas
df94c89ce8
RAT - Remove the #... at the end on ATC callouts
RAT - Remove the #... at the end on ATC callouts to nicefy immersion
2022-11-28 09:28:55 +01:00
Applevangelist
959e4883df Merge remote-tracking branch 'origin/master' into develop 2022-11-20 11:52:25 +01:00
Frank
2538d583ad Update Suppression.lua
- Fixed routing of group (passing waypoint function was triggered too early due to changed DCS behaviour)
2022-11-19 19:36:55 +01:00
Applevangelist
416ea2490c Merge remote-tracking branch 'origin/develop' into develop 2022-11-16 11:18:18 +01:00
Applevangelist
aab22ef402 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Functional/AmmoTruck.lua
#	Moose Development/Moose/Ops/Awacs.lua
2022-11-16 11:16:25 +01:00
Frank
bd42032e3a
Merge pull request #1844 from FlightControl-Master/FF/Ops
OPS
2022-11-16 10:44:00 +01:00
Frank
1256cc3bd1 OPS
**FLIGHTGROUP**
- Waypoint altitude for helos is not radar (AGL)
- Increased cruise speed thresholds for helos to 110 kts and 380 kts for fixed wing
2022-11-16 10:41:33 +01:00
Applevangelist
0db13b6cdf Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua
#	Moose Development/Moose/Functional/ZoneGoalCoalition.lua
2022-11-11 09:38:27 +01:00
Applevangelist
27a2f42e48 Merge remote-tracking branch 'origin/master' into develop 2022-11-11 09:36:38 +01:00
Applevangelist
68a31b1eb7 Docu - Nicer Headlines 2022-11-11 09:35:54 +01:00
Applevangelist
08c7409627 Docu Headlines 2022-11-11 09:22:48 +01:00
Applevangelist
744427da46 tdada 2022-11-10 17:53:43 +01:00
Applevangelist
c38cb046cd #AMMOTRUCK
* Added demo mission link
2022-11-10 17:53:29 +01:00
Applevangelist
037b168825 Merge remote-tracking branch 'origin/master' into develop 2022-11-10 17:33:52 +01:00
Applevangelist
3ae8b05e1f Merge remote-tracking branch 'origin/master' into develop 2022-11-10 17:33:15 +01:00
Applevangelist
3907e49b9e #Docu fixes 2022-11-10 17:30:00 +01:00
Applevangelist
5d4f870a1d #Docu fixes 2022-11-10 17:29:40 +01:00
Applevangelist
41a928b775 #Docu fixes 2022-11-10 17:29:19 +01:00
Applevangelist
27598406d1 #AMMOTRUCK
* Initial Release
2022-11-10 17:11:29 +01:00
Applevangelist
4194614d65 #AMMOTRUCK 2022-11-10 17:11:00 +01:00
Applevangelist
fb203df364 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Awacs.lua
2022-11-09 16:06:40 +01:00
Frank
6c342ef910
Merge pull request #1834 from FlightControl-Master/FF/Ops
OPS
2022-11-08 22:11:21 +01:00
Applevangelist
565a5294e2 Merge remote-tracking branch 'origin/master' into develop 2022-11-07 16:09:00 +01:00
Thomas
2eea8520d8
Merge CTLD Bronco update into master (#1829)
* Update Range.lua (#1825)

Add meter text to RANGE bombing result.

* CTLD - added Bronco (#1828)

Added data for the Bronco-OV-10A - needs further additions to ensure to work, as this is a plane, not a chopper #1827

Co-authored-by: TommyC81 <tommyc81@gmail.com>
2022-11-07 11:23:39 +01:00
TommyC81
88fc501c24
Update Range.lua (#1825)
Add meter text to RANGE bombing result.
2022-11-06 19:33:44 +01:00
Frank
254d43fef1 AIRWING/WAREHOUSE
- Improved parking spot check if explicitly given for an airwing or squadron
- Improved parking check if airstart is requested.
2022-11-06 12:17:07 +01:00
Applevangelist
6f254b06b0 #SCORING
* Added option to switch AutoSave
2022-11-06 11:28:20 +01:00
Applevangelist
7983621f8e #SCORING
* Added option to switch AutoSave
2022-11-06 11:27:59 +01:00
Applevangelist
5819884c98 #SCORING
* Added option to switch AutoSave
2022-11-06 11:27:27 +01:00
Applevangelist
6c79d6b01f #SCORING
* Added option to switch AutoSave
2022-11-06 11:26:16 +01:00
Applevangelist
911bfc44c1 Merge remote-tracking branch 'origin/master' into develop 2022-10-31 08:04:57 +01:00
Thomas
946a1de931
Merge docu changes (#1818)
* Documentation fixes. (#1810)

Fix documentation references.
Correct spelling errors.
Remove empty whitespaces.
Correct a single mis-spelled ZONE_BASE variable, see 'Core/Zone.lua' (variable "Sureface" -> "Surface", no references to mis-spelled "Sureface" throughout the codebase).
Correct mis-spelling of "coaltion" in 'Functional/Mantis.lua', corrected to "coalition".

* Documentation fixes. (#1811)

Update documentation text and links.
Fix spelling errors.
Other minor adjustments where appropriate, such as remove whitespaces and format code.

* Documentation fixes. (#1815)

Minor documentation and code formatting fixes.
This is mostly intended to have something re-trigger the documentation generation to see if the filename capitalization is resolved.

* Code formatting preparation. (#1817)

Use EmmyLuaCodeStyle that comes with "Lua" VS Code extension (https://marketplace.visualstudio.com/items?itemName=sumneko.lua). More features and configurability than LuaFormatter, and no need for additional extension (beyond "Lua").
Formatting file set up from default template with some tweaks to correspond to most common coding style observed in the code base. Further tweaks are likely required.

* Documentation fixes. (#1816)

Co-authored-by: TommyC81 <tommyc81@gmail.com>
2022-10-29 10:49:18 +02:00
TommyC81
368e720cab
Documentation fixes. (#1816) 2022-10-29 10:07:50 +02:00
TommyC81
7455c63716
Documentation fixes. (#1811)
Update documentation text and links.
Fix spelling errors.
Other minor adjustments where appropriate, such as remove whitespaces and format code.
2022-10-23 16:45:40 +02:00
TommyC81
81818705df
Documentation fixes. (#1810)
Fix documentation references.
Correct spelling errors.
Remove empty whitespaces.
Correct a single mis-spelled ZONE_BASE variable, see 'Core/Zone.lua' (variable "Sureface" -> "Surface", no references to mis-spelled "Sureface" throughout the codebase).
Correct mis-spelling of "coaltion" in 'Functional/Mantis.lua', corrected to "coalition".
2022-10-22 11:07:58 +02:00
Applevangelist
1fc541a9df Merge remote-tracking branch 'origin/master' into develop 2022-10-21 08:58:48 +02:00