Commit Graph

1298 Commits

Author SHA1 Message Date
Thomas 303a15eb50 Ammotruck
* Added feature for # of re-munitions a truck can do
2023-07-03 12:21:05 +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 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 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
Applevangelist 7db7919207 Merge remote-tracking branch 'origin/develop' into develop 2023-02-26 10:25:21 +01:00
Frank 84dbda6f2b OPS
- Rm laser marker
2023-02-24 23:29:03 +01:00
Applevangelist 4bc4e631d8 Merge remote-tracking branch 'origin/master' into develop 2023-02-24 14:05:57 +01:00
Applevangelist e95c1ad3aa #Fixes from dev 2023-02-23 10:30:59 +01:00
Applevangelist d0e6a29486 Merge remote-tracking branch 'origin/develop' into develop 2023-02-23 10:20:22 +01:00
Frank ffef3183c7 OpsGroup
- Fixed bug in checklos
2023-02-22 23:01:47 +01:00
Frank 20a9857fcf Merge branch 'FF/OpsDev' into FF/Ops 2023-02-22 22:17:49 +01:00
Frank 828395c398 Merge branch 'develop' into FF/Ops 2023-02-22 22:17:35 +01:00
Frank 462e29da6e RANGE and OPS
** RANGE**
- Added scenery as target

**OPSGROUP**
- Added option that group does not return to its legion

**AUFTRAG**
- Added option that assets do not return to its legion
2023-02-22 22:16:42 +01:00
Applevangelist 70386811e6 AICSAR 2023-02-19 12:31:57 +01:00
Applevangelist bef8e53347 #AICSAR - added option to use eject event 2023-02-19 12:30:00 +01:00
Applevangelist 1fd8f4d837 #AICSAR
* Named functions for the events
2023-02-18 11:04:49 +01:00
Applevangelist 9b62710d64 #AICSAR
* Named functions for the events
2023-02-18 11:04:37 +01:00
Applevangelist a7e45338e3 #AICSAR - Added alt/speed options 2023-02-17 08:54:54 +01:00
Applevangelist 985adc0267 Fixes 2023-02-17 08:54:33 +01:00
Applevangelist 578b68f635 #AICSAR 2023-02-16 18:22:26 +01:00
Applevangelist 6ec43b72ce #AICSAR
* Added PlayerName to `OnAfterPilotRescued(From,Event,To,PilotName)` if available
2023-02-16 18:22:06 +01:00
Applevangelist 6d9e2fbfe1 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2023-02-13 16:41:32 +01:00
Frank ac1b458eb4 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-12 13:53:47 +01:00
Frank f5938bc235 Merge branch 'develop' into FF/Ops 2023-02-12 13:53:25 +01:00
Frank 7280c17506 Merge branch 'master' into develop 2023-02-12 13:04:32 +01:00
Frank 92c5c32e8c Merge pull request #1921 from FlightControl-Master/FF/MasterDevel
Update Range.lua
2023-02-12 13:03:08 +01:00
Frank c8780b2d5f Update Range.lua
- Coordinate of bomb target is now always updated (not only for moving targets)
- If the target is not alive any more, the last known position is used for its coordinate
2023-02-12 13:00:19 +01:00
Frank 4e280f02b6 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-12 11:53:42 +01:00
Frank 854f6ae6ae Merge branch 'develop' into FF/Ops 2023-02-12 11:52:13 +01:00
Applevangelist c2b8261133 Merge remote-tracking branch 'origin/master' into develop 2023-02-09 16:13:06 +01:00
Applevangelist 2da2ddb5bb #DETECTION
* Docu fixes
2023-02-09 16:12:39 +01:00