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

1325 Commits

Author SHA1 Message Date
Applevangelist
fe120542f3 Merge remote-tracking branch 'origin/master' into develop 2023-08-29 15:50:11 +02:00
Applevangelist
1e6731830e #MANTIS 
* Added two more CH mod types
 2023-08-29 15:49:48 +02:00
Thomas
ef40b1c524
Range fix for #1984 (#1992) 
Range fix for #1984
 2023-08-20 13:41:20 +02:00
Applevangelist
7f4baaae4d Fix for #1984 2023-08-20 13:27:46 +02:00
Applevangelist
4e4bd000d4 Merge remote-tracking branch 'origin/develop' into develop 2023-08-18 08:49:56 +02:00
ttrebuchon
a2772c97d5 Merge branch 'develop' into tt/misc-bug-fixes 2023-08-13 15:34:40 -04:00
ttrebuchon
f929951dbe Fix WAREHOUSE.AssetItem size calculation 2023-08-13 15:12:51 -04:00
Applevangelist
2afd09b878 Merge remote-tracking branch 'origin/master' into develop 2023-07-29 16:48:08 +02:00
Thomas
f87a676e4b
Update Scoring.lua (#1976) 
Add report Spaces
 2023-07-29 16:45:00 +02:00
Applevangelist
29947d69c3 Changes 2023-07-29 16:40:46 +02:00
Applevangelist
e2929a78c4 #AICSAR - correct code version 2023-07-19 16:06:44 +02:00
Applevangelist
15bf379cdc #AICSAR 
* Added FSM Event "HeloOnDuty"
 2023-07-19 09:56:27 +02:00
Applevangelist
7367e15121 #AICSAR 
* Added FSM Event "HeloOnDuty"
 2023-07-19 09:56:09 +02:00
Applevangelist
69fc2dca42 Merge remote-tracking branch 'origin/master' into develop 2023-07-17 16:28:29 +02:00
Applevangelist
bb579fff5b Merge remote-tracking branch 'origin/master' into develop 2023-07-16 11:28:24 +02:00
Applevangelist
6481f66e27 #MANTIS 
* Added IDs for Current Hill Assets, keyword "CHM" for group names
 2023-07-16 11:27:34 +02:00
Applevangelist
ee7fca09b6 Merge remote-tracking branch 'origin/master' into develop 2023-07-07 15:16:10 +02:00
Applevangelist
fd1257052b # 2023-07-07 15:15:28 +02:00
Applevangelist
ffbab7453c Merge remote-tracking branch 'origin/master' into develop 2023-07-07 15:15:09 +02:00
Applevangelist
40fa929eb0 * Added omissed DetectedItem.Name found by @Nocke 2023-07-07 15:14:33 +02:00
Applevangelist
102a48bf97 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Functional/AmmoTruck.lua
 2023-07-03 17:30:50 +02:00
Applevangelist
71b2cc1ee5 #AMMOTRUCK 
* Added TTL
 2023-07-03 17:06:31 +02:00
Applevangelist
0d6fe49a41 changes 2023-07-03 16:45:02 +02:00
Thomas
303a15eb50
Ammotruck 
* Added feature for # of re-munitions a truck can do
 2023-07-03 12:21:05 +02:00
Applevangelist
389d5c7e5b Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:17:19 +02:00
Applevangelist
1eaa3d309d #SCORING 
* typo
 2023-07-01 13:15:59 +02:00
Applevangelist
03a18d5237 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Functional/Scoring.lua
#	Moose Development/Moose/Utilities/Utils.lua
 2023-07-01 13:15:24 +02:00
Applevangelist
178005346d Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:12:54 +02:00
Applevangelist
0bb16ec827 #AIRBASE 
* Fix for nil error in finding parking for a group

#MANTIS
* Added SAM type "SHORAD" as designator

#SCORING
* fix for non local problem

#UTILS
* fix for OneLineSerialize
 2023-07-01 13:11:21 +02:00
Applevangelist
b3e9a2b64d #fixes 2023-07-01 13:08:00 +02:00
Applevangelist
abf694aa81 # Docu fixes 2023-06-22 12:19:20 +02:00
Applevangelist
9da6b2a4f5 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 15:17:12 +02:00
Applevangelist
16cf6693ab Merge remote-tracking branch 'origin/master' into develop 2023-06-09 15:16:38 +02:00
Applevangelist
8658804c82 Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 13:25:54 +02:00
Frank
f45a22fe78 Merge branch 'develop' into FF/Ops 2023-06-08 15:52:25 +02:00
Applevangelist
afe2b675e5 #RAT 
* Fixes from dev
 2023-06-08 13:59:59 +02:00
Applevangelist
238640ec91 Merge remote-tracking branch 'origin/master' into develop 2023-06-08 13:58:58 +02:00
Applevangelist
2c14ee74b0 #SCORING 
* Can leave text empty on some instances
 2023-06-08 13:58:26 +02:00
Applevangelist
4314959cbb Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:57:03 +02:00
Applevangelist
fad85ef7ed #PLAYERTASK 
* Added basic scoring
 2023-06-08 13:56:59 +02:00
Applevangelist
0a0a4684f8 #PLAYERTASKCONTROLLER 
* Added basic scoring
 2023-06-08 13:55:52 +02:00
Frank
569b3df6af Merge branch 'master' into develop 2023-06-08 09:46:24 +02:00
Frank
4cb0e70184 Update RAT.lua 
- Fixed RATMANAGER spamming due to not accounting for planned/scheduled groups
 2023-06-08 09:43:11 +02:00
Frank
8ce371f898 WAREHOUSE 
- Runway destroyed event only triggered if it was operational
 2023-06-07 09:03:01 +02:00
Applevangelist
88f34e5bb0 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 10:28:11 +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
d8e765a9b1 Fixes for getPlayerName() errors if DCS object is not a UNIT 2023-04-18 10:28:00 +02:00
Applevangelist
2470632e84 Fixes for getPlayerName errors 2023-04-18 10:26:43 +02:00
Applevangelist
07c3be9d6a Fixes for getPlayername() errors 2023-04-18 10:24:56 +02:00