weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-28 06:26:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,086 Commits 15 Branches 93 Tags
99a55a3c8a0fce6175ef67dbc3fd3c94de5c50c9
Commit Graph

8086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Frank 0487487e7c Merge branch 'master' into develop 2023-02-12 11:51:16 +01:00
Frank f11dbfa367 Merge branch 'FF/MasterDevel' 2023-02-12 11:49:13 +01:00
Frank 54fb9deb3e Polygon and line drawings 2023-02-12 11:38:46 +01:00
Frank 9ec66912c8 Update OpsGroup.lua 
- Added SetCargoBayLimit function
 2023-02-12 09:36:35 +01:00
Thomas 960f261ddd Master merge (#1920) 
* #NET
* Initial release

* Update MarkerOps_Base.lua (#1919)
 2023-02-11 22:17:24 +01:00
Thomas d3c34ef04d Update MarkerOps_Base.lua (#1919) 2023-02-11 22:11:21 +01:00
Frank e55f96f393 OPSTRANSPORT 2023-02-11 00:21:15 +01:00
Applevangelist 713a5b067f #PLAYERTASKCONTROLLER 
* Added `AddAgentSet()`
 2023-02-10 11:40:15 +01:00
Applevangelist 0ec039bb39 #PLAYERTASKCONTROLLER 
* Added `AddAgentSet()`
 2023-02-10 11:38:45 +01:00
Applevangelist 0823eb1ed0 #fix 2023-02-10 11:37:51 +01:00
Applevangelist 3d5470eb22 #NET 
* Initial release
 2023-02-10 11:00:14 +01:00
Applevangelist d6aa7ec17c #Net 
* Initial Release
 2023-02-10 10:45:23 +01:00
Applevangelist c1ab696774 #NET 2023-02-10 10:41:59 +01:00
Applevangelist 93d61a99fa Merge remote-tracking branch 'origin/develop' into develop 2023-02-09 16:13:11 +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
Applevangelist cb00a3fa38 #DETECTION 
* Docu fixes
 2023-02-09 16:11:59 +01:00
Applevangelist 2a3d69d0d5 #DETECTION 
* Docu fixes
 2023-02-09 16:11:45 +01:00
Applevangelist 48aaf8179d Merge remote-tracking branch 'origin/develop' into develop 2023-02-09 13:21:25 +01:00
Applevangelist 608033f38f #AICSAR 
* Docu additions
 2023-02-09 13:17:49 +01:00
Applevangelist 292bc790ee #AICSAR 
* Docu additions
 2023-02-09 13:17:34 +01:00
Applevangelist 5a0a761c08 Merge remote-tracking branch 'origin/Apple/Develop' into develop 2023-02-09 11:57:46 +01:00
Applevangelist e44f61181a #AICSAR 
* Fixed issue with underlying OpsTransport
* Added FSM Transition OnAfterPilotUnloaded()
* Added options for SRS TTS output - no sound files
* Added voice options for downed pilot and operator - these can have different voices
 2023-02-09 11:57:41 +01:00
Applevangelist 28c25816a6 #AICSAR 
* Fixed issue with underlying OpsTransport
* Added FSM Transition OnAfterPilotUnloaded()
* Added options for SRS TTS output - no sound files
* Added voice options for downed pilot and operator - these can have different voices
 2023-02-09 11:57:28 +01:00
Applevangelist 387aef6626 fxi 2023-02-09 11:53:45 +01:00
Frank 709fccd96c OSPTRANSPORT 2023-02-09 01:06:36 +01:00
Frank 2c24e56aa5 Merge branch 'FF/MasterDevel' into FF/OpsDev 2023-02-08 16:35:49 +01:00
Frank 9862c32378 Update settings.json 2023-02-08 16:30:44 +01:00
Frank 9f02232589 Update settings.json 2023-02-08 16:29:25 +01:00
Frank ffc86bf046 Unwanted changes 2023-02-08 16:28:04 +01:00
Frank f104ddbe64 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-08 16:15:22 +01:00
Frank bbd8ceb8c0 Merge branch 'develop' into FF/Ops 2023-02-08 16:15:06 +01:00
Frank b8498fa58f Merge branch 'FF/MasterDevel' into FF/OpsDev 2023-02-08 16:14:45 +01:00
Frank e4c8ca34ed Update Pathline.lua 2023-02-08 16:11:47 +01:00
Frank f02b7036a9 PATHLINE 2023-02-08 12:37:18 +01:00
Frank 34c26c44bc Merge branch 'develop' into FF/OpsDev 2023-02-07 22:53:19 +01:00
Frank 6adef47340 PATHLINE 
Added new class PATHLINE
 2023-02-07 22:47:55 +01:00
Thomas da93126d58 Update Moose.files 2023-02-07 11:05:54 +01:00
Applevangelist 49c45f97fc Test smaller dev moose 2023-02-07 10:51:14 +01:00
Applevangelist b225e44cfa Merge remote-tracking branch 'origin/develop' into develop 2023-02-07 08:02:11 +01:00
Applevangelist afa17f95f9 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 08:02:05 +01:00
Applevangelist c97f1791b0 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 08:01:34 +01:00
Thomas 5b044cc036 Update CSAR.lua (#1917) 2023-02-07 07:28:00 +01:00
Applevangelist 790f8ec127 Merge remote-tracking branch 'origin/develop' into develop 2023-02-06 08:18:21 +01:00