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
9,794 Commits 10 Branches 87 Tags
Commit Graph

9794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
83209341ee Merge remote-tracking branch 'origin/master' into branch 2024-08-16 16:24:09 +02:00
Applevangelist
f23dd0a5dd Merge remote-tracking branch 'origin/master' into develop 2024-08-16 16:23:42 +02:00
Applevangelist
5aea17e20e #SET_DYNAMICCARGO Docu 2024-08-16 16:23:13 +02:00
Applevangelist
a481e46017 Merge remote-tracking branch 'origin/develop' into branch 2024-08-16 15:47:12 +02:00
Applevangelist
031a0035bd Merge remote-tracking branch 'origin/master' into branch 2024-08-16 15:47:05 +02:00
Applevangelist
8336b744bb Merge remote-tracking branch 'origin/master' into develop 2024-08-16 15:46:34 +02:00
Applevangelist
ad9eaea010 #SET - many less calls 2024-08-16 15:46:07 +02:00
Applevangelist
4ca4d2e211 xx 2024-08-16 15:45:43 +02:00
Applevangelist
866d4f93cc Merge remote-tracking branch 'origin/develop' into branch 2024-08-16 15:23:32 +02:00
Applevangelist
98eb362628 Merge remote-tracking branch 'origin/master' into branch 2024-08-16 15:23:18 +02:00
Applevangelist
9c47e35d54 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/DynamicCargo.lua
 2024-08-16 15:22:45 +02:00
Applevangelist
284a770daa Added #SET_DYNAMICCARGO 2024-08-16 15:21:46 +02:00
Applevangelist
b95f12449e xx 2024-08-16 15:21:21 +02:00
Applevangelist
16030d4fa1 Delete some non ready classes 2024-08-16 11:28:50 +02:00
Applevangelist
e7ab07cec3 Merge remote-tracking branch 'origin/develop' into branch 2024-08-16 09:45:20 +02:00
Applevangelist
c61dd606a1 Merge remote-tracking branch 'origin/master' into branch 2024-08-16 09:45:12 +02:00
Applevangelist
37d2dd17d7 Merge remote-tracking branch 'origin/master' into develop 2024-08-16 09:44:42 +02:00
Applevangelist
ccd190a8b1 xx 2024-08-16 09:44:00 +02:00
Applevangelist
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
Applevangelist
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
Applevangelist
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
Applevangelist
19f6a8d8f6 #DYNAMICCARGO - Added functionalty 2024-08-16 09:36:29 +02:00
Applevangelist
823930de40 xx 2024-08-16 09:27:16 +02:00
Applevangelist
c7201580d6 xx 2024-08-15 17:43:30 +02:00
Applevangelist
e61856197a #DynamicCargo - fix for FARP/Ship heights 2024-08-15 12:01:32 +02:00
Applevangelist
37d321bb5c Merge remote-tracking branch 'origin/develop' into branch 2024-08-14 15:43:57 +02:00
Applevangelist
38e16dd07e Merge remote-tracking branch 'origin/master' into branch 2024-08-14 15:43:51 +02:00
Applevangelist
b8e09afcce Merge remote-tracking branch 'origin/master' into develop 2024-08-14 15:43:24 +02:00
Applevangelist
24264bd885 #ATIS French Translations 2024-08-14 15:42:46 +02:00
Applevangelist
64bae07877 #ATIS French Translations 2024-08-14 15:42:26 +02:00
Applevangelist
616a80cf5c Merge remote-tracking branch 'origin/develop' into branch 2024-08-14 13:48:33 +02:00
Applevangelist
18fd22be53 Merge remote-tracking branch 'origin/master' into branch 2024-08-14 13:48:26 +02:00
Applevangelist
c82359f87b #range 2024-08-14 11:34:57 +02:00
Applevangelist
ed690ee6e9 Merge remote-tracking branch 'origin/master' into develop 2024-08-14 11:34:27 +02:00
Applevangelist
872bb3d775 #RANGE Fix trying to get a playername on dynamic cargo spawns 2024-08-14 11:33:13 +02:00
Applevangelist
d354f02507 Merge remote-tracking branch 'origin/Apple/Develop' into branch 2024-08-14 09:48:21 +02:00
Applevangelist
f612ca2fc4 Merge remote-tracking branch 'origin/develop' into branch 2024-08-14 09:48:19 +02:00
Applevangelist
9d0156908c Merge remote-tracking branch 'origin/master' into branch 2024-08-14 09:48:10 +02:00
Applevangelist
c0dcd12ada Merge remote-tracking branch 'origin/master' into develop 2024-08-14 09:47:39 +02:00
Applevangelist
d36cd8e284 #UNIT - Fix getting skill from N/A Templates 2024-08-14 09:46:10 +02:00
Thomas
0ee0eb3162
Update Moose.files 2024-08-13 19:13:23 +02:00
Thomas
81653cf289
Update Modules.lua 2024-08-13 19:12:38 +02:00
Applevangelist
60d68161c4 #CTLD #DYNAMICCARGO 2024-08-13 19:07:57 +02:00
Applevangelist
ba5743c057 Merge remote-tracking branch 'origin/develop' into branch 2024-08-13 10:31:57 +02:00
Applevangelist
5d98672de5 #ATIS - Polar circle fixes 2024-08-13 10:31:26 +02:00
Applevangelist
eab643268f #ATIS - Polar circle fixes 2024-08-13 10:30:46 +02:00
Applevangelist
0ee30532ee #ATIS - Polar circle fixes 2024-08-13 10:30:36 +02:00
Applevangelist
093a60050b xx 2024-08-13 09:49:48 +02:00
Applevangelist
a1605f9a2d Merge remote-tracking branch 'origin/develop' into branch 2024-08-12 19:06:54 +02:00
Applevangelist
6bd5148de8 Merge remote-tracking branch 'origin/master' into branch 2024-08-12 19:06:45 +02:00