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
8,753 Commits 10 Branches 87 Tags
Commit Graph

1547 Commits

Author SHA1 Message Date
Applevangelist
2a3d69d0d5 #DETECTION 
* Docu fixes
 2023-02-09 16:11:45 +01:00
Applevangelist
608033f38f #AICSAR 
* Docu additions
 2023-02-09 13:17:49 +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
28c25816a6 #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:28 +01:00
Frank
bbd8ceb8c0 Merge branch 'develop' into FF/Ops 2023-02-08 16:15:06 +01:00
Frank
34c26c44bc Merge branch 'develop' into FF/OpsDev 2023-02-07 22:53:19 +01:00
Applevangelist
b4d5650cb0 Merge remote-tracking branch 'origin/master' into develop 2023-02-06 08:18:08 +01:00
Applevangelist
63b16e5bd4 Merge remote-tracking branch 'origin/master' into develop 2023-02-06 08:17:05 +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
Frank
0400f1a23e Merge branch 'FF/Ops' into FF/OpsDev 2023-02-05 00:23:42 +01:00
Frank
d3d60757c1 Merge branch 'develop' into FF/Ops 2023-02-05 00:23:25 +01:00
Frank
57079e5104 Merge branch 'master' into develop 2023-02-04 23:34:14 +01:00
Frank
6d967358da WEAPON v0.1.0 
**WEAPON**
- Improments of class
- ARTY works
- FOX works
- RANGE should work, not tested.
 2023-02-04 23:28:45 +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
Applevangelist
a415b131c4 Merge remote-tracking branch 'origin/master' into develop 2023-02-04 21:51:35 +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
Applevangelist
5571b49b4f Merge remote-tracking branch 'origin/master' into develop 2023-02-04 17:16:10 +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
Frank
4b4708e2a8 Weapon 2023-02-02 23:50:00 +01:00
Frank
6e6bb1e88d RANGE 2023-01-30 23:29:03 +01:00
Frank
0b3aea2bf3 Scenery 2023-01-30 21:52:22 +01:00
Applevangelist
58032b0075 * AIRBASE.SouthAtlantic.Rio_Turbio 2023-01-25 17:56:03 +01:00
Applevangelist
e106ca3da5 * AIRBASE added airfields Falklands 
* RANGE  added google key usage
 2023-01-25 17:55:34 +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
6a4356fa94 #1885 
#PSEUDOATC - Menu shows Waypoint name if it has been set
 2023-01-24 10:06:40 +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
a7bad8e9f4 #PSEUDOATC 
* Fix for debug messages
 2023-01-10 07:49:02 +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
Frank
19a90b7d9d Merge branch 'develop' into FF/Ops 2023-01-03 22:10:09 +01:00
Frank
dbaed1e97b 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
 2023-01-03 22:09:56 +01:00
Applevangelist
d3ba0bbb22 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:22:55 +01:00
Applevangelist
43c81afd12 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:17:48 +01:00
Applevangelist
b0eef34146 #CONTROLLABLE 
* Docu fix

#WAREHOUSE
* Changes from dev

#ZONE
* Additions to ZONE_POLYGON
 2023-01-03 10:15:16 +01:00
Applevangelist
55656761d2 #FIXES 2023-01-02 17:28:20 +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
Frank
a9b0017c04 OPS 
request
 2023-01-01 20:01:36 +01:00
Applevangelist
620c8eaa27 Merge remote-tracking branch 'origin/master' into develop 2022-12-01 13:29:20 +01:00
Applevangelist
7865be43bb * Minor fixes 2022-12-01 13:27:58 +01:00