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

8674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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