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

6688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
21a2df0830 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 10:49:13 +01:00
Applevangelist
c3fde2b698 Merge remote-tracking branch 'origin/master' 2023-01-05 10:48:55 +01:00
Applevangelist
59e8aed445 #CSAR fix for beacons 2023-01-05 10:48:50 +01:00
Applevangelist
d56bc000a1 Merge remote-tracking branch 'origin/develop' into develop 2023-01-05 10:48:03 +01:00
Applevangelist
b38f167a27 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
 2023-01-05 10:47:52 +01:00
Applevangelist
16af086cc5 #CTLD 2023-01-05 10:46:06 +01:00
Applevangelist
e47b8f377c #CTLD/CSAR 
* Small fix for
 2023-01-05 10:45:37 +01:00
Thomas
24cc5ca32d
Update CTLD.lua 2023-01-04 11:53:59 +01:00
Thomas
47f6f7e8cc
Update CTLD.lua 2023-01-04 11:42:56 +01:00
Thomas
dde458aea0
Update CSAR.lua 2023-01-04 11:42:25 +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
Thomas
4773a83a24
AWACS -correct error in SetAwacsDetails (#1873) 
Corrected setting of Angels
 2023-01-04 09:21:00 +01:00
Frank
09e9377e54
Merge pull request #1872 from FlightControl-Master/FF/Ops 
OPS
 2023-01-03 22:13:28 +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
812aff7f2e AB useage 2023-01-03 10:34:07 +01:00
Applevangelist
9695789843 #FG 
* make us AB the default
 2023-01-03 10:33:51 +01:00
Applevangelist
75ddd2e1e0 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:23:34 +01:00
Applevangelist
39535cef7b Merge remote-tracking branch 'origin/develop' into develop 2023-01-03 10:23:02 +01:00
Applevangelist
d3ba0bbb22 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:22:55 +01:00
Applevangelist
793c0d988e Changes from dev 2023-01-03 10:22:10 +01:00
Applevangelist
43c81afd12 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:17:48 +01:00
Applevangelist
88a837b769 #FlightGroup 
* Added options to allow afterburner, jettison of empty tanks and jettison of weapons
 2023-01-03 10:15:35 +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
f401179c57 #FlightGroup 
* Added options to allow afterburner, jettison of empty tanks and jettison of weapons
 2023-01-03 10:14:06 +01:00
Applevangelist
0bd481d4f0 Merge remote-tracking branch 'origin/develop' into develop 2023-01-02 17:29:15 +01:00
Applevangelist
0942f02d2c Merge remote-tracking branch 'origin/master' into develop 2023-01-02 17:29:09 +01:00
Applevangelist
55656761d2 #FIXES 2023-01-02 17:28:20 +01:00
Applevangelist
659188e3cb UNIT 2023-01-02 17:27:27 +01:00
Applevangelist
9657976f63 FG 2023-01-02 17:27:20 +01:00
Applevangelist
3fbfb8b528 #UNIT 
* Fix #1865
 2023-01-02 17:27:01 +01:00
Applevangelist
97e44b2042 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Auftrag.lua
 2023-01-02 16:56:29 +01:00
Applevangelist
112457cb4b Merge remote-tracking branch 'origin/master' into develop 2023-01-02 16:55:49 +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
Thomas
8ed85795c6
#TIMER (#1867) 
* Added `StartIf()`
 2023-01-02 13:34:32 +01:00
Thomas
671f4a131e
Update FlightGroup.lua 
Output 3775 AddWaypoint Controls
 2023-01-02 13:32:51 +01:00
Thomas
9680f38dc8
Update Auftrag.lua 
NewCAP Line 1313: mission.missionSpeed = UTILS.KnotsToKmph(UTILS.KnotsToAltKIAS(Speed or 350, Altitude))
 2023-01-02 13:28:36 +01:00
Frank
92710f4625
Merge pull request #1866 from FlightControl-Master/FF/Ops 
Zones
 2023-01-02 12:08:37 +01:00
Frank
58dc353bcd ZONE 2023-01-02 11:54:05 +01:00
Frank
b194985827 Merge branch 'develop' into FF/Ops 2023-01-01 20:10:28 +01:00
Frank
bdd283956c AUFTRAG CAP 
- Fixed mission speed (unit conversion)
 2023-01-01 20:07:14 +01:00
Frank
a9b0017c04 OPS 
request
 2023-01-01 20:01:36 +01:00
Applevangelist
d36ceb861a FG Mission Speed Fix 2023-01-01 13:30:46 +01:00
Applevangelist
8f185d1291 #TIMER 
* Added `StartIf()`
 2023-01-01 12:34:32 +01:00
Applevangelist
5d802f0e16 #TIMER 
* Added `StartIf()`
 2023-01-01 12:34:02 +01:00
Applevangelist
6fa3f0a11c #TIMER 
* Added `StartIf()`
 2023-01-01 12:33:35 +01:00
Applevangelist
144521936a Merge branch 'develop-2' into develop 2023-01-01 11:48:11 +01:00
Frank
9564d9d893
Merge pull request #1861 from FlightControl-Master/FF/Ops 
Update FlightGroup.lua
 2023-01-01 09:30:15 +01:00