7515 Commits

Author SHA1 Message Date
Applevangelist
c19d20c3f7 xxx 2025-01-26 17:35:30 +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
9faa1b806d Merge remote-tracking branch 'origin/master' into branch 2025-01-24 12:26:30 +01:00
Applevangelist
750edf1144 Merge remote-tracking branch 'origin/master' into develop 2025-01-24 12:22:24 +01:00
Applevangelist
f533d4ec8f xxx 2025-01-24 12:22:00 +01:00
Applevangelist
48bc41873a #STORAGE - Added small helper to get Syria "H" Helipad warehouses via a zone 2025-01-24 12:21:44 +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
Thomas
b03978cc3d
Update Zone.lua
Correct radius sphere search in  ZONE_RADIUS:SearchZone()
2025-01-22 09:43:57 +01:00
Frank
3a7233b594 Merge branch 'master' into develop 2025-01-19 19:18:26 +01:00
Frank
82f4c5790a Merge branch 'master' of https://github.com/FlightControl-Master/MOOSE 2025-01-19 19:18:01 +01:00
Frank
5957124e9e ARTY v1.3.3
- Added missing/new arty units to DB (min/max firing range)
- Adjusted immobile speed check because some DCS units report a speed of 1 m/s
2025-01-19 19:17:59 +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
Frank
d02b5db6dd Merge branch 'master' of https://github.com/FlightControl-Master/MOOSE 2025-01-18 22:34:25 +01:00
Frank
bd074728fe Update Artillery.lua
- Update Arty DB
2025-01-18 22:34:21 +01:00
Applevangelist
8d87531464 #PLAYERRECCE - Add standard FOW for Kiowa 2025-01-18 15:32:08 +01:00
Applevangelist
5fbd3d9525 Merge remote-tracking branch 'origin/master' into develop 2025-01-18 15:30:33 +01:00
Applevangelist
61b7b3ead6 Smaller fixes 2025-01-18 15:30:03 +01:00
Applevangelist
3ed61e8a2a xx 2025-01-18 15:29:35 +01:00
Applevangelist
2a1234f7ff xxx 2025-01-17 12:19:42 +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
Applevangelist
7f7999e3e5 #CSAR - Make the list of downed pilots' coordinate dependent on _SETTINGS global or pilot 2025-01-17 09:54:41 +01:00
Applevangelist
77c6365e37 xx 2025-01-17 09:53:16 +01:00
Applevangelist
0a08e3fdac Merge remote-tracking branch 'origin/master' into develop 2025-01-17 09:22:32 +01:00
Applevangelist
b522b38d31 #SCENERY - Some fixes for kissing getLife function on some objects, and life points being zero on some objects 2025-01-17 09:21:48 +01:00
Applevangelist
5c1d367926 xx 2025-01-16 11:10:42 +01:00
Applevangelist
869339150a Merge remote-tracking branch 'origin/develop' into branch
# Conflicts:
#	Moose Development/Moose/Ops/Awacs.lua
2025-01-15 15:36:08 +01:00
Applevangelist
9b5a653940 Merge remote-tracking branch 'origin/master' into branch 2025-01-15 15:35:36 +01:00