f555399e2f
Merge pull request #2231 from FlightControl-Master/master
...
Master merge
2025-01-28 08:32:34 +01:00
1b6945e0b0
Merge pull request #2230 from FlightControl-Master/Applevangelist-patch-2
...
Update Scenery.lua
2025-01-28 08:31:33 +01:00
4fd55b1bd6
Update Scenery.lua
...
#SCENERY
2025-01-28 08:31:17 +01:00
fb276cf812
Merge remote-tracking branch 'origin/master' into develop
2025-01-27 18:49:01 +01:00
41dfaab82a
xx
2025-01-27 18:48:39 +01:00
83e146f207
xx
2025-01-27 18:46:52 +01:00
20b8deb6de
Merge pull request #2228 from FlightControl-Master/Applevangelist-patch-2
...
Update CTLD.lua
2025-01-27 18:46:07 +01:00
6af836c118
Update CTLD.lua
2025-01-27 18:45:39 +01:00
f87b8a2c2a
Merge pull request #2229 from FlightControl-Master/Applevangelist-patch-3
...
Update Base.lua
2025-01-27 18:44:50 +01:00
daffd7412a
Update Base.lua
2025-01-27 18:44:35 +01:00
bfb60b318e
Update CTLD.lua
...
update
2025-01-27 13:27:13 +01:00
a55959dfbb
Update Base.lua
...
Added property functions
2025-01-27 12:00:25 +01:00
4d24eb82be
Update CTLD.lua
...
#CTLD - Add the group name of the extracted group to TroopsExtracted FSM event
2025-01-27 08:51:17 +01:00
b115a0a672
Merge remote-tracking branch 'origin/develop' into branch
2025-01-26 17:35:56 +01:00
0c384a75cc
Merge remote-tracking branch 'origin/master' into branch
2025-01-26 17:35:51 +01:00
c19d20c3f7
xxx
2025-01-26 17:35:30 +01:00
4656d3e019
Merge remote-tracking branch 'origin/develop' into develop
2025-01-26 17:35:11 +01:00
86b76ba216
Merge remote-tracking branch 'origin/master' into develop
2025-01-26 17:35:06 +01:00
ff561410ad
xx
2025-01-26 17:34:36 +01:00
e26caa2f74
smaller fixes
2025-01-26 17:34:22 +01:00
c7bc55d851
Merge remote-tracking branch 'origin/develop' into branch
2025-01-26 14:55:59 +01:00
245dd6bb27
Merge remote-tracking branch 'origin/master' into branch
2025-01-26 14:55:47 +01:00
b32d17c2ab
Merge remote-tracking branch 'origin/develop' into develop
2025-01-26 14:55:24 +01:00
29111e1018
xx
2025-01-26 14:55:21 +01:00
3433ebd665
Merge remote-tracking branch 'origin/master' into develop
2025-01-26 14:54:53 +01:00
b75fff60c8
xx
2025-01-26 14:54:19 +01:00
a47fa3f9fc
Merge remote-tracking branch 'origin/master' into develop
2025-01-26 13:54:59 +01:00
4ac57fce7a
#CTLD - Added CTLD:GetGenericCargoObjectFromGroupName(GroupName) to get the generic CTLD_CARGO entry from a group name.
2025-01-26 13:54:28 +01:00
6218b94c99
Merge remote-tracking branch 'origin/develop' into develop
2025-01-26 13:29:57 +01:00
74a6c89801
Merge remote-tracking branch 'origin/master' into develop
2025-01-26 13:29:53 +01:00
25a9a0120a
#CTLD
...
- If stock is set, show stock number in menu entries
- Corrected table build for GetStockCrates/Troops/Statics
2025-01-26 13:29:18 +01:00
deb0747e66
Merge pull request #2227 from shaji-Dev/develop
...
[FIXED] `bad argument #2 to 'format' (number expected, got nil)`
2025-01-26 08:38:11 +01:00
00f5fde5a8
[FIXED] bad argument #2 to 'format' (number expected, got nil)
2025-01-26 00:19:19 +02:00
ff4f162ca2
Merge remote-tracking branch 'origin/develop' into branch
2025-01-25 15:58:06 +01:00
baf3f9a9a4
Merge remote-tracking branch 'origin/master' into branch
...
# Conflicts:
# Moose Development/Moose/Ops/CTLD.lua
2025-01-25 15:57:59 +01:00
03cd354f9e
Merge remote-tracking branch 'origin/master' into develop
2025-01-25 15:55:01 +01:00
ae65fce9cd
xx
2025-01-25 15:54:42 +01:00
66a1fa8af5
#CTLD - small fix for LoadesGroupsTable inserts
2025-01-25 15:54:29 +01:00
5e856b67a1
Merge remote-tracking branch 'origin/develop' into branch
2025-01-25 15:07:38 +01:00
f365c5153b
Merge remote-tracking branch 'origin/master' into branch
2025-01-25 15:07:16 +01:00
c2096c8dfd
Merge remote-tracking branch 'origin/master' into develop
2025-01-25 15:06:40 +01:00
1b4033cfce
CTLD Small fix for PlayerTask ExtractTroops
2025-01-25 15:04:33 +01:00
a11cda4ed1
Merge remote-tracking branch 'origin/develop' into branch
2025-01-24 12:26:38 +01:00
9faa1b806d
Merge remote-tracking branch 'origin/master' into branch
2025-01-24 12:26:30 +01:00
750edf1144
Merge remote-tracking branch 'origin/master' into develop
2025-01-24 12:22:24 +01:00
f533d4ec8f
xxx
2025-01-24 12:22:00 +01:00
48bc41873a
#STORAGE - Added small helper to get Syria "H" Helipad warehouses via a zone
2025-01-24 12:21:44 +01:00
2e54f51229
Merge remote-tracking branch 'origin/develop' into develop
2025-01-24 10:30:29 +01:00
e39e414e0d
Merge remote-tracking branch 'origin/master' into develop
2025-01-24 10:30:25 +01:00
068a1ab99c
#CTLD
...
- Added `OnAfterLoaded` which gives you access to the rebuild troops and vehicles in a table of loaded groups, each entry is a table with three values: Group, TimeStamp and CargoType
2025-01-24 10:29:52 +01:00
Thomas