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

8726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
ada8629c01 Fix for speed nil 2024-03-13 07:38:56 +01:00
Applevangelist
efd48c87e9 Merge remote-tracking branch 'origin/develop' into develop 2024-03-12 15:35:26 +01:00
Applevangelist
35c1a76675 Merge remote-tracking branch 'origin/master' into develop 2024-03-12 15:35:22 +01:00
Applevangelist
e3d2dec91f Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
 2024-03-12 15:34:53 +01:00
Thomas
470c4ef13c
Update Controllable.lua 2024-03-12 11:54:44 +01:00
Thomas
241b31fcec
Update Controllable.lua 2024-03-12 11:26:59 +01:00
Thomas
3dd069d7d6
Update Controllable.lua 
Docu adjustments
 2024-03-12 11:25:33 +01:00
Thomas
77c4fd7696
Update Controllable.lua (#2105) (#2106) 
Added setting of AI radio options
 2024-03-12 11:20:57 +01:00
Thomas
aca4e4d7ca
Update Controllable.lua (#2105) 
Added setting of AI radio options
 2024-03-12 10:49:06 +01:00
Applevangelist
edf445de1a Merge remote-tracking branch 'origin/develop' into develop 2024-03-11 18:20:16 +01:00
Applevangelist
5b1cc052b6 Merge remote-tracking branch 'origin/master' into develop 2024-03-11 18:20:13 +01:00
Applevangelist
dcd278e2a1 Merge remote-tracking branch 'origin/master' into develop 2024-03-11 18:19:44 +01:00
Applevangelist
2f81fcb0c0 #STATIC 
* Add :FindByMatching() and :FindAllByMatching()
 2024-03-11 18:19:19 +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
e32b393f39 Merge remote-tracking branch 'origin/develop' into develop 2024-03-11 08:31:06 +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
078137af4b Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 18:00:39 +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
fa3a805172 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:53:34 +01:00
Applevangelist
b7ef0e57ab Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:53:31 +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
755dde8e10 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:20:59 +01:00
Applevangelist
1856f89cf9 Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:20:56 +01:00
Applevangelist
383eff4cd6 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:20:32 +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
032e73d382 Merge remote-tracking branch 'origin/develop' into develop 2024-03-09 17:24:58 +01:00
Applevangelist
c6bb7c8bbd Merge remote-tracking branch 'origin/develop' into develop-2 2024-03-09 17:24:47 +01:00
Applevangelist
bd3042410b ccc 2024-03-09 17:24:32 +01:00
Applevangelist
7c9cf96d2e OPSGROUP extra check 2024-03-09 17:24:15 +01:00
Applevangelist
5bf70d9950 Merge remote-tracking branch 'origin/develop' into develop 2024-03-08 10:07:30 +01:00
Applevangelist
94ca67feb9 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 10:07:26 +01:00
Applevangelist
ef30bd36a5 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 10:06:51 +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
1ef50f45f1 Merge remote-tracking branch 'origin/develop' into develop 2024-03-07 10:21:23 +01:00
Applevangelist
d76cd91d50 Merge remote-tracking branch 'origin/master' into develop 2024-03-07 10:21:19 +01:00
Applevangelist
5bde0c7605 Merge remote-tracking branch 'origin/develop' into develop 2024-03-07 10:20:56 +01:00
Applevangelist
4f2d8144e9 Merge remote-tracking branch 'origin/master' into develop 2024-03-07 10:20:53 +01:00
Applevangelist
cb61177252 CSAR/CTLD basic support for MH-60R 2024-03-07 10:20:31 +01:00
Applevangelist
d7fd9d0968 xxx 2024-03-07 10:20:02 +01:00
kaltokri
736204d163 Merge branch 'master' into develop 2024-03-05 22:29:36 +01:00