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

7306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Applevangelist
a33ca69368 fixes 2023-05-17 10:26:58 +02:00
Applevangelist
0868286f27 #WAREHOUSE 
* Fixed one omission for SHIP transport types
 2023-05-17 10:26:29 +02:00
Applevangelist
49f3e3fc2f Merge remote-tracking branch 'origin/develop' into develop 2023-05-17 09:41:32 +02:00
Applevangelist
cae084a352 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 09:41:27 +02:00
Applevangelist
c8c031d05f Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
 2023-05-17 09:40:40 +02:00
Applevangelist
ffcc46cb2d #CTLD 
* Changed VHF modulation to AM
* Added option to have a different sound file for UHF, in case you want to silent FC3 radios
* Thanks to Streakeagle
 2023-05-17 09:34:54 +02:00
Frank
6d07f7c48c Merge branch 'develop' into FF/Ops 2023-05-13 23:36:36 +02:00
Frank
014fea5f10 Merge branch 'master' into develop 2023-05-13 23:36:12 +02:00
Frank
21bcd64c9d Update Controllable.lua 
Corrected parameters for enroute tasks according to hoggit for
- CONTROLLABLE:EnRouteTaskFAC
- CONTROLLABLE:EnRouteTaskFAC_EngageGroup
 2023-05-13 23:35:58 +02:00
Frank
d07709a167 Update Auftrag.lua 2023-05-13 23:06:56 +02:00
Frank
ac4db4a392 Merge branch 'develop' into FF/Ops 2023-05-13 17:57:23 +02:00
Applevangelist
b30cdd073b Merge remote-tracking branch 'origin/master' into develop 2023-05-11 18:23:01 +02:00
Applevangelist
943b68f38f #CTLD 
* placement of dropped crates to better align to unit length
 2023-05-11 15:31:24 +02:00
Applevangelist
c84b54a214 #CTLD 
* placement of dropped crates to better align to unit length
 2023-05-11 15:30:25 +02:00
Applevangelist
f5fb179304 Merge remote-tracking branch 'origin/develop' into develop 2023-05-09 09:50:30 +02:00
Applevangelist
f2003fa75f Merge remote-tracking branch 'origin/master' into develop 2023-05-09 09:50:23 +02:00
Applevangelist
a12e93c7cb Merge remote-tracking branch 'origin/master' into develop 2023-05-09 09:49:47 +02:00
Applevangelist
bd01946f88 #AI_A2X... 
* Fixes
 2023-05-09 09:49:13 +02:00
Applevangelist
bda0736527 #AI_A2X... 
* Fixes
 2023-05-09 09:48:49 +02:00
Applevangelist
256b93087f #AI_A2X... 
* Fixes
 2023-05-09 09:48:21 +02:00
Applevangelist
7ed0d7eec3 #AI_A2X... 
* Fixes
 2023-05-09 09:44:41 +02:00
Applevangelist
8d25bdec7c Merge remote-tracking branch 'origin/master' into develop 2023-05-05 10:33:55 +02:00
Applevangelist
439856945e Merge remote-tracking branch 'origin/develop' into develop 2023-05-05 10:33:18 +02:00
Applevangelist
3a81d449da Merge remote-tracking branch 'origin/master' into develop 2023-05-05 10:33:09 +02:00