weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-11 19:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,739 Commits 17 Branches 93 Tags
c59b668eec00de04e06077daca61847619fea9fa
Commit Graph

2017 Commits

Author SHA1 Message Date
Applevangelist c9fd56116e Housekeeping 2024-04-16 08:45:53 +02:00
Applevangelist 99d32a7854 Merge remote-tracking branch 'origin/master' into develop 2024-04-15 18:56:03 +02:00
Applevangelist 620df5ad3e xx 2024-04-15 18:54:59 +02:00
Applevangelist 504aa19c03 Merge remote-tracking branch 'origin/master' into develop 2024-04-15 18:54:46 +02:00
Applevangelist 9a3effd063 Docu 2024-04-15 18:54:22 +02:00
Applevangelist d4a49ae68b #CLIENTMENU/MANAGER 
* Attempt to avoid dual menu builds for multi-seated aircraft
 2024-04-15 12:52:19 +02:00
Applevangelist b9cb6dbffb xxx 2024-04-15 12:50:15 +02:00
Frank ac68744deb Merge branch 'FF/Ops' into FF/OpsRat 2024-04-04 09:36:13 +02:00
Applevangelist bd28c10492 Merge remote-tracking branch 'origin/master' into develop 2024-04-02 10:50:01 +02:00
Applevangelist 4c890d18d1 Merge remote-tracking branch 'origin/master' into develop 2024-04-02 10:48:57 +02:00
Applevangelist 2eb4118d56 xxx 2024-04-02 10:47:58 +02:00
Applevangelist b4d1118c88 Merge remote-tracking branch 'origin/master' into develop 2024-04-01 12:59:39 +02:00
Applevangelist dcc15afb89 xxx 2024-04-01 12:59:14 +02:00
Applevangelist 1ea2f091e0 Fix 2024-04-01 12:58:20 +02:00
Frank a5632ec3a4 RAT 
- More cleanup

OPSGROUP
- Fixed group init (masterunit)
 2024-03-31 23:33:37 +02:00
Applevangelist 523375c765 Merge remote-tracking branch 'origin/master' into develop 2024-03-27 14:41:11 +01:00
Applevangelist 371b100672 xxx 2024-03-27 14:40:47 +01:00
Applevangelist ac42b56b8e nil check 2024-03-27 14:40:34 +01:00
Applevangelist 00dc9969b6 Merge remote-tracking branch 'origin/master' into develop 2024-03-25 18:26:45 +01:00
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
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