Commit Graph

2697 Commits

Author SHA1 Message Date
Applevangelist f4a2ae8ccc xx 2025-11-16 16:52:41 +01:00
Applevangelist 742103ff02 Merge remote-tracking branch 'origin/master' into branch 2025-11-15 16:51:34 +01:00
Applevangelist 26fbae8672 #AIRBOSS Added early F-14A 2025-11-15 16:48:05 +01:00
Applevangelist 6f05249214 XX 2025-11-13 15:54:47 +01:00
Applevangelist c9c6d5dbc2 Merge remote-tracking branch 'origin/develop' into branch
# Conflicts:
#	Moose Development/Moose/Core/Fsm.lua
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Modules_local.lua
2025-11-13 14:09:12 +01:00
Frank 505c86399c Merge branch 'develop' into FF/Ops 2025-11-09 21:46:36 +01:00
Frank 65ddff13f7 OPS Ammo
- Added guns/cannons differentiation to ammo count
2025-11-09 21:46:23 +01:00
Frank bedd105649 Update Auftrag.lua
- added NAVALENGAGEMENT to :NewFromTarget
2025-11-09 18:22:39 +01:00
Frank ea60795e84 Assets
- remove assets from warehouse if they are removed from cohort
2025-11-09 16:21:38 +01:00
Applevangelist 0789fb7f08 Merge remote-tracking branch 'origin/master' into branch 2025-11-09 14:44:05 +01:00
Applevangelist 4a5e262695 Merge remote-tracking branch 'origin/master' into develop 2025-11-09 14:43:32 +01:00
Applevangelist 22097987dc #CTLD, #DYNAMICCARGO - C-130j-30 additions 2025-11-09 14:43:11 +01:00
Applevangelist 9670f26619 Merge remote-tracking branch 'origin/master' into branch 2025-11-09 14:25:35 +01:00
Thomas 94617e573f Merge pull request #2441 from FlightControl-Master/master
Merge from master
2025-11-09 09:28:05 +01:00
leka1986 7b44e7a3f6 Update CTLD.lua
Removed quantity menu if there is only one set.
2025-11-09 02:16:02 +01:00
leka1986 aa4cf37aed Clean up comments in CTLD.lua
Removed unnecessary comment lines in CTLD.lua.
2025-11-08 02:52:23 +01:00
leka1986 caf2b4e736 Update CTLD.lua
Added ability to drop "Sets" from 2 and up will be sets, else it will be like before.

Changed _PackCratesNearby to handle all cargo within the range instead of the nearest.
2025-11-08 02:47:56 +01:00
Frank 1267a64fcb Ops Navy Update 2025-11-06 23:26:30 +01:00
Frank 74c3b9fbcb Update Auftrag.lua 2025-11-05 22:05:02 +01:00
Thomas d5792fb02a Merge pull request #2438 from FlightControl-Master/master
Merge
2025-11-05 06:23:06 +01:00
leka1986 e9237146a3 Update CTLD.lua
Fixed a bug. 

When dropping crates, while choosing "Drop and build" The first drop will put the crate into a crate that can be loaded but a second later, that crate will be cleaned up due to build. This makes sure that the crates are not in the "load crates" list.
2025-11-04 20:09:48 +01:00
Shafik 2f39e38264 [ADDED] CTLD. option to load back crates from save file. 2025-11-04 11:32:24 +02:00
Shafik db54672fbd [ADDED] CTLD. option to load back crates from save file. 2025-11-04 11:30:59 +02:00
Thomas 4ade4c78ba Merge pull request #2435 from FlightControl-Master/master
Merge
2025-11-03 06:30:00 +01:00
nasgroup94 be220b6c1d more T-45 AOA adjustments 2025-11-02 19:48:16 -05:00
Frank e194d6073f OPS improvements
- AUFTRAG success is checked based on really alive targets
- AUFTRAG is done if all groups are done with the mission
2025-11-02 22:45:52 +01:00
Thomas 38858cd01f Merge pull request #2433 from FlightControl-Master/master
Merge from Master
2025-11-02 18:05:46 +01:00
Thomas c2a630dabd Update CTLD.lua
Cargo counters by @lekaa
2025-11-02 17:56:55 +01:00
Applevangelist 30cf1f5713 #PLAYERTASK/MANAGER
- Option to Cancel a task silently
- Option to allow smoking per task (default: true)
- Option to show threat details per task (default: true)
2025-11-02 14:22:56 +01:00
Applevangelist e197f88510 xx 2025-11-02 13:04:37 +01:00
Applevangelist b07accdb3d xx 2025-11-02 09:54:16 +01:00
Applevangelist 50827b3b60 Merge remote-tracking branch 'origin/master' into branch 2025-11-02 09:53:58 +01:00
Thomas 33f7a7084c Merge pull request #2431 from FlightControl-Master/master
Merge from master
2025-11-01 17:26:25 +01:00
Applevangelist 1ecc3c8ff2 Merge remote-tracking branch 'origin/master' into branch 2025-10-26 16:20:13 +01:00
nasgroup94 4a1b23c52a added Tomcat AA grading adjustments and T45 AOA adjustments 2025-10-26 09:43:17 -04:00
Thomas 1965e24860 Merge pull request #2424 from FlightControl-Master/master
Merge from master
2025-10-26 07:31:50 +01:00
Frank 654f752ca0 Merge branch 'develop' into FF/Ops 2025-10-25 21:17:01 +02:00
nasgroup94 2c5d9f043e fixed TIG bug causing NG Removed old into wind function 2025-10-25 12:42:09 -04:00
nasgroup94 2b2acbe244 Merge branch 'master' of https://github.com/nasgroup94/MOOSE 2025-10-25 12:39:54 -04:00
Applevangelist 3da6187782 #AUFTRAG, #OPSGROUP - close issue #2201 2025-10-25 16:53:53 +02:00
Applevangelist 0bd79d518f Merge remote-tracking branch 'origin/master' into develop 2025-10-24 16:27:53 +02:00
Applevangelist 86798ae9ea #CTLD - fix 2025-10-24 16:27:17 +02:00
Thomas dfc63de745 Merge pull request #2422 from FlightControl-Master/master
Merge from master
2025-10-24 16:17:15 +02:00
leka1986 8c07573f8f Update CTLD.lua 2025-10-24 16:13:18 +02:00
leka1986 f3af0262df Update CTLD.lua
Added Crates amount to the menus and AddCratesCargoNoMove.
2025-10-24 14:02:06 +02:00
Applevangelist 92db68c36b Merge remote-tracking branch 'origin/master' into develop 2025-10-23 08:11:11 +02:00
Applevangelist 8432f46e48 #AIRBOSS - Fixed omission of magnetic in expected BRC call 2025-10-23 08:10:26 +02:00
nasgroup94 faccee88e7 added missing end to TIG "_OK_" subtraction 2025-10-22 05:19:50 -04:00
Thomas eb4e7b9281 Revert "Minor fixes" 2025-10-22 07:23:21 +02:00
Thomas 1f1a068d45 Revert "Merge from master" 2025-10-22 07:16:33 +02:00