weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-21 06:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,555 Commits 15 Branches 93 Tags
cf4d6f46b500fd3e4e65a268c8eae3b54705dc80
Commit Graph

6555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist cf4d6f46b5 Merge remote-tracking branch 'origin/develop' into develop 2023-01-08 18:38:56 +01:00
Applevangelist a7c8954740 Docu typo 2023-01-08 18:38:12 +01:00
Applevangelist a21b9b382e Merge remote-tracking branch 'origin/develop' into develop 2023-01-08 18:09:26 +01:00
Applevangelist ef0b76a632 #PLAYERTASK 
* Added FSM events PlayerJoinedTask and PlayerAbortedTask
 2023-01-08 18:09:22 +01:00
Applevangelist 4b19cbcf67 #PLAYERTASK 
* Added FSM events PlayerJoinedTask and PlayerAbortedTask
 2023-01-08 18:08:53 +01:00
Mike 2806d3a191 Merge pull request #1880 from dogjutsu/dogjutsu/MSRS-gRPC-docs-cleanup 
Doc fixes related to MSRS w/ DCS-gRPC alt backend
 2023-01-08 16:41:38 +00:00
dogjutsu 9688c7ef01 Doc fixes related to MSRS w/ DCS-gRPC alt backend 2023-01-08 08:34:52 -08:00
Applevangelist 85aa46ad2b Merge remote-tracking branch 'origin/develop' into develop 2023-01-08 14:50:11 +01:00
dogjutsu d6181d26f8 Add DCS-gRPC TTS altnerate backend for MSRS (#1879) 2023-01-08 08:37:11 +01:00
Frank aa5e8662ed Merge pull request #1877 from FlightControl-Master/FF/Ops 
OPSGROUP
 2023-01-07 17:19:34 +01:00
Frank ca11e724ab Merge branch 'develop' into FF/Ops 2023-01-07 17:12:04 +01:00
Frank ab272da46e FLIGHTGROUP 
- Increased dealy before Route to base to 1.0 sec. Previous delay of 0.1 sec was apparently too short for the stop flag to take effect and the task was not called done. Hence the mission was also not done.
 2023-01-07 17:04:34 +01:00
Frank 584e932769 ARMYGROUP 
- No retreat on out-of-ammo if rearming mission is in the queue
 2023-01-07 10:53:46 +01:00
Applevangelist 691a500381 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 11:00:06 +01:00
Applevangelist 1b6169bf2e Merge remote-tracking branch 'origin/develop' into develop 2023-01-05 10:59:31 +01:00
Applevangelist 6b995f8b13 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 10:59:23 +01:00
Applevangelist 8cedd88ce2 #SCENERY - explain destroy doesn't work 2023-01-05 10:58:40 +01:00
Applevangelist 21a2df0830 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 10:49:13 +01:00
Applevangelist c3fde2b698 Merge remote-tracking branch 'origin/master' 2023-01-05 10:48:55 +01:00
Applevangelist 59e8aed445 #CSAR fix for beacons 2023-01-05 10:48:50 +01:00
Applevangelist d56bc000a1 Merge remote-tracking branch 'origin/develop' into develop 2023-01-05 10:48:03 +01:00
Applevangelist b38f167a27 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
 2023-01-05 10:47:52 +01:00
Applevangelist 16af086cc5 #CTLD 2023-01-05 10:46:06 +01:00
Applevangelist e47b8f377c #CTLD/CSAR 
* Small fix for
 2023-01-05 10:45:37 +01:00
Thomas 24cc5ca32d Update CTLD.lua 2023-01-04 11:53:59 +01:00
Thomas 47f6f7e8cc Update CTLD.lua 2023-01-04 11:42:56 +01:00
Thomas dde458aea0 Update CSAR.lua 2023-01-04 11:42:25 +01:00
Thomas d34d902413 Develop (#1874) 
* #FG
* make us AB the default

* OPS

**CHIEF**
- Fixed bugs of polygon opszones
- Added option to use CAPTUREZONE auftrag for opszones

**OPSZONE**
- Fixed bug when marker off

**ZONE_POLYGON_BASE**
- Added `GetRadius()` function

**LEGION**
- Improved Reinforcement

* AWACS -correct error in SetAwacsDetails (#1873)

Corrected setting of Angels

Co-authored-by: Frank <frank@inter-zone.de>
 2023-01-04 09:24:57 +01:00
Thomas 4773a83a24 AWACS -correct error in SetAwacsDetails (#1873) 
Corrected setting of Angels
 2023-01-04 09:21:00 +01:00
Frank 09e9377e54 Merge pull request #1872 from FlightControl-Master/FF/Ops 
OPS
 2023-01-03 22:13:28 +01:00
Frank 19a90b7d9d Merge branch 'develop' into FF/Ops 2023-01-03 22:10:09 +01:00
Frank dbaed1e97b OPS 
**CHIEF**
- Fixed bugs of polygon opszones
- Added option to use CAPTUREZONE auftrag for opszones

**OPSZONE**
- Fixed bug when marker off

**ZONE_POLYGON_BASE**
- Added `GetRadius()` function

**LEGION**
- Improved Reinforcement
 2023-01-03 22:09:56 +01:00
Applevangelist 812aff7f2e AB useage 2023-01-03 10:34:07 +01:00
Applevangelist 9695789843 #FG 
* make us AB the default
 2023-01-03 10:33:51 +01:00
Applevangelist 75ddd2e1e0 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:23:34 +01:00
Applevangelist 39535cef7b Merge remote-tracking branch 'origin/develop' into develop 2023-01-03 10:23:02 +01:00
Applevangelist d3ba0bbb22 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:22:55 +01:00
Applevangelist 793c0d988e Changes from dev 2023-01-03 10:22:10 +01:00
Applevangelist 43c81afd12 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:17:48 +01:00
Applevangelist 88a837b769 #FlightGroup 
* Added options to allow afterburner, jettison of empty tanks and jettison of weapons
 2023-01-03 10:15:35 +01:00
Applevangelist b0eef34146 #CONTROLLABLE 
* Docu fix

#WAREHOUSE
* Changes from dev

#ZONE
* Additions to ZONE_POLYGON
 2023-01-03 10:15:16 +01:00
Applevangelist f401179c57 #FlightGroup 
* Added options to allow afterburner, jettison of empty tanks and jettison of weapons
 2023-01-03 10:14:06 +01:00
Applevangelist 0bd481d4f0 Merge remote-tracking branch 'origin/develop' into develop 2023-01-02 17:29:15 +01:00
Applevangelist 0942f02d2c Merge remote-tracking branch 'origin/master' into develop 2023-01-02 17:29:09 +01:00
Applevangelist 55656761d2 #FIXES 2023-01-02 17:28:20 +01:00
Applevangelist 659188e3cb UNIT 2023-01-02 17:27:27 +01:00
Applevangelist 9657976f63 FG 2023-01-02 17:27:20 +01:00
Applevangelist 3fbfb8b528 #UNIT 
* Fix #1865
 2023-01-02 17:27:01 +01:00
Applevangelist 97e44b2042 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Auftrag.lua
 2023-01-02 16:56:29 +01:00
Applevangelist 112457cb4b Merge remote-tracking branch 'origin/master' into develop 2023-01-02 16:55:49 +01:00