Commit Graph

8879 Commits

Author SHA1 Message Date
Thomas c781c2fefb Merge pull request #2507 from FlightControl-Master/master-ng
Merge from master
2026-02-09 18:51:33 +01:00
smiki 2109222d12 [ADDED] 268 Missing Warehouse EQP ENUMS 2026-02-09 18:24:25 +01:00
Applevangelist 1abebc54b2 Merge remote-tracking branch 'origin/master-ng' into develop 2026-02-08 15:12:57 +01:00
Applevangelist 1a70358e21 Merge remote-tracking branch 'origin/master-ng' into branch
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Functional/Artillery.lua
#	Moose Development/Moose/Functional/ZoneGoalCargo.lua
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Wrapper/Client.lua
#	Moose Development/Moose/Wrapper/Controllable.lua
2026-02-08 15:11:33 +01:00
Applevangelist 1729c14acc #ENUMS Added 2 storage items 2026-02-08 15:07:09 +01:00
Applevangelist 9e2a57a935 xx 2026-02-08 14:17:16 +01:00
Applevangelist e52c1199f9 Merge remote-tracking branch 'origin/master-ng' into develop 2026-02-08 14:16:44 +01:00
Applevangelist 176d614d86 #CONTROLLABLE - Rollback FunctionString Changes 2026-02-08 14:16:11 +01:00
Applevangelist 3003d069fe Merge remote-tracking branch 'origin/master-ng' into develop
# Conflicts:
#	Moose Development/Moose/Cargo/Cargo.lua
2026-02-08 12:36:26 +01:00
Applevangelist dfcbe6fd9b # CARGO CLASS Removal 2026-02-08 12:32:40 +01:00
Applevangelist 5a9277de90 xx 2026-02-08 12:08:00 +01:00
Applevangelist 3b4b385418 #CARGO Removal in Warehouse functions 2026-02-08 12:06:13 +01:00
Frank 63b916eeca Merge branch 'WarehouseOps' into develop 2026-02-07 22:35:01 +01:00
Frank 0beb6b2022 Warehouse & OpsTransport
**WAREHOUSE**
- Switched from AI_CARGO_DISPATCHER to OPSTRANSPORT

**OPSTRANSPORT**
- Fixed bugs
2026-02-07 22:34:36 +01:00
Applevangelist 17d33b460f Merge remote-tracking branch 'origin/master-ng' into branch 2026-02-07 16:59:42 +01:00
Applevangelist 9dc282b1d9 Merge remote-tracking branch 'origin/master-ng' into develop 2026-02-07 16:58:29 +01:00
Applevangelist 7ec43c9913 #CONTROLLABLE - Make waypoint function a bit more robust 2026-02-07 16:57:53 +01:00
Thomas 9df39f9646 Merge pull request #2504 from FlightControl-Master/master-ng
Merge
2026-02-07 09:10:23 +01:00
HawaiianRyan808 8bab24adbd Make RAT crudely predict where the ship will be at landing time instead of routing aircraft to where the ship is at spawn time. 2026-02-06 13:54:12 -06:00
Applevangelist 3261a59cee Merge remote-tracking branch 'origin/develop' into branch
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Modules_local.lua
2026-02-06 17:40:25 +01:00
Applevangelist 42731b5778 Merge remote-tracking branch 'origin/master-ng' into develop
# Conflicts:
#	Moose Development/Moose/Core/Event.lua
2026-02-06 17:29:44 +01:00
Applevangelist 80d2c9871d xx 2026-02-06 17:29:03 +01:00
Applevangelist d5b7a2e168 Restore Cargo Events in EVENT until Franky has finished off Warehouse 2026-02-06 17:28:42 +01:00
Applevangelist ee610f5cc7 Merge remote-tracking branch 'origin/master-ng' into develop 2026-02-06 16:28:47 +01:00
Applevangelist 1830b4c752 #CONTROLLABLE
- Added OptionAllowFormationSideSwap()
- Added OptionAIRunwayLineup()
2026-02-06 16:28:11 +01:00
Applevangelist 486891d861 xx 2026-02-06 16:25:42 +01:00
Thomas d12ad85fbd Delete Moose Development/Moose/Modules_local.lua 2026-02-06 14:37:23 +01:00
Thomas d4de219032 Delete Moose Development/Moose/AI directory 2026-02-06 14:36:32 +01:00
Applevangelist aade99a0e6 Merge remote-tracking branch 'origin/master-ng' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_A2G_BAI.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/Modules_local.lua
2026-02-06 14:35:47 +01:00
Thomas 1781f5e7d6 Delete Moose Development/Moose/Functional/MissileTrainer.lua 2026-02-06 14:29:19 +01:00
Applevangelist f8b5bd8002 #RAT - added new RAT:SetMinCruiseSpeed() method from @HawaiianRyan 2026-02-06 14:10:48 +01:00
Thomas 1f71d11713 Update Modules.lua 2026-02-06 12:51:47 +01:00
Thomas bd6486fb8a Delete Moose Development/Moose/Modules_local.lua 2026-02-06 12:48:30 +01:00
Thomas d28ab00443 Delete Moose Development/Moose/Tasking directory
prep master-ng
2026-02-06 12:48:08 +01:00
Thomas 8cb06cc3b0 Delete Moose Development/Moose/Actions directory
prep master-ng
2026-02-06 12:47:49 +01:00
Thomas ea330128ca Delete Moose Development/Moose/AI directory
Prep master-ng branch
2026-02-06 12:47:29 +01:00
Applevangelist 9e2ad78330 Merge remote-tracking branch 'origin/master' into branch 2026-02-06 12:43:14 +01:00
shaji-Dev 49476abb9f Merge branch 'FlightControl-Master:master' into master 2026-02-06 11:27:21 +01:00
smiki a02b99036b [FIXED] nil function 2026-02-06 11:26:57 +01:00
Applevangelist 63ba258085 Merge remote-tracking branch 'origin/master' into develop 2026-02-05 12:21:31 +01:00
Applevangelist 5e2481af7a xx 2026-02-05 12:21:13 +01:00
Applevangelist dab6f48fe9 xx 2026-02-05 12:20:48 +01:00
Applevangelist d8dc953252 xx 2026-02-05 12:20:34 +01:00
Thomas 6dc840c24d Merge pull request #2498 from FlightControl-Master/master
Merge from master
2026-02-05 12:19:30 +01:00
smiki d0b04ebbbd Optimizations 2026-02-05 10:52:44 +01:00
smiki bd64d084e9 Optimizations 2026-02-05 10:49:48 +01:00
Thomas f6555a45ae Merge pull request #2496 from FlightControl-Master/master
Merge
2026-01-30 06:40:52 +01:00
smiki a699300f5f [ADDED] COMMANDER:CanMission(Mission) and CHIEF:CanMission(Mission) 2026-01-29 21:43:27 +01:00
smiki 6e12c5c1d0 [FIX] Added Alias to COMMANDER init from CHIEF 2026-01-29 18:34:37 +01:00
smiki 852fc1d2d5 Merge branch 'master' of https://github.com/shaji-Dev/MOOSE
# Conflicts:
#	Moose Development/Moose/Core/Event.lua
2026-01-29 18:33:35 +01:00