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

2386 Commits

Author SHA1 Message Date
Applevangelist
4ac583e434 SRS changes 2024-01-09 17:28:58 +01:00
Applevangelist
7995940579 SRS changes 2024-01-09 17:27:26 +01:00
Applevangelist
3ffdb4fe4b Merge remote-tracking branch 'origin/develop' into develop 2024-01-09 08:59:47 +01:00
Applevangelist
b315375ade xxx 2024-01-09 08:58:07 +01:00
Frank
becaf47a66 Merge branch 'develop' into FF/Ops 2024-01-07 21:16:15 +01:00
Applevangelist
57919704be Merge remote-tracking branch 'origin/develop' into develop 2024-01-07 18:08:34 +01:00
Frank
e26647c2ca OPSTRANSPORT 
- Fixed SET not working with FilterActive
 2024-01-07 17:24:51 +01:00
Applevangelist
4ddd278471 #AWACS 
* Picture clean, correct order of callsigns
 2024-01-07 15:40:17 +01:00
Applevangelist
20f881f0a9 #AWACS 
* Picture clean, correct order of callsigns
 2024-01-07 15:40:08 +01:00
Applevangelist
7275a934a2 Merge remote-tracking branch 'origin/develop' into develop 2024-01-07 14:45:38 +01:00
Applevangelist
72e31b90a9 Merge remote-tracking branch 'origin/master' into develop 2024-01-07 14:44:45 +01:00
ttrebuchon
677d888d96
Use total cargo weight when computing asset score for transport missions (#2065) 
* Optimize carrier assets for OPSTRANSPORT based on total cargo weight

* Clean up code/comments for TotalWeight scoring

* Add missing parameter documentation
 2024-01-07 13:26:58 +01:00
Applevangelist
06c3ca0079 MSRS additions 2024-01-07 13:25:32 +01:00
Applevangelist
cf4d35efa2 xxx 2024-01-07 13:25:14 +01:00
Applevangelist
9280a1224d MSRS additions 2024-01-07 13:23:50 +01:00
Applevangelist
4758af61c2 Merge remote-tracking branch 'origin/master' into develop 2024-01-06 18:22:36 +01:00
Applevangelist
729c1f5e33 Fixes for MSRS changes 
#STRATEGO
* fix for an AB not having a zone
 2024-01-06 18:22:18 +01:00
Applevangelist
fce7b07014 Fixes for MSRS changes 2024-01-06 18:21:39 +01:00
Applevangelist
45fb191483 Fixes for MSRS changes 2024-01-06 18:21:10 +01:00
Applevangelist
0db96082a1 xxx 2024-01-06 18:17:56 +01:00
Applevangelist
0d224ee2fd Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 16:09:59 +01:00
Applevangelist
048ab6acfe Fixes for 4th SRS Parameter 2024-01-05 16:09:05 +01:00
Applevangelist
0c3caffe93 Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 15:44:32 +01:00
Applevangelist
e2bf1f727d FLIGHTGROUP - Amending landing on an AFB w/o runways 
SRS - some improvements
 2024-01-05 15:37:52 +01:00
Applevangelist
b329bf8088 xxx 2024-01-05 12:13:18 +01:00
Applevangelist
65315251b5 PLAYERTASK, AWACS - small fix for the revamped SRS 2024-01-05 12:13:04 +01:00
Applevangelist
b40c1e4575 Fixes 2024-01-04 18:49:47 +01:00
Applevangelist
8171e3aad2 xxx 2024-01-04 18:48:26 +01:00
Frank
9ea8443286 Merge branch 'develop' into FF/Ops 2024-01-04 15:13:46 +01:00
Applevangelist
039be9790d Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 14:02:09 +01:00
Applevangelist
65fb22b6cc xxx 2024-01-04 14:00:43 +01:00
Applevangelist
67bd4429f5 Merge remote-tracking branch 'origin/master' into develop 2024-01-04 11:29:06 +01:00
Frank
f80e7a2166 Merge branch 'master' into develop 2024-01-03 22:32:50 +01:00
Frank
9b95e71d75 Update Airboss.lua 
- Potential fix for error raised on discord
 2024-01-03 22:32:37 +01:00
Applevangelist
f8a3e7fc2e Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Functional/Stratego.lua
#	Moose Development/Moose/Functional/Tiresias.lua
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
 2024-01-03 18:16:59 +01:00
Applevangelist
8910311c5c Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_Balancer.lua
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua
 2024-01-03 18:15:58 +01:00
kaltokri
4e50bd213c No fixes for broken links 2024-01-03 09:04:43 +01:00
kaltokri
c813e2dbc4 Fixed broken links 2024-01-03 07:53:41 +01:00
kaltokri
761d83a68f Fix broken link in Awacs.lua 2024-01-02 22:10:08 +01:00
kaltokri
d6a0fff993 Fix for broken links in documentation 2024-01-02 20:03:18 +01:00
Frank
f76fa58a5f Merge branch 'develop' into FF/Ops 2024-01-02 17:07:03 +01:00
kaltokri
b20eb84d19 Merge branch 'master' into develop 2024-01-02 13:33:40 +01:00
kaltokri
64d7946c06 Fix for broken links in master branch 2024-01-02 13:33:10 +01:00
Frank
c8b36b8c99 Merge branch 'develop' into FF/Ops 2024-01-01 21:54:51 +01:00
kaltokri
58d9637c5d Merge branch 'master' into develop 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
 2024-01-01 15:54:53 +01:00
Applevangelist
d640acc7cc docu 2024-01-01 13:07:08 +01:00
Applevangelist
e36f5b3fbd xxx 2024-01-01 13:06:52 +01:00
Applevangelist
7557e79c0c Merge branch 'master' into develop 2023-12-29 15:03:09 +01:00
Applevangelist
9cc32ff8dc AIRBOSS - Superfluous error message removal 2023-12-29 15:02:41 +01:00
Applevangelist
3a4c5e307c AIRBOSS - Superfluous error message removal 2023-12-29 15:02:20 +01:00