FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,829 Commits 10 Branches 87 Tags
Commit Graph

1231 Commits

Author SHA1 Message Date
Applevangelist
70386811e6 AICSAR 2023-02-19 12:31:57 +01:00
Applevangelist
9b62710d64 #AICSAR 
* Named functions for the events
 2023-02-18 11:04:37 +01:00
Applevangelist
985adc0267 Fixes 2023-02-17 08:54:33 +01:00
Applevangelist
578b68f635 #AICSAR 2023-02-16 18:22:26 +01:00
Applevangelist
6d9e2fbfe1 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
 2023-02-13 16:41:32 +01:00
Frank
92c5c32e8c
Merge pull request #1921 from FlightControl-Master/FF/MasterDevel 
Update Range.lua
 2023-02-12 13:03:08 +01:00
Frank
c8780b2d5f Update Range.lua 
- Coordinate of bomb target is now always updated (not only for moving targets)
- If the target is not alive any more, the last known position is used for its coordinate
 2023-02-12 13:00:19 +01:00
Applevangelist
c2b8261133 Merge remote-tracking branch 'origin/master' into develop 2023-02-09 16:13:06 +01:00
Applevangelist
cb00a3fa38 #DETECTION 
* Docu fixes
 2023-02-09 16:11:59 +01:00
Applevangelist
2a3d69d0d5 #DETECTION 
* Docu fixes
 2023-02-09 16:11:45 +01:00
Applevangelist
292bc790ee #AICSAR 
* Docu additions
 2023-02-09 13:17:34 +01:00
Applevangelist
e44f61181a #AICSAR 
* Fixed issue with underlying OpsTransport
* Added FSM Transition OnAfterPilotUnloaded()
* Added options for SRS TTS output - no sound files
* Added voice options for downed pilot and operator - these can have different voices
 2023-02-09 11:57:41 +01:00
Applevangelist
b4d5650cb0 Merge remote-tracking branch 'origin/master' into develop 2023-02-06 08:18:08 +01:00
Mr.Alien
03ba7524b2
Comment out code for scoring hits (#1911) 2023-02-06 08:15:45 +01:00
Applevangelist
10dd7eff78 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Modules.lua
 2023-02-05 13:50:25 +01:00
Mr.Alien
d4d305d53b
Fix confusing hit and kill messages with incorrect math (#1913) 2023-02-04 23:02:36 +01:00
Mr.Alien
c58918e002
Add missing part of code in previous commit (#1910) 2023-02-04 22:36:16 +01:00
Mr.Alien
dec7854476
Fix issue with getting thread level after a kill (#1908) 2023-02-04 22:01:55 +01:00
Thomas
b250111d57
Scoring credits a kill to player who hit the same unit before it spawned (#1905) (#1906) 
Co-authored-by: Mr.Alien <124381209+MrAlien753@users.noreply.github.com>
 2023-02-04 21:48:23 +01:00
Mr.Alien
8ca102f584
Scoring credits a kill to player who hit the same unit before it spawned (#1905) 2023-02-04 21:46:34 +01:00
Applevangelist
3a120c0a3c Merge remote-tracking branch 'origin/master' into develop 2023-02-04 17:16:52 +01:00
MrAlien753
6ff433ed7a
fix nil error message in dcs.log 
When instant killing a target in a capture zone nil error message is printed in the dcs.log. This fixes this issue.
 2023-02-03 22:14:14 +01:00
Applevangelist
58032b0075 * AIRBASE.SouthAtlantic.Rio_Turbio 2023-01-25 17:56:03 +01:00
Applevangelist
6ab1632b4b #RANGE 
* Set Google Key if given

#AIRBASE
* Added 3 Falklands AB to the enumerator
 2023-01-25 17:53:29 +01:00
Applevangelist
f344084791 #1885 
#PSEUDOATC - Menu shows Waypoint name if it has been set
 2023-01-24 10:06:05 +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