cf322c121e
xx
2024-08-17 11:37:26 +02:00
a560d65ce7
Merge remote-tracking branch 'origin/master' into develop
2024-08-17 11:37:11 +02:00
9de3cb73f7
Merge remote-tracking branch 'origin/develop' into develop
2024-08-17 11:36:17 +02:00
757cc86a68
xx
2024-08-17 11:36:13 +02:00
aeb1664134
CTLD
2024-08-17 11:36:01 +02:00
2af1483724
Merge branch 'master' into develop
2024-08-16 23:13:22 +02:00
b7702ab933
Merge pull request #2166 from FlightControl-Master/Statua-patch-1
...
Update ClientWatch.lua
2024-08-16 23:10:25 +02:00
cc14f82e85
Update ClientWatch.lua
...
-Added check to verify the aircraft is controlled by a player
-Added :FilterByCoalition() and :FilterByCategory()
-Added ability to get ALL CLIENTS by leaving param1 of :New() blank
-Added more console outputs if CLIENTWATCH.Debug is true
-Minor documentation fixes
2024-08-16 15:19:26 -05:00
1aca716431
Merge remote-tracking branch 'origin/develop' into branch
2024-08-16 16:24:16 +02:00
83209341ee
Merge remote-tracking branch 'origin/master' into branch
2024-08-16 16:24:09 +02:00
f23dd0a5dd
Merge remote-tracking branch 'origin/master' into develop
2024-08-16 16:23:42 +02:00
5aea17e20e
#SET_DYNAMICCARGO Docu
2024-08-16 16:23:13 +02:00
a481e46017
Merge remote-tracking branch 'origin/develop' into branch
2024-08-16 15:47:12 +02:00
031a0035bd
Merge remote-tracking branch 'origin/master' into branch
2024-08-16 15:47:05 +02:00
8336b744bb
Merge remote-tracking branch 'origin/master' into develop
2024-08-16 15:46:34 +02:00
ad9eaea010
#SET - many less calls
2024-08-16 15:46:07 +02:00
4ca4d2e211
xx
2024-08-16 15:45:43 +02:00
866d4f93cc
Merge remote-tracking branch 'origin/develop' into branch
2024-08-16 15:23:32 +02:00
98eb362628
Merge remote-tracking branch 'origin/master' into branch
2024-08-16 15:23:18 +02:00
9c47e35d54
Merge remote-tracking branch 'origin/master' into develop
...
# Conflicts:
# Moose Development/Moose/Wrapper/DynamicCargo.lua
2024-08-16 15:22:45 +02:00
284a770daa
Added #SET_DYNAMICCARGO
2024-08-16 15:21:46 +02:00
b95f12449e
xx
2024-08-16 15:21:21 +02:00
16030d4fa1
Delete some non ready classes
2024-08-16 11:28:50 +02:00
e7ab07cec3
Merge remote-tracking branch 'origin/develop' into branch
2024-08-16 09:45:20 +02:00
c61dd606a1
Merge remote-tracking branch 'origin/master' into branch
2024-08-16 09:45:12 +02:00
37d2dd17d7
Merge remote-tracking branch 'origin/master' into develop
2024-08-16 09:44:42 +02:00
ccd190a8b1
xx
2024-08-16 09:44:00 +02:00
3d029d8f6f
Merge remote-tracking branch 'origin/develop' into branch
...
# Conflicts:
# Moose Development/Moose/Ops/CTLD.lua
# Moose Development/Moose/Wrapper/DynamicCargo.lua
2024-08-16 09:41:43 +02:00
9bb18a9df2
Merge remote-tracking branch 'origin/master' into branch
...
# Conflicts:
# Moose Development/Moose/Ops/CTLD.lua
# Moose Setup/Moose.files
2024-08-16 09:41:25 +02:00
36bf2436b6
Merge remote-tracking branch 'origin/master' into develop
...
# Conflicts:
# Moose Development/Moose/Core/Event.lua
# Moose Development/Moose/Ops/CTLD.lua
# Moose Development/Moose/Wrapper/DynamicCargo.lua
2024-08-16 09:39:48 +02:00
19f6a8d8f6
#DYNAMICCARGO - Added functionalty
2024-08-16 09:36:29 +02:00
823930de40
xx
2024-08-16 09:27:16 +02:00
c7201580d6
xx
2024-08-15 17:43:30 +02:00
e61856197a
#DynamicCargo - fix for FARP/Ship heights
2024-08-15 12:01:32 +02:00
37d321bb5c
Merge remote-tracking branch 'origin/develop' into branch
2024-08-14 15:43:57 +02:00
38e16dd07e
Merge remote-tracking branch 'origin/master' into branch
2024-08-14 15:43:51 +02:00
b8e09afcce
Merge remote-tracking branch 'origin/master' into develop
2024-08-14 15:43:24 +02:00
24264bd885
#ATIS French Translations
2024-08-14 15:42:46 +02:00
64bae07877
#ATIS French Translations
2024-08-14 15:42:26 +02:00
616a80cf5c
Merge remote-tracking branch 'origin/develop' into branch
2024-08-14 13:48:33 +02:00
18fd22be53
Merge remote-tracking branch 'origin/master' into branch
2024-08-14 13:48:26 +02:00
c82359f87b
#range
2024-08-14 11:34:57 +02:00
ed690ee6e9
Merge remote-tracking branch 'origin/master' into develop
2024-08-14 11:34:27 +02:00
872bb3d775
#RANGE Fix trying to get a playername on dynamic cargo spawns
2024-08-14 11:33:13 +02:00
d354f02507
Merge remote-tracking branch 'origin/Apple/Develop' into branch
2024-08-14 09:48:21 +02:00
f612ca2fc4
Merge remote-tracking branch 'origin/develop' into branch
2024-08-14 09:48:19 +02:00
9d0156908c
Merge remote-tracking branch 'origin/master' into branch
2024-08-14 09:48:10 +02:00
c0dcd12ada
Merge remote-tracking branch 'origin/master' into develop
2024-08-14 09:47:39 +02:00
d36cd8e284
#UNIT - Fix getting skill from N/A Templates
2024-08-14 09:46:10 +02:00
0ee0eb3162
Update Moose.files
2024-08-13 19:13:23 +02:00
Applevangelist