weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-20 22:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,904 Commits 15 Branches 93 Tags
0315530f2c4e252ff8993c5a769ffcdde04489ab
Commit Graph

6904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist 0315530f2c #AIRBASE 
* Added/changed:
  ["Hipico_Flying_Club"] = "Hipico Flying Club",
  ["Aeropuerto_de_Gobernador_Gregores"] = "Aeropuerto de Gobernador Gregores",
  ["Aerodromo_O_Higgins"] = "Aerodromo O'Higgins",
  ["Cullen_Airport"] = "Cullen Airport",
  ["Gull_Point"] = "Gull Point",
 2023-03-16 08:44:31 +01:00
Applevangelist 5fdbfc17ca Merge remote-tracking branch 'origin/develop' into develop 2023-03-10 10:10:22 +01:00
Applevangelist c3974e4b9d Merge remote-tracking branch 'origin/master' into develop 2023-03-10 10:10:14 +01:00
Applevangelist 6946d8d185 Merge remote-tracking branch 'origin/master' into develop 2023-03-10 10:09:40 +01:00
Applevangelist d92a20050c #CTLD 
* Added/completed add/get/set functions for stock
 2023-03-10 10:09:08 +01:00
Applevangelist 9d3e069090 #CTLD 
* Added/completed add/get/set stock functions
 2023-03-10 10:07:58 +01:00
Applevangelist 8783c21cf1 Merge remote-tracking branch 'origin/develop' into develop 2023-03-09 08:54:53 +01:00
Applevangelist 9194a97756 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
 2023-03-09 08:54:41 +01:00
Applevangelist 6ac1d66aae #GROUP 
* Fix for GetMaxHeight()
 2023-03-09 08:49:53 +01:00
Applevangelist 62bca72c6d #GROUP 
* Fix for GetMaxHeight()
 2023-03-09 08:49:24 +01:00
Applevangelist c9a91d0683 #GROUP 
* Fix for GetMaxHeight()
 2023-03-09 08:49:07 +01:00
Applevangelist 7409afb11f UTILS.PlotRacetrack 2023-03-07 10:56:08 +01:00
Applevangelist a67bae4f0d #UTILS 
* Added UTILS.PlotRacetrack courtesy of Buur!
 2023-03-07 10:55:42 +01:00
Applevangelist 4e7c689f7a Merge branch 'master' into develop 2023-03-05 11:04:22 +01:00
Applevangelist 125ecb44c5 #GROUP 
* Callsign translation refactor
 2023-03-05 11:03:47 +01:00
Applevangelist ae6716ac01 #GROUP 
* Callsign translation refactor
 2023-03-05 11:03:26 +01:00
Anthony De Vellis f73ff10edb Refactored GROUP:GetCustomCallSign so that bespoke callsigns override parsing player name and playername overrides vanilla callsigns. Previously Bespoke callsigns would never be used if names contained # or |. If CallsignTranslations is unset, previous priority will be applied. (#1927) 2023-03-05 11:01:37 +01:00
Applevangelist b6397b2926 Merge remote-tracking branch 'origin/develop' into develop 2023-02-28 08:01:21 +01:00
Applevangelist 0a7d520473 Merge remote-tracking branch 'origin/master' into develop 2023-02-28 08:01:15 +01:00
Applevangelist 949e2f9ff3 #SPAWN 
* clarified docu for SpawnScheduled()
* Added parameter to SpawnScheduled() for a delayed spawn
 2023-02-28 08:00:43 +01:00
Applevangelist 34285b26ae #SPAWN 
* clarified docu for SpawnScheduled()
* Added parameter to SpawnScheduled() for a delayed spawn
 2023-02-28 08:00:06 +01:00
Applevangelist edf1e1a3e3 #SPAWN 2023-02-28 07:59:01 +01:00
Applevangelist 3e692d6677 Merge remote-tracking branch 'origin/develop' into develop 2023-02-28 07:39:42 +01:00
Applevangelist 28a44d9e05 Merge remote-tracking branch 'origin/master' into develop 2023-02-28 07:39:36 +01:00
Thomas cb9ab26522 Update Enums.lua (#1925) 2023-02-26 19:06:45 +01:00
Thomas 5341e5faee Update Enums.lua 2023-02-26 19:03:33 +01:00
Applevangelist 7db7919207 Merge remote-tracking branch 'origin/develop' into develop 2023-02-26 10:25:21 +01:00
Frank 7aa4aaf371 Update Auftrag.lua 
- Fixed wrong IAS to TAS convertion for orbit missions
 2023-02-26 01:02:39 +01:00
Frank 901480d99c Merge branch 'FF/Ops' into develop 2023-02-24 23:29:32 +01:00
Frank 84dbda6f2b OPS 
- Rm laser marker
 2023-02-24 23:29:03 +01:00
Applevangelist 095f2eef5d Merge remote-tracking branch 'origin/develop' into develop 2023-02-24 14:06:03 +01:00
Applevangelist 4bc4e631d8 Merge remote-tracking branch 'origin/master' into develop 2023-02-24 14:05:57 +01:00
Applevangelist 9d00ec0c25 Merge remote-tracking branch 'origin/master' into develop 2023-02-24 14:04:53 +01:00
Applevangelist 0d08d732a5 #AWACS - do not convert speed to IAS, as already done in AUFTRAG 2023-02-23 11:12:05 +01:00
Applevangelist 3c2a4dcc70 #AWACS - do not convert speed to IAS, as already done in AUFTRAG 2023-02-23 11:11:48 +01:00
Applevangelist a6224b484e dcs 2023-02-23 10:33:11 +01:00
Applevangelist 8c0f960e39 Merge remote-tracking branch 'origin/master' into develop 2023-02-23 10:32:38 +01:00
Applevangelist 5670764f3b Merge remote-tracking branch 'origin/master' into develop 2023-02-23 10:31:59 +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
Applevangelist a92790c9d0 Merge remote-tracking branch 'origin/master' into develop 2023-02-23 10:18:39 +01:00
Frank b0978b362e Merge pull request #1924 from FlightControl-Master/FF/Ops 
OPS
 2023-02-22 23:18:29 +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 29ebe94015 #CTLD logic correction for loading 2023-02-21 11:39:23 +01:00
Applevangelist 9cfed56847 #CTLD logic correction for loading 2023-02-21 11:38:40 +01:00
Applevangelist 0b692d045f #CTLD logic correction for loading 2023-02-21 11:38:24 +01:00
Applevangelist 7b58ca9134 Merge remote-tracking branch 'origin/develop' into develop 2023-02-19 17:17:45 +01:00