Merge remote-tracking branch 'refs/remotes/origin/FlightControl' into FlightControl-task-cargo-transport

# Conflicts: # Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua # Moose Mission Setup/Moose.lua # Moose Test Missions/TSK - Task Modelling/TSK-020 - Task Modelling - Pickup/TSK-020 - Task Modelling - Pickup.miz
2025-08-15 10:47:21 +00:00 · 2017-03-28 06:34:03 +02:00
parent d9c4716127 30734bf64f
commit f74c660bf8
149 changed files with 309 additions and 190 deletions
--- a/Caucasus/APL-001
+++ b/Caucasus/APL-001
--- a/Nevada/APL-002
+++ b/Nevada/APL-002
--- a/CleanUp/ACL-001
+++ b/CleanUp/ACL-001
--- a/Balancing/AIB-001
+++ b/Balancing/AIB-001
--- a/Balancing/AIB-002
+++ b/Balancing/AIB-002
--- a/Balancing/AIB-003
+++ b/Balancing/AIB-003
--- a/Destroyed/AIB-004
+++ b/Destroyed/AIB-004
--- a/Balancing/AIB-005
+++ b/Balancing/AIB-005
--- a/Balancing/AIB-006
+++ b/Balancing/AIB-006
--- a/coalitions/AIB-007
+++ b/coalitions/AIB-007
--- a/Patrol/CAP-001
+++ b/Patrol/CAP-001
--- a/Patrol/CAP-010
+++ b/Patrol/CAP-010
--- a/Patrol/CAP-011
+++ b/Patrol/CAP-011
--- a/Patrol/CAP-012
+++ b/Patrol/CAP-012
--- a/Patrol/CAP-020
+++ b/Patrol/CAP-020
--- a/Support/CAS-001
+++ b/Support/CAS-001
--- a/Support/CAS-001
+++ b/Support/CAS-001
--- a/Support/CAS-002
+++ b/Support/CAS-002
--- a/Altitude/CAS-003
+++ b/Altitude/CAS-003
--- a/Support/CAS-004
+++ b/Support/CAS-004
--- a/WeaponExpend/CAS-005
+++ b/WeaponExpend/CAS-005
--- a/Helicopter/CAS-010
+++ b/Helicopter/CAS-010
--- a/Support/CAS-011
+++ b/Support/CAS-011
--- a/Support/CAS-111
+++ b/Support/CAS-111
--- a/Boarding/CGO-001
+++ b/Boarding/CGO-001
--- a/Unboarding/CGO-002
+++ b/Unboarding/CGO-002
--- a/Transferring/CGO-003
+++ b/Transferring/CGO-003
--- a/Boarding/CGO-101
+++ b/Boarding/CGO-101
--- a/Unboarding/CGO-102
+++ b/Unboarding/CGO-102
--- a/Transferring/CGO-103
+++ b/Transferring/CGO-103
--- a/Boarding/CGO-201
+++ b/Boarding/CGO-201
--- a/Unboarding/CGO-202
+++ b/Unboarding/CGO-202
--- a/Detection/DET-001
+++ b/Detection/DET-001
--- a/Detection/DET-100
+++ b/Detection/DET-100
--- a/Reporting/DET-101
+++ b/Reporting/DET-101
--- a/Detection/DET-120
+++ b/Detection/DET-120
--- a/Detection/DET-120
+++ b/Detection/DET-120
--- a/Detection/DET-200
+++ b/Detection/DET-200
--- a/Detection/DET-210
+++ b/Detection/DET-210
--- a/Detection/DET-250
+++ b/Detection/DET-250
--- a/Detection/DET-255
+++ b/Detection/DET-255
--- a/Detection/DET-500
+++ b/Detection/DET-500
--- a/Detection/DET-900
+++ b/Detection/DET-900
--- a/Helicopters/ESC-001
+++ b/Helicopters/ESC-001
--- a/Handling/EVT-001
+++ b/Handling/EVT-001
--- a/Handling/EVT-100
+++ b/Handling/EVT-100
--- a/Handling/EVT-101
+++ b/Handling/EVT-101
--- a/Handling/EVT-102
+++ b/Handling/EVT-102
--- a/Handling/EVT-103
+++ b/Handling/EVT-103
--- a/Handling/EVT-104
+++ b/Handling/EVT-104
--- a/Handling/EVT-200
+++ b/Handling/EVT-200
--- a/Handling/EVT-201
+++ b/Handling/EVT-201
--- a/Handling/EVT-401
+++ b/Handling/EVT-401
--- a/LandingChallenge/EVT-500
+++ b/LandingChallenge/EVT-500
--- a/LandingChallengeComplex/EVT-501
+++ b/LandingChallengeComplex/EVT-501
--- a/Handling/EVT-600
+++ b/Handling/EVT-600
--- a/Explanation/FSM-100
+++ b/Explanation/FSM-100
--- a/Commands/GRP-100
+++ b/Commands/GRP-100
--- a/TaskAttackUnit/GRP-100
+++ b/TaskAttackUnit/GRP-100
--- a/Commands/GRP-200
+++ b/Commands/GRP-200
--- a/WayPoints/GRP-300
+++ b/WayPoints/GRP-300
--- a/StopRoute/GRP-310
+++ b/StopRoute/GRP-310
--- a/RouteReturnToAirbase/GRP-400
+++ b/RouteReturnToAirbase/GRP-400
--- a/Commands/Moose_Test_WRAPPER.miz
+++ b/Commands/Moose_Test_WRAPPER.miz
--- a/Options/MEN-001
+++ b/Options/MEN-001
--- a/Coalition/MEN-002
+++ b/Coalition/MEN-002
--- a/Options/MEN-003
+++ b/Options/MEN-003
--- a/Trainer/MIT-001
+++ b/Trainer/MIT-001
--- a/Missions/MOOSE_Template.miz
+++ b/Missions/MOOSE_Template.miz
--- a/Missions/MOOSE_Test_Template.miz
+++ b/Missions/MOOSE_Test_Template.miz
--- a/Patrolling/PAT-001
+++ b/Patrolling/PAT-001
--- a/Static/RAD-000
+++ b/Static/RAD-000
--- a/GROUP/RAD-001
+++ b/GROUP/RAD-001
--- a/Tricks/RAD-002
+++ b/Tricks/RAD-002
--- a/Scheduling/SCH-000
+++ b/Scheduling/SCH-000
--- a/Scheduling/SCH-001
+++ b/Scheduling/SCH-001
--- a/Scheduling/SCH-100
+++ b/Scheduling/SCH-100
--- a/Scheduling/SCH-110
+++ b/Scheduling/SCH-110
--- a/Scheduler/SCH-200
+++ b/Scheduler/SCH-200
--- a/Scheduling/SCH-300
+++ b/Scheduling/SCH-300
--- a/Scheduling/SCH-310
+++ b/Scheduling/SCH-310
--- a/Statics/SCO-100
+++ b/Statics/SCO-100
--- a/Scoring/SCO-101
+++ b/Scoring/SCO-101
--- a/Scoring/SCO-500
+++ b/Scoring/SCO-500
--- a/Sets/SET-001
+++ b/Sets/SET-001
--- a/Sets/SET-101
+++ b/Sets/SET-101
--- a/Sets/SET-201
+++ b/Sets/SET-201
--- a/Evasion/SEV-001
+++ b/Evasion/SEV-001
--- a/Spawning/SPA-010
+++ b/Spawning/SPA-010
--- a/Spawning/SPA-011
+++ b/Spawning/SPA-011
--- a/Spawning/SPA-012
+++ b/Spawning/SPA-012
--- a/Spawning/SPA-013
+++ b/Spawning/SPA-013
--- a/Spawning/SPA-014
+++ b/Spawning/SPA-014
--- a/Spawning/SPA-015
+++ b/Spawning/SPA-015
--- a/Spawning/SPA-016
+++ b/Spawning/SPA-016
--- a/spawning/SPA-017
+++ b/spawning/SPA-017
--- a/Templates/SPA-018
+++ b/Templates/SPA-018
--- a/Waypoints/SPA-019
+++ b/Waypoints/SPA-019
--- a/Waypoints/SPA-020
+++ b/Waypoints/SPA-020
--- a/Spawning/SPA-021
+++ b/Spawning/SPA-021
--- a/Show More
+++ b/Show More