shaji-Dev
0ffcdf2f66
Merge branch 'FlightControl-Master:develop' into develop
2025-01-31 10:21:37 +02:00
Applevangelist
fe0edeb011
Merge remote-tracking branch 'origin/master' into develop
2025-01-30 18:33:06 +01:00
Applevangelist
d06e44d37b
#CTLD small additions
2025-01-30 18:32:39 +01:00
Applevangelist
8f5e519d0a
xxx
2025-01-30 18:32:01 +01:00
Applevangelist
85e4a6cbd6
Merge remote-tracking branch 'origin/master' into branch
2025-01-30 13:21:10 +01:00
Applevangelist
d06a618582
Merge remote-tracking branch 'origin/master' into develop
2025-01-30 13:20:35 +01:00
Applevangelist
4b16e94eaf
#CTLD - Added function for the game designer to get an overview of stock and alive groups, if they want to manage the stock: CTLD:_CountStockPlusInHeloPlusAliveGroups()
2025-01-30 13:19:11 +01:00
Applevangelist
0f9742aeb4
xx
2025-01-30 13:14:47 +01:00
Applevangelist
2d49745215
Merge remote-tracking branch 'origin/develop' into branch
2025-01-30 09:06:11 +01:00
Applevangelist
2b6a039368
Merge remote-tracking branch 'origin/master' into branch
...
# Conflicts:
# Moose Development/Moose/Core/Base.lua
2025-01-30 09:05:56 +01:00
Thomas
4530b74367
Merge pull request #2235 from FlightControl-Master/master
...
merge from master
2025-01-29 15:31:29 +01:00
Thomas
09d53f7d8c
Update CTLD.lua
...
#CTLD - Added HelicopterLost Event
2025-01-29 13:24:04 +01:00
Shafik
161bdc0413
[FIXED] attempt to concatenate field 'IniGroupName' (a nil value) ??
2025-01-29 10:13:34 +02:00
Applevangelist
fb276cf812
Merge remote-tracking branch 'origin/master' into develop
2025-01-27 18:49:01 +01:00
Applevangelist
41dfaab82a
xx
2025-01-27 18:48:39 +01:00
Applevangelist
83e146f207
xx
2025-01-27 18:46:52 +01:00
Thomas
6af836c118
Update CTLD.lua
2025-01-27 18:45:39 +01:00
Thomas
bfb60b318e
Update CTLD.lua
...
update
2025-01-27 13:27:13 +01:00
Thomas
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
Applevangelist
c19d20c3f7
xxx
2025-01-26 17:35:30 +01:00
Applevangelist
86b76ba216
Merge remote-tracking branch 'origin/master' into develop
2025-01-26 17:35:06 +01:00
Applevangelist
e26caa2f74
smaller fixes
2025-01-26 17:34:22 +01:00
Applevangelist
c7bc55d851
Merge remote-tracking branch 'origin/develop' into branch
2025-01-26 14:55:59 +01:00
Applevangelist
245dd6bb27
Merge remote-tracking branch 'origin/master' into branch
2025-01-26 14:55:47 +01:00
Applevangelist
3433ebd665
Merge remote-tracking branch 'origin/master' into develop
2025-01-26 14:54:53 +01:00
Applevangelist
b75fff60c8
xx
2025-01-26 14:54:19 +01:00
Applevangelist
a47fa3f9fc
Merge remote-tracking branch 'origin/master' into develop
2025-01-26 13:54:59 +01:00
Applevangelist
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
Applevangelist
6218b94c99
Merge remote-tracking branch 'origin/develop' into develop
2025-01-26 13:29:57 +01:00
Applevangelist
74a6c89801
Merge remote-tracking branch 'origin/master' into develop
2025-01-26 13:29:53 +01:00
Applevangelist
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
Shafik
00f5fde5a8
[FIXED] bad argument #2 to 'format' (number expected, got nil)
2025-01-26 00:19:19 +02:00
Applevangelist
baf3f9a9a4
Merge remote-tracking branch 'origin/master' into branch
...
# Conflicts:
# Moose Development/Moose/Ops/CTLD.lua
2025-01-25 15:57:59 +01:00
Applevangelist
03cd354f9e
Merge remote-tracking branch 'origin/master' into develop
2025-01-25 15:55:01 +01:00
Applevangelist
ae65fce9cd
xx
2025-01-25 15:54:42 +01:00
Applevangelist
66a1fa8af5
#CTLD - small fix for LoadesGroupsTable inserts
2025-01-25 15:54:29 +01:00
Applevangelist
f365c5153b
Merge remote-tracking branch 'origin/master' into branch
2025-01-25 15:07:16 +01:00
Applevangelist
c2096c8dfd
Merge remote-tracking branch 'origin/master' into develop
2025-01-25 15:06:40 +01:00
Applevangelist
1b4033cfce
CTLD Small fix for PlayerTask ExtractTroops
2025-01-25 15:04:33 +01:00
Applevangelist
e39e414e0d
Merge remote-tracking branch 'origin/master' into develop
2025-01-24 10:30:25 +01:00
Applevangelist
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
Applevangelist
afc0671aa9
xx
2025-01-24 10:26:51 +01:00
Applevangelist
7c91b9847b
Merge remote-tracking branch 'origin/master' into develop
2025-01-19 18:23:19 +01:00
Applevangelist
92a05ca74a
#CTLD - If troops or vehicles have a stock set, you can only inject as many as there are in stock. Specifically, when using persistence, the load function will restrict to inject more objects than are in stock, each inject draws on the stock.
2025-01-19 18:22:25 +01:00
Applevangelist
f77771ae25
xx
2025-01-19 18:19:54 +01:00
Applevangelist
a3c13c8cea
#PLAYERTASK - added option for custom player callsigns
...
#PLAYERRECCE - added option for custom player callsigns
#PLAYERRECCE - added KIOWA support
2025-01-19 17:41:17 +01:00
Applevangelist
c62dc17cd8
xxx
2025-01-19 17:39:54 +01:00
Applevangelist
8d87531464
#PLAYERRECCE - Add standard FOW for Kiowa
2025-01-18 15:32:08 +01:00
Applevangelist
8f2178a79c
Merge remote-tracking branch 'origin/master' into develop
2025-01-17 09:56:00 +01:00
Applevangelist
72bb23ed0d
xx
2025-01-17 09:55:12 +01:00
