Commit Graph

11126 Commits

Author SHA1 Message Date
Applevangelist cbb6d2c712 fixes 2025-11-22 15:25:02 +01:00
Applevangelist c869d23778 #ZONE - Small fix 2025-11-22 15:15:24 +01:00
Applevangelist 5edffbbca4 #SET - Small fix 2025-11-22 15:14:57 +01:00
Applevangelist 01f2b6b783 #EVENT - Small fix 2025-11-22 15:13:43 +01:00
Applevangelist f4a2ae8ccc xx 2025-11-16 16:52:41 +01:00
Applevangelist 4bc25c6043 Merge remote-tracking branch 'origin/develop' into branch 2025-11-15 16:59:23 +01:00
Applevangelist 0de95b1830 #image path 2025-11-15 16:58:56 +01:00
Applevangelist d25acf1065 Merge remote-tracking branch 'origin/develop' into branch
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
2025-11-15 16:52:18 +01:00
Applevangelist 742103ff02 Merge remote-tracking branch 'origin/master' into branch 2025-11-15 16:51:34 +01:00
Applevangelist f93a1959b4 xx 2025-11-15 16:51:06 +01:00
Applevangelist ccaf926c6d #FORMATION - move useable #FORMATION class from AI into functional
#AIRBOSS - add F-14A Early model support
2025-11-15 16:49:20 +01:00
Applevangelist 26fbae8672 #AIRBOSS Added early F-14A 2025-11-15 16:48:05 +01:00
Applevangelist aebb6a359b Merge remote-tracking branch 'origin/develop' into branch 2025-11-14 17:27:57 +01:00
Applevangelist 500f113f95 Merge remote-tracking branch 'origin/master' into branch 2025-11-14 17:27:49 +01:00
Applevangelist b983e9f8b4 SXX 2025-11-14 17:27:26 +01:00
Applevangelist cdbf1e147e Merge remote-tracking branch 'origin/master' into develop 2025-11-14 17:27:02 +01:00
Applevangelist 5089e7df25 xx 2025-11-14 17:26:24 +01:00
Thomas 1de19731d0 Merge pull request #2446 from FlightControl-Master/master
merge from master
2025-11-14 13:46:24 +01:00
Thomas 0c0d1cc794 Merge pull request #2445 from shaji-Dev/master
[ADDED] STATIC:GetVec2Cached() and STATIC:GetVec3Cached()
2025-11-14 13:45:22 +01:00
Shafik 21b968a9c6 [ADDED] STATIC:GetVec2Cached() and STATIC:GetVec3Cached() for statics considering respawns 2025-11-14 14:42:52 +02:00
Applevangelist d857e3acad #NAVIGATION - some fixes and additions 2025-11-14 13:23:57 +01:00
Applevangelist 856197a5c8 xx 2025-11-14 13:20:39 +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
Applevangelist a8de630ecf Merge remote-tracking branch 'origin/master' into branch 2025-11-13 14:08:20 +01:00
Thomas d7b0b3c898 Merge pull request #2444 from FlightControl-Master/master
Merge from master
2025-11-11 12:57:41 +01:00
Thomas 704bb8668f Merge pull request #2443 from FlightControl-Master/Applevangelist-DC-1
Update DynamicCargo.lua
2025-11-11 12:54:42 +01:00
Thomas 763bfb4bb1 Update DynamicCargo.lua
Added Destroy-Functionality
2025-11-11 12:41:30 +01:00
Frank 16706cd483 Merge pull request #2442 from FlightControl-Master/FF/Ops
New Classes + OPS Improvements
2025-11-09 22:02:44 +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
Applevangelist 7c37160fb7 Merge remote-tracking branch 'origin/develop' into branch 2025-11-09 17:22:45 +01:00
Applevangelist 2e263561d3 Merge remote-tracking branch 'origin/master' into branch
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
2025-11-09 17:22:36 +01:00
Applevangelist c10e57ec3b Merge remote-tracking branch 'origin/master' into develop 2025-11-09 17:19:57 +01:00
Applevangelist 046bd37fd5 xx 2025-11-09 17:19:29 +01:00
Applevangelist 55c3e7aba6 Merge remote-tracking branch 'origin/master' into develop 2025-11-09 16:53:39 +01:00
Applevangelist fbf83b3aed #SET - Rationalize FilterCoalitions() and allow values like coalition.side.BLUE 2025-11-09 16:53:10 +01:00
Applevangelist 255a652d4d xx 2025-11-09 16:52:30 +01:00
Frank ea60795e84 Assets
- remove assets from warehouse if they are removed from cohort
2025-11-09 16:21:38 +01:00
Applevangelist aa2cff69e9 Merge remote-tracking branch 'origin/develop' into branch 2025-11-09 14:44:12 +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 4fba2e4abd Merge remote-tracking branch 'origin/develop' into branch 2025-11-09 14:25:41 +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
Thomas 98d02d7532 Merge pull request #2440 from leka1986/patch-2
Update CTLD.lua
2025-11-09 09:24:48 +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