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

7456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
2537fc44bb Merge remote-tracking branch 'origin/master' into develop 2023-07-03 17:29:36 +02:00
Applevangelist
10872918bb #AUFTRAG 
* Added GROUNDESCORT from the DCS Task with same name
 2023-07-03 17:29:06 +02:00
Applevangelist
7dd270dc8b #GROUND ESCORT 2023-07-03 17:26:47 +02:00
Applevangelist
8979097fd7 Merge remote-tracking branch 'origin/master' into develop 2023-07-03 17:06:47 +02:00
Applevangelist
71b2cc1ee5 #AMMOTRUCK 
* Added TTL
 2023-07-03 17:06:31 +02:00
Applevangelist
be3fc2c964 #GROUNDESCORT 2023-07-03 17:05:54 +02:00
Applevangelist
0d6fe49a41 changes 2023-07-03 16:45:02 +02:00
Applevangelist
8c8ef19f01 #CONTROLLABLE 
* Added TaskGroundEscort
 2023-07-03 16:44:46 +02:00
Thomas
ffcfc448be
Update Controllable.lua 2023-07-03 13:53:59 +02:00
Thomas
303a15eb50
Ammotruck 
* Added feature for # of re-munitions a truck can do
 2023-07-03 12:21:05 +02:00
Applevangelist
ebf3d8d55e Merge remote-tracking branch 'origin/develop' into develop 2023-07-01 13:17:58 +02:00
Applevangelist
3909a4b2dc Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:17:51 +02:00
Applevangelist
389d5c7e5b Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:17:19 +02:00
Applevangelist
1eaa3d309d #SCORING 
* typo
 2023-07-01 13:15:59 +02:00
Applevangelist
30f8a57556 Merge remote-tracking branch 'origin/develop' into develop 2023-07-01 13:15:31 +02:00
Applevangelist
03a18d5237 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Functional/Scoring.lua
#	Moose Development/Moose/Utilities/Utils.lua
 2023-07-01 13:15:24 +02:00
Applevangelist
178005346d Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:12:54 +02:00
Applevangelist
a52cd5612a Merge remote-tracking branch 'origin/master' 2023-07-01 13:12:29 +02:00
Applevangelist
041c21a883 Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:12:03 +02:00
Applevangelist
e82ed762be Merge remote-tracking branch 'origin/master' 2023-07-01 13:11:46 +02:00
Applevangelist
0bb16ec827 #AIRBASE 
* Fix for nil error in finding parking for a group

#MANTIS
* Added SAM type "SHORAD" as designator

#SCORING
* fix for non local problem

#UTILS
* fix for OneLineSerialize
 2023-07-01 13:11:21 +02:00
Applevangelist
fd946e971a #AWACS 
* Bugfixes
 2023-07-01 13:08:27 +02:00
Applevangelist
b3e9a2b64d #fixes 2023-07-01 13:08:00 +02:00
Applevangelist
23740d12eb Merge remote-tracking branch 'origin/develop' into develop 2023-06-26 17:29:40 +02:00
Applevangelist
52138eee98 Merge remote-tracking branch 'origin/master' into develop 2023-06-26 17:29:34 +02:00
Applevangelist
c7a66e0f99 #Fixes 2023-06-26 17:29:02 +02:00
Thomas
0dab316514
Point - BRAANATO (#1969) (#1970) 
corrected Track to be direction of travel of bogey (self in this case)
 2023-06-26 13:29:34 +02:00
Thomas
a978420a67
Point - BRAANATO (#1969) 
corrected Track to be direction of travel of bogey (self in this case)
 2023-06-26 13:25:23 +02:00
Applevangelist
248228720e Merge remote-tracking branch 'origin/master' into develop 2023-06-24 14:04:32 +02:00
Applevangelist
f59326bf10 #ATIS 
* Fix for airbases which have no runways, e.g. Naqoura Syria
 2023-06-24 14:03:43 +02:00
Applevangelist
e9c1b6d268 Merge remote-tracking branch 'origin/master' into develop 2023-06-22 13:52:19 +02:00
Thomas
08be2d6e93
CTLD (#1967) (#1968) 
* Added option for troops subcategories in menu
 2023-06-22 13:49:21 +02:00
Thomas
d937ab2679
CTLD (#1967) 
* Added option for troops subcategories in menu
 2023-06-22 13:46:11 +02:00
Applevangelist
a2d3205701 #CTLD 
* Added option for troops subcategories
 2023-06-22 13:41:58 +02:00
Applevangelist
e8ab86ab7f #CTLD 
* Added categories for Troops
 2023-06-22 12:57:08 +02:00
Applevangelist
abf694aa81 # Docu fixes 2023-06-22 12:19:20 +02:00
Applevangelist
24c58acf85 #AIRBOSS 
* Bugfix
 2023-06-22 09:34:21 +02:00
Applevangelist
ac386d5ebe #AIRBOSS 
* Bug fix
 2023-06-22 09:34:02 +02:00
Frank
74c1e9d991 Merge branch 'develop' into FF/Ops 2023-06-21 22:00:14 +02:00
Frank
0e72717cdb OPSGROUP 
Track
 2023-06-21 22:00:04 +02:00
Applevangelist
37cbafde3e Merge remote-tracking branch 'origin/develop' into develop 2023-06-21 14:05:54 +02:00
Applevangelist
1df525b9c5 #NAVY 
* Min speed 4kn due to rudder effectiveness
 2023-06-21 14:05:17 +02:00
Applevangelist
cdbbad809a Merge remote-tracking branch 'origin/master' into develop 2023-06-21 10:43:40 +02:00
Applevangelist
8af5a532e3 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 10:43:08 +02:00
Applevangelist
7164e211f2 #AIRBASE 
- Nicosia unused atm
 2023-06-21 10:42:35 +02:00
Applevangelist
a5fa33e72f Merge remote-tracking branch 'origin/develop' into develop 2023-06-21 10:25:52 +02:00
Applevangelist
925ac7907b #AIRBOSS SRS 2023-06-21 10:25:30 +02:00
Applevangelist
970275e96e #AIRBOSS 
* Added adjustment degrees for wind speed
 2023-06-21 10:25:00 +02:00
Applevangelist
c88bb3bbdb #PLAYERTASKCONTROLLER 
* Menu build lock
 2023-06-18 13:29:25 +02:00
Applevangelist
5456cd04c3 #PLAYERTASKCONTROLLER 
* Menu build lock
 2023-06-18 13:29:07 +02:00