6688 Commits

Author SHA1 Message Date
Applevangelist
a4dd15013d #changes 2023-02-03 16:41:11 +01:00
Applevangelist
2c411736e5 #NET - initial version 2023-02-03 16:41:01 +01:00
Applevangelist
b81bf447a9 fix 2023-02-02 09:47:05 +01:00
Applevangelist
09a2a79a78 Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:38:59 +01:00
Applevangelist
35da50b67a Merge remote-tracking branch 'origin/develop' into develop-2 2023-02-02 09:38:32 +01:00
Applevangelist
69ba31b44d Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:38:15 +01:00
Applevangelist
710b488663 Merge remote-tracking branch 'origin/master' into develop 2023-02-02 09:38:06 +01:00
Applevangelist
9be30338a5 Herc fix 2023-02-02 09:37:47 +01:00
Applevangelist
6510cca837 Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:36:48 +01:00
Applevangelist
08b8dfbe0e Merge remote-tracking branch 'origin/master' into develop 2023-02-02 09:36:44 +01:00
Applevangelist
f9aa392c6d #CTLD_HERCULES
* Fixed an issue spawning 90 paratroopers instead of 30
2023-02-02 09:35:53 +01:00
Frank
bfe9a1888e
Merge pull request #1899 from ttrebuchon/tt/airwing-sortpayloads-fix
Airwing sortpayloads criteria fix
2023-02-01 19:07:46 +01:00
ttrebuchon
fec496f154 Fix missing check for b.unlimited~=true in sortpayloads function. 2023-02-01 12:30:52 -05:00
Thomas
28fd35ad7e
PlayerRecce - Added Shark_3 as type 2023-02-01 12:17:54 +01:00
Applevangelist
26fa0693b0 Merge remote-tracking branch 'origin/develop' into develop 2023-01-31 11:28:45 +01:00
Applevangelist
75b30ad2f9 Merge remote-tracking branch 'origin/master' into develop 2023-01-31 11:28:40 +01:00
Applevangelist
9dac61cbb6 #CTLD
* Added Subcategories for static cargo objects
2023-01-31 11:28:14 +01:00
Applevangelist
ee6d34a9bd #CTLD
* Added Subcategories for static cargo objects
2023-01-31 11:28:00 +01:00
Applevangelist
48721859fa #CTLD
* Added Subcategories for static cargo objects
2.7.18
2023-01-31 11:27:12 +01:00
Applevangelist
d504472418 Merge remote-tracking branch 'origin/master' into develop 2023-01-30 18:02:45 +01:00
Applevangelist
f731ec7b2f #POINT
* Added COORDINATE:SetAtLandheight()
2023-01-30 18:01:04 +01:00
Applevangelist
375e4231aa #POINT
* Added COORDINATE:SetAtLandheight()
2023-01-30 18:00:29 +01:00
Applevangelist
ee59d999f5 #POINT
* Added COORDINATE:SetAtLandheight()
2023-01-30 18:00:16 +01:00
Applevangelist
e5c003a6bf Merge remote-tracking branch 'origin/develop' into develop 2023-01-29 18:38:02 +01:00
Applevangelist
fdf2d936f9 Merge remote-tracking branch 'origin/master' into develop 2023-01-29 18:37:57 +01:00
Applevangelist
5b8f840d6e Merge remote-tracking branch 'origin/master' into develop 2023-01-29 18:37:19 +01:00
Applevangelist
2f4f98cfe0 #CTLD - nobuildmenu option 2023-01-29 18:36:44 +01:00
Applevangelist
ab4bf1f0a8 Merge remote-tracking branch 'origin/develop' into develop 2023-01-29 17:21:30 +01:00
Applevangelist
332dcf9fe5 Merge remote-tracking branch 'origin/master' into develop 2023-01-29 17:21:16 +01:00
Frank
383ee00e71 Merge branch 'master' into develop 2023-01-29 12:54:13 +01:00
Frank
ac1f202c19 Update Airboss.lua
- Added CJS Superhornet Mod
2023-01-29 12:53:50 +01:00
Frank
f3d1378692 Merge branch 'master' into develop 2023-01-28 18:42:57 +01:00
Frank
3f97ba3bd7 Database
- Polygon drawings are registered as polygon zones
2023-01-28 18:42:29 +01:00
Frank
cfb3004142
Merge pull request #1893 from FlightControl-Master/FF/Ops
OPS
2023-01-28 10:47:49 +01:00
Thomas
016643e494
Merge from. Master (#1892)
* #CSAR - Add Persistence (#1889)

* Adds a modified version of ops.CTLD's Persistence to ops.CSAR

* Update Marker.lua

* Changed documentation for Marker.lua and MarkerOps_Base.lua (#1891)

---------

Co-authored-by: Jason du Plessis <33880363+TheChosenOn3@users.noreply.github.com>
Co-authored-by: grandpaSam <wouldyukindly@gmail.com>
2023-01-28 09:05:23 +01:00
grandpaSam
c0442fca68
Changed documentation for Marker.lua and MarkerOps_Base.lua (#1891) 2023-01-28 09:02:15 +01:00
Thomas
5ec18d45a2
Merge (#1890)
* #CSAR - Add Persistence (#1889)

* Adds a modified version of ops.CTLD's Persistence to ops.CSAR

* Update Marker.lua

---------

Co-authored-by: Jason du Plessis <33880363+TheChosenOn3@users.noreply.github.com>
2023-01-27 18:36:38 +01:00
Thomas
c20927b6d7
Update Marker.lua 2023-01-27 18:34:53 +01:00
Jason du Plessis
0d5b6d4c3e
#CSAR - Add Persistence (#1889)
* Adds a modified version of ops.CTLD's Persistence to ops.CSAR
2023-01-26 21:11:15 +01:00
dogjutsu
f4c9bced45
Add another DCS-gRPC example for MSRS docu (ATIS) (#1883) 2023-01-26 11:25:01 +01:00
Applevangelist
c2aee52bc0 Merge remote-tracking branch 'origin/develop' into develop 2023-01-25 17:56:44 +01:00
Applevangelist
14a851d582 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 17:56:34 +01:00
Applevangelist
58032b0075 * AIRBASE.SouthAtlantic.Rio_Turbio 2023-01-25 17:56:03 +01:00
Applevangelist
e106ca3da5 * AIRBASE added airfields Falklands
* RANGE  added google key usage
2023-01-25 17:55:34 +01:00
Applevangelist
bdc08a530d #AB 2023-01-25 17:54:13 +01:00
Applevangelist
6ab1632b4b #RANGE
* Set Google Key if given

#AIRBASE
* Added 3 Falklands AB to the enumerator
2023-01-25 17:53:29 +01:00
Applevangelist
262c8ffc59 Merge remote-tracking branch 'origin/develop' into develop 2023-01-25 17:19:03 +01:00
Applevangelist
affde2f030 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 17:18:59 +01:00
Applevangelist
3055793cff Merge remote-tracking branch 'origin/develop' into develop 2023-01-25 17:18:22 +01:00
Applevangelist
1e749747b4 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 17:18:16 +01:00