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

7080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
cf39f494f8 #CSAR 
* Corrected flare distance to kms
 2023-05-30 07:38:05 +02:00
Applevangelist
ca9a5187f6 Merge remote-tracking branch 'origin/develop' into develop 2023-05-28 15:29:40 +02:00
Applevangelist
f8201ffed7 Merge remote-tracking branch 'origin/master' into develop 2023-05-28 15:29:30 +02:00
Applevangelist
b70780162b #SPAWN 
* Logic fix for the last parameter of `NewFromTemplate()`
 2023-05-28 15:29:01 +02:00
Applevangelist
246879c003 Merge remote-tracking branch 'origin/master' into develop 2023-05-28 15:28:37 +02:00
Applevangelist
2318578126 #SPAWN 
* Logic fix for the last parameter of `NewFromTemplate()`
 2023-05-28 15:27:34 +02:00
Applevangelist
da312cd5ac Merge remote-tracking branch 'origin/develop' into develop 2023-05-27 16:31:12 +02:00
Frank
709621967d
Merge pull request #1945 from FlightControl-Master/FF/Ops 
OPSTRANSPORT
 2023-05-27 14:38:30 +02:00
Frank
0c376aec63 OPSTRANSPORT 
Fixed loaded not correctly checked in OPSGROUP
 2023-05-27 14:28:53 +02:00
Frank
725efc3e70
Merge pull request #1944 from FlightControl-Master/FF/Ops 
AUFTRAG
 2023-05-26 11:42:26 +02:00
Frank
81abe422de Merge branch 'develop' into FF/Ops 2023-05-26 11:38:26 +02:00
Frank
fb202012da AUFTRAG 
Reinforcing
- improved check if reinforcing is still ongoing
- improved handling by commander/chief
- added check that assets are not added to a mission twice
 2023-05-26 11:37:19 +02:00
Applevangelist
5938e1426e Merge remote-tracking branch 'origin/develop' into develop 2023-05-26 08:29:28 +02:00
Applevangelist
f695639839 Merge remote-tracking branch 'origin/master' into develop 2023-05-26 08:29:22 +02:00
Applevangelist
89223ae142 Merge remote-tracking branch 'origin/master' into develop 2023-05-26 08:28:45 +02:00
Applevangelist
3e6f25f17c #UTILS 
* Added UTILS.PrintTableToLog()
2.7.20 		2023-05-26 08:28:08 +02:00
Applevangelist
016fbe0a10 Merge remote-tracking branch 'origin/develop' into develop 2023-05-25 09:00:44 +02:00
Applevangelist
dd496d35a8 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
 2023-05-25 09:00:33 +02:00
Applevangelist
158ffde780 #CONTROLLER 
* Fix for Link4
 2023-05-25 08:58:21 +02:00
Applevangelist
2967de8f6e #CONTROLLER 
* Fix for Link4
 2023-05-25 08:57:54 +02:00
Applevangelist
0cd6a59ce4 #CONTROLLER 
* Fix for Link4
 2023-05-25 08:57:15 +02:00
Applevangelist
402674470f Merge remote-tracking branch 'origin/develop' into develop 2023-05-25 08:26:23 +02:00
Applevangelist
31174ae97c Merge remote-tracking branch 'origin/master' into develop 2023-05-25 08:26:06 +02:00
Applevangelist
9c5260f801 Merge remote-tracking branch 'origin/develop' into develop 2023-05-25 08:24:35 +02:00
Applevangelist
4d9ce80c98 Merge remote-tracking branch 'origin/master' into develop 2023-05-25 08:24:16 +02:00
Applevangelist
91a445961b #RESCUEHELO 
* Small fix to get the coordinate of an ejected/crashed unit
 2023-05-25 08:23:31 +02:00
Applevangelist
4c7239c5ec Bugfixes 2023-05-25 08:22:51 +02:00
Frank
ee055531b6 Merge branch 'master' into develop 2023-05-24 11:16:36 +02:00
Frank
749e9b7e08 Update Event.lua 
Fixed bug that statics are handled incorrectly if they are the target object of an event (*e.g.* hit event)
 2023-05-24 11:16:01 +02:00
Frank
c9b90e884d
Merge pull request #1943 from FlightControl-Master/FF/Ops 
OPS
 2023-05-23 01:46:51 +02:00
Frank
21db80afad Merge branch 'develop' into FF/Ops 2023-05-23 01:29:04 +02:00
Frank
d9d5458450 OPS 
**AUFTRAG**
- New type `FAC`

**OPSZONE**
- Improved drawzone on capture
 2023-05-23 01:28:52 +02:00
Applevangelist
93a63cc868 Merge remote-tracking branch 'origin/develop' into develop 2023-05-22 17:58:28 +02:00
Applevangelist
b5aa3dd869 Merge remote-tracking branch 'origin/master' into develop 2023-05-22 17:58:21 +02:00
Applevangelist
0575b366dd #SPAWN 
* Tweaked NewFromTemplate, and gave a better example
 2023-05-22 17:57:50 +02:00
Applevangelist
905d29b279 #SPAWN 
* Tweaked NewFromTemplate, and gave a better example
 2023-05-22 17:57:03 +02:00
Applevangelist
a69e62a66b #SPAWN 
* Tweaked NewFromTemplate, and gave a better example
 2023-05-22 17:56:53 +02:00
Applevangelist
7c3fa4ebc2 Merge remote-tracking branch 'origin/develop' into develop 2023-05-20 12:14:23 +02:00
Applevangelist
668162845c Merge remote-tracking branch 'origin/master' into develop 2023-05-20 12:14:16 +02:00
Applevangelist
034b2444ff Merge remote-tracking branch 'origin/master' into develop 2023-05-20 12:13:35 +02:00
Applevangelist
5f97299cb2 Small Fix 2023-05-20 12:12:18 +02:00
Applevangelist
c6051f30d0 Small fix 2023-05-20 12:12:00 +02:00
Applevangelist
7901d53d54 #POINT 
* Added FindClosestStatic()
 2023-05-19 17:13:17 +02:00
Applevangelist
f78354eedb Merge remote-tracking branch 'origin/develop' into develop 2023-05-19 17:12:45 +02:00
Applevangelist
d83079ecb8 Merge remote-tracking branch 'origin/master' into develop 2023-05-19 17:12:34 +02:00
Applevangelist
60b75a4c8f #POINT 
* Added FindClosestStatic()
 2023-05-19 17:11:54 +02:00
Applevangelist
f1b030f3d5 #Added findcloseststatic 2023-05-19 17:11:26 +02:00
Applevangelist
88f34e5bb0 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 10:28:11 +02:00
Applevangelist
019e826515 Merge remote-tracking branch 'origin/develop' into develop 2023-05-17 10:27:43 +02:00
Applevangelist
16b9464da5 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 10:27:36 +02:00