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

1898 Commits

Author SHA1 Message Date
Applevangelist
5b8416d5fd Merge remote-tracking branch 'origin/master' into develop 2024-03-25 18:26:17 +01:00
Niels Vaes
874fa7ad69
Fixing a bug where on a rare condition, an A10CII could be spawned and the SpawnInitSADL of the Spawn object wouldn't be set correctly (#2108) 2024-03-25 17:26:44 +01:00
Frank
2205100942 RAT 2024-03-24 22:51:11 +01:00
Frank
75068a2a26 Merge branch 'FF/Ops' into FF/OpsDev 2024-03-24 17:25:02 +01:00
Applevangelist
e86afefe79 xxx 2024-03-22 09:27:58 +01:00
Applevangelist
b10819220c Merge remote-tracking branch 'origin/master' into develop 2024-03-15 10:26:18 +01:00
Applevangelist
b66ff35b63 #minor fixes 2024-03-15 10:25:58 +01:00
Applevangelist
244abe2bbb #Minor Fixes 2024-03-15 10:25:40 +01:00
Applevangelist
dcd278e2a1 Merge remote-tracking branch 'origin/master' into develop 2024-03-11 18:19:44 +01:00
Applevangelist
8cf11de774 #SPAWN 
* Small change to keep unitnames when using Razbam's setting IFF via unit names
 2024-03-11 18:18:50 +01:00
Applevangelist
ebb58cd976 xxx 2024-03-11 18:18:00 +01:00
Applevangelist
3d073891bc Merge remote-tracking branch 'origin/master' into develop 2024-03-11 08:31:02 +01:00
Applevangelist
b62f2afd8d Merge remote-tracking branch 'origin/master' into develop 2024-03-11 08:30:22 +01:00
Applevangelist
176bd0eb8b xx 2024-03-11 08:29:56 +01:00
Applevangelist
0172772ead Merge remote-tracking branch 'origin/master' into develop 2024-03-10 18:00:36 +01:00
Applevangelist
70ee6a1121 Merge remote-tracking branch 'origin/master' into develop 2024-03-10 18:00:02 +01:00
Applevangelist
10edd2f9d0 xxx 2024-03-10 17:59:26 +01:00
Applevangelist
408321decf Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:53:05 +01:00
Applevangelist
11acb578f6 #SPAWN 
* Fix an issue for SPAWN:NewFromTemplate when re-using same template over and again
 2024-03-10 16:52:46 +01:00
Applevangelist
5881aa0ad3 #SPAWN 
* Fix an issue for SPAWN:NewFromTemplate when re-using same template over and again
 2024-03-10 16:52:03 +01:00
Applevangelist
6cda61c9dd Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:20:29 +01:00
Applevangelist
4d8abe7f57 #MARKEROPS_BASE 
* Fix event coalition
 2024-03-10 16:20:06 +01:00
Applevangelist
fc5d540ec6 #MARKEROPS 
* Coalition in events fix
 2024-03-10 16:19:29 +01:00
Applevangelist
94ca67feb9 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 10:07:26 +01:00
Applevangelist
5286926609 xx 2024-03-08 10:06:31 +01:00
Applevangelist
ab14fbd11c #MARKEROPS - Added Coalition on FSM events 2024-03-08 10:06:16 +01:00
Applevangelist
43bc4ba681 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/SpawnStatic.lua
 2024-03-02 14:26:58 +01:00
kaltokri
b0d0fb9ae1 Merge branch 'master' into develop 2024-03-01 17:22:33 +01:00
kaltokri
57ce6bcec2 Switched demo mission link in Core/SpawnStatic and Wrapper/Storage 2024-03-01 17:22:22 +01:00
Applevangelist
a7fcc95b71 Merge remote-tracking branch 'origin/master' into develop 2024-03-01 08:24:22 +01:00
Applevangelist
c71d0ed7cf Merge remote-tracking branch 'origin/master' into develop 2024-03-01 08:23:50 +01:00
Applevangelist
d64dadd9a9 docu 2024-03-01 08:23:32 +01:00
Applevangelist
2dc908d926 Merge remote-tracking branch 'origin/master' into develop 2024-02-27 10:28:30 +01:00
Applevangelist
1f9725530f #CTLD - Added option to inject cargo objects which will not show up in the menu - for inject and move around purposes. 2024-02-27 10:28:00 +01:00
Applevangelist
d291e7417d CTLD 2024-02-27 10:19:48 +01:00
Applevangelist
ab56f903c2 Merge remote-tracking branch 'origin/master' into develop 2024-02-25 11:57:30 +01:00
kaltokri
8c6c1e481b Merge branch 'master' into develop 2024-02-24 14:26:45 +01:00
kaltokri
14d6085b69 Added error message, that AATACAN is depricated 2024-02-24 14:26:30 +01:00
Rolf Geuenich
d13173e336 Added Links to new demo mission repository 2024-02-23 11:33:50 +01:00
Rolf Geuenich
ced01a993d Added Links to new demo mission repository 2024-02-23 11:33:02 +01:00
Applevangelist
c5ece16753 Merge remote-tracking branch 'origin/master' into develop 2024-02-22 12:14:44 +01:00
Applevangelist
4c2a89ee29 Bugfix 2024-02-22 12:14:15 +01:00
Applevangelist
a734cb8a7e xxx 2024-02-22 12:14:03 +01:00
Applevangelist
43e30ce426 Merge remote-tracking branch 'origin/master' into develop 2024-02-22 11:54:03 +01:00
Applevangelist
4505b60859 Merge remote-tracking branch 'origin/master' into develop 2024-02-22 11:53:24 +01:00
Applevangelist
fdfc21187c sss 2024-02-22 11:52:54 +01:00
Applevangelist
e8c75b8795 SPAWN:InitSpeedMPS() etc 2024-02-22 11:52:43 +01:00
Applevangelist
1c293c2f62 Merge remote-tracking branch 'origin/master' into develop 2024-02-22 09:20:59 +01:00
Applevangelist
7e21a1070a Merge remote-tracking branch 'origin/master' into develop 2024-02-22 09:19:43 +01:00
Applevangelist
2ce9f26e26 Docu 2024-02-22 09:19:22 +01:00