weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-31 23:39:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,086 Commits 15 Branches 93 Tags
99a55a3c8a0fce6175ef67dbc3fd3c94de5c50c9
Commit Graph

5992 Commits

Author SHA1 Message Date
Applevangelist 8cedd88ce2 #SCENERY - explain destroy doesn't work 2023-01-05 10:58:40 +01:00
Applevangelist 21a2df0830 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 10:49:13 +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 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 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 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
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 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 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 fe01c6196e Update FlightGroup.lua 
- fixed bug that mission does not exist
 2023-01-01 09:27:05 +01:00
Frank c8d9377dbb Merge pull request #1860 from FlightControl-Master/FF/Ops 
OPS
 2023-01-01 01:08:59 +01:00
Frank d53f01232d OPS 2023-01-01 01:06:02 +01:00
Applevangelist 1d3abdb268 Merge remote-tracking branch 'origin/develop' into develop 2022-12-31 18:09:08 +01:00
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