Commit Graph

8086 Commits

Author SHA1 Message Date
Applevangelist a35d3e180b FG 2022-12-31 18:08:20 +01:00
Applevangelist e3f9a27f87 # FF changes from today 2022-12-31 18:07:35 +01:00
Applevangelist e25b9155b4 Merge remote-tracking branch 'origin/develop' into develop 2022-12-31 18:02:35 +01:00
Applevangelist b769568df1 #FG - let planes not limp around 2022-12-31 18:02:15 +01:00
Thomas daa60ac501 Update Auftrag.lua 2022-12-31 18:01:28 +01:00
Applevangelist b811aa09a8 # FG improvements 2022-12-31 17:54:04 +01:00
Applevangelist ecf4f14222 #PLAYERTASK -menu issues 2022-12-31 15:56:21 +01:00
Applevangelist 0340d17ab8 #PLAYERTASKCONTROLLER
* honing the menu build a bit
2022-12-31 15:56:01 +01:00
Applevangelist 892be1b2cf Merge remote-tracking branch 'origin/develop' into develop 2022-12-31 12:43:10 +01:00
Frank c33f637717 Merge pull request #1859 from FlightControl-Master/FF/Ops
OPS
2022-12-31 12:42:02 +01:00
Frank 334af52ddf Merge branch 'develop' into FF/Ops 2022-12-31 12:35:59 +01:00
Frank 9a949c02c5 OPS
- Fixed bug task for recoverytanker mission
- Improved capturezone auftrag
2022-12-31 12:35:48 +01:00
Applevangelist 095c36b3ba #AWACS
* Block Helos from getting CAP assignments
2022-12-31 12:24:49 +01:00
Applevangelist 41be279a89 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Awacs.lua
2022-12-31 12:18:49 +01:00
Applevangelist 56b7364a13 # Helo 2022-12-31 12:18:12 +01:00
Frank ff7ebb4f92 Merge pull request #1858 from FlightControl-Master/FF/Ops
OPS Capture Zone
2022-12-30 22:30:57 +01:00
Frank 3834991e6a Merge branch 'develop' into FF/Ops 2022-12-30 22:08:41 +01:00
Frank 67af073b95 OPS
Capture
2022-12-30 22:08:27 +01:00
Applevangelist 5a44948050 #FLIGHTGROUP
* Make one is local
2022-12-30 17:40:10 +01:00
Applevangelist d12799a892 OPS 2022-12-30 17:39:18 +01:00
Frank 3011d625b2 OPS
Capture Zone
2022-12-30 02:44:16 +01:00
Applevangelist 1f1efe553a Merge remote-tracking branch 'origin/master' into develop 2022-12-29 16:34:39 +01:00
Applevangelist d25efe2293 #ATIS
* Make SRS say TACAN and FARP and not spell the single characters
2022-12-29 16:34:11 +01:00
Applevangelist 8202791518 #AWACS
* Added option for helos to sign-in

#ATIS
* Make SRS say TACAN and FARP and not spell the single characters
2022-12-29 16:33:43 +01:00
Applevangelist 8661d07e1e #ATIS
* Make SRS say TACAN and FARP and not spell the single characters
2022-12-29 16:33:13 +01:00
Applevangelist 65f8da77d2 # Make SRS say TACAN not T A C A N 2022-12-29 16:32:29 +01:00
Applevangelist 193f83fcc3 #AWACS
* Added option for helos
2022-12-29 11:57:18 +01:00
Applevangelist 9871bf82d3 #UTILS
* Load/Save Improvements
2022-12-28 15:48:46 +01:00
Applevangelist 972f079bd5 Merge remote-tracking branch 'origin/master' into develop 2022-12-28 15:48:03 +01:00
Applevangelist 340c5abdb5 #UTILS 2022-12-28 15:47:44 +01:00
Thomas 41eec658e0 UTILS - Update Load/Save Groups and Statics (#1857)
Addresses #1855 and #1856 

Added options to save groups in a structrued manner, allowing to despawn specific unit-types on a reload. Optionally, cinematic effects like smoke and fires can be put in place of despawned units. For statics, an option to replace them with dead statics has been added, and also cinematic effects.
2022-12-28 15:40:40 +01:00
Applevangelist f9c1d62173 #ATIS
* FARP support
2022-12-25 14:20:25 +01:00
Applevangelist 86ea757a16 #ATIS
* FARP support
2022-12-25 14:19:27 +01:00
Thomas 9facf07955 ATIS - added basic FARP support (#1854)
ATIS - added basic FARP support, only works with SRS
2022-12-25 14:18:53 +01:00
Applevangelist 89d854f5be #EVENT
* Small fix for hit event on coordinates
2022-12-24 12:04:08 +01:00
Applevangelist c6f4c6f0fa #EVENT
* Small fix for hit event on coordinates
2022-12-24 12:03:34 +01:00
Applevangelist cd4844d26c #EVENT
* Small fix for hit event on coordinates
2022-12-24 12:03:04 +01:00
Applevangelist 849c6ae88b #AUFTRAG 2022-12-23 13:47:35 +01:00
Applevangelist 7ff5e13876 Merge remote-tracking branch 'origin/develop' into develop 2022-12-23 13:45:24 +01:00
phr0gz f1e0bacadb CAPGROUP (#1853)
Fix help typo
2022-12-23 13:44:38 +01:00
Applevangelist 1b0131bd9d Merge remote-tracking branch 'origin/master' into develop 2022-12-23 13:43:43 +01:00
Applevangelist f833137455 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 13:42:56 +01:00
Applevangelist 68092e5966 #CTLD 2022-12-23 13:42:48 +01:00
Applevangelist 9619b11c58 #CTLD
* add sound folder path option
2022-12-23 13:42:14 +01:00
Thomas 535060153a CTLD #1851 Add variable for a sound path (#1852)
CTLD #1851 Add variable for a sound path - defaults to  `self.RadioPath = "l10n/DEFAULT/"`
2022-12-23 13:39:00 +01:00
Applevangelist 2f6cd20cbd Merge remote-tracking branch 'origin/master' into develop 2022-12-21 14:12:23 +01:00
Applevangelist e5a9bf6568 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Unit.lua
2022-12-21 14:11:54 +01:00
Applevangelist f26ff52712 #UNIT
* Docu fix
2.7.17
2022-12-21 14:09:47 +01:00
Applevangelist d66d99a24e #CTLD
* Added option to inject troops into helo cargo
2022-12-21 14:07:21 +01:00
Applevangelist e74c377bfd #CTLD
* Added option to inject troops into helo
2022-12-21 14:06:28 +01:00