FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,268 Commits 10 Branches 87 Tags
Commit Graph

10268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shafik
44ad362dbc [FIXED] attempt to index local 'CleanUpUnit' (a nil value) 2025-01-29 10:06:19 +02:00
Shafik
ea776aeacc [FIXED] attempt to get length of local 'parking' (a nil value) 2025-01-29 10:05:55 +02:00
Frank
e30479329a Merge branch 'master' into develop 2025-01-28 20:29:45 +01:00
Frank
d9948d1a19 Update Group.lua 2025-01-28 20:29:35 +01:00
Frank
b962096661 Update RAT.lua 
- Tried to fix bug the Pnow is nil
 2025-01-28 20:29:04 +01:00
Frank
725b55a505 Merge branch 'master' into develop 2025-01-28 20:22:57 +01:00
Frank
5f7a4f2bbb Update Group.lua 
- Added way to get the coordinate of the group
 2025-01-28 20:22:45 +01:00
Thomas
f555399e2f
Merge pull request #2231 from FlightControl-Master/master 
Master merge
 2025-01-28 08:32:34 +01:00
Thomas
1b6945e0b0
Merge pull request #2230 from FlightControl-Master/Applevangelist-patch-2 
Update Scenery.lua
 2025-01-28 08:31:33 +01:00
Thomas
4fd55b1bd6
Update Scenery.lua 
#SCENERY
 2025-01-28 08:31:17 +01: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
20b8deb6de
Merge pull request #2228 from FlightControl-Master/Applevangelist-patch-2 
Update CTLD.lua
 2025-01-27 18:46:07 +01:00
Thomas
6af836c118
Update CTLD.lua 2025-01-27 18:45:39 +01:00
Thomas
f87b8a2c2a
Merge pull request #2229 from FlightControl-Master/Applevangelist-patch-3 
Update Base.lua
 2025-01-27 18:44:50 +01:00
Thomas
daffd7412a
Update Base.lua 2025-01-27 18:44:35 +01:00
Thomas
bfb60b318e
Update CTLD.lua 
update
 2025-01-27 13:27:13 +01:00
Thomas
a55959dfbb
Update Base.lua 
Added property functions
 2025-01-27 12:00:25 +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
b115a0a672 Merge remote-tracking branch 'origin/develop' into branch 2025-01-26 17:35:56 +01:00
Applevangelist
0c384a75cc Merge remote-tracking branch 'origin/master' into branch 2025-01-26 17:35:51 +01:00
Applevangelist
c19d20c3f7 xxx 2025-01-26 17:35:30 +01:00
Applevangelist
4656d3e019 Merge remote-tracking branch 'origin/develop' into develop 2025-01-26 17:35:11 +01:00
Applevangelist
86b76ba216 Merge remote-tracking branch 'origin/master' into develop 2025-01-26 17:35:06 +01:00
Applevangelist
ff561410ad xx 2025-01-26 17:34:36 +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
b32d17c2ab Merge remote-tracking branch 'origin/develop' into develop 2025-01-26 14:55:24 +01:00
Applevangelist
29111e1018 xx 2025-01-26 14:55:21 +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
Thomas
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
Shafik
00f5fde5a8 [FIXED] bad argument #2 to 'format' (number expected, got nil) 2025-01-26 00:19:19 +02:00
Applevangelist
ff4f162ca2 Merge remote-tracking branch 'origin/develop' into branch 2025-01-25 15:58:06 +01: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
5e856b67a1 Merge remote-tracking branch 'origin/develop' into branch 2025-01-25 15:07:38 +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
a11cda4ed1 Merge remote-tracking branch 'origin/develop' into branch 2025-01-24 12:26:38 +01:00