Commit Graph

8086 Commits

Author SHA1 Message Date
Applevangelist e838431b28 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:25:51 +01:00
Applevangelist c22304f2b0 Remove demo links which were empty 2023-12-03 12:25:25 +01:00
Applevangelist e36d6bb7b7 Merge remote-tracking branch 'origin/develop' into develop 2023-12-03 12:12:37 +01:00
Applevangelist f8e3e7ff99 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:12:34 +01:00
Applevangelist 1c10bfea92 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:11:55 +01:00
Applevangelist c97d2ecaba #ATIS - multi freq example added 2023-12-03 12:11:22 +01:00
Applevangelist f2ce03e9ea Merge remote-tracking branch 'origin/develop' into develop 2023-12-03 12:04:15 +01:00
Applevangelist 05d9854df0 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:04:11 +01:00
Applevangelist 2dc9f19d78 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:03:41 +01:00
Applevangelist 89a9d1d0a4 #CONTROLLABLE
* Fixed ID issue with AA Missile Attack Range option

#POINT
* Added methdo to get the BULLSEYE as coordinate
2023-12-03 12:01:50 +01:00
Applevangelist cf7d41cd7f #ZONE_POLYGON improvements
#ZONE_OVAL NEW
2023-12-03 11:42:53 +01:00
Applevangelist 19465c7698 Merge remote-tracking branch 'origin/Apple/Develop' into develop 2023-12-03 11:36:01 +01:00
Applevangelist 4e9f6487df Merge remote-tracking branch 'origin/develop' into develop 2023-12-03 11:35:56 +01:00
Applevangelist 83b0282ec0 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 11:35:53 +01:00
Niels Vaes fd191be274 Added ZONE_OVAL. (#2057)
* Added ZONE_OVAL. This can be useful for simulating the area of a view zone from an object looking down at the ground for example.

Can be constructed from a Mission Editor drawing.

* add to DB
2023-12-03 11:34:52 +01:00
Thomas 4e19c91be5 Update Event.lua (#2055)
Fix for playername in weapon target
2023-12-03 09:26:39 +01:00
Thomas 31bdde130a Update Event.lua (#2056)
Fix for playername in weapon target
2023-12-03 09:26:09 +01:00
Thomas afe542cc63 Update Event.lua
Fix for playername in weapon target
2023-12-03 09:23:42 +01:00
Frank 494550fe91 Merge pull request #2054 from nielsvaes/moose_develop_vanilla
Update on the ZONE_POLYGON class, so we can finally use it with drawings made in the Mission Editor as well
2023-12-02 20:48:26 +01:00
Niels Vaes 29c0d81c27 Update on the ZONE_POLYGON class, so we can finally use it with drawings made in the Mission Editor as well.
Supports closed line segments, rects and freely drawn polygons.

Added the correct way of generating a point within a polygon with trial and error

Added a way to get the surface area.

Added a helper class (_ZONE_TRIANGLE), which shouldn't ever be used on its own. It's there to support the update ZONE_POLYGON.

Some test code, assuming there's a poygon drawn in the mission editor called "poly":

```Lua
-- make a new zone from a drawing
poly = ZONE_POLYGON:NewFromDrawing("poly")
-- draw the zone for everyone, include the individual triangles that make up the polygon
poly:DrawZone(-1, {1,0,0}, 1, {1,0,0}, 255, 4, false, true)
-- generate 500 random points, evenly distributed in the polygon
for i=1, 500 do
	COORDINATE:NewFromVec2(poly:GetRandomVec2()):CircleToAll(1000)
end

-- remove the drawing from the game
poly:UndrawZone()
```
2023-12-02 20:33:30 +01:00
Applevangelist f009b9adee Merge remote-tracking branch 'origin/develop' into develop 2023-12-02 15:12:09 +01:00
Applevangelist 77dd4f86b9 Merge remote-tracking branch 'origin/master' into develop 2023-12-02 15:12:05 +01:00
Applevangelist e79c2481da Merge remote-tracking branch 'origin/master' into develop 2023-12-02 15:11:35 +01:00
Applevangelist 89a902fd57 #ATIS
* make info multi-frequency safe
2023-12-02 15:11:14 +01:00
Applevangelist 5eabc41256 Merge remote-tracking branch 'origin/develop' into develop 2023-12-02 14:46:41 +01:00
Applevangelist dda2fc6ad5 Merge remote-tracking branch 'origin/master' into develop 2023-12-02 14:46:37 +01:00
Applevangelist 460ad9db39 Merge remote-tracking branch 'origin/master' into develop 2023-12-02 14:46:04 +01:00
Applevangelist ae604fd847 #AIRBASE
* Add'l Normandy Airfields
2023-12-02 14:45:42 +01:00
Applevangelist 9a2126dfc7 Merge remote-tracking branch 'origin/develop' into develop 2023-12-01 16:30:53 +01:00
Applevangelist 2f5598de5a Merge remote-tracking branch 'origin/master' into develop 2023-12-01 16:30:48 +01:00
Applevangelist 099f059eec Merge remote-tracking branch 'origin/develop' into develop 2023-12-01 16:29:52 +01:00
Applevangelist c3bba7d1fc #PLAYERRECCE
* Make the laser corridor a bit wider

#FLIGHtCONTROL
* Also create non-info when ATIS isn't set
2023-12-01 16:29:49 +01:00
Applevangelist d7c7a1a1dd xxx 2023-12-01 16:28:04 +01:00
Frank db71610d72 Merge branch 'master' into develop 2023-11-30 23:29:39 +01:00
Frank 4b8d120f20 Update Warehouse.lua
- Added check that DCS warehouse has enough air assets for selfpropelled assets
2023-11-30 23:29:29 +01:00
Applevangelist 1dc31cc852 spawn 2023-11-29 18:01:37 +01:00
Applevangelist 2488c0dd05 #SPAWN
* Link16 Team Members
2023-11-29 17:36:57 +01:00
Applevangelist 37dab7b8bd color 2023-11-29 16:42:55 +01:00
Applevangelist 68b97773fe #OPSZONE
* Added option to set own pikey-ish zone colors
2023-11-29 16:42:30 +01:00
Applevangelist 3024d4b52f Merge remote-tracking branch 'origin/develop' into develop 2023-11-28 10:38:36 +01:00
Applevangelist 3c0e977584 #PLAYERRECCE
* Bug fix for clock view calculation
* Ensure lasing is switched off when using the menu
* Create SPOT more often
2023-11-28 10:37:45 +01:00
Applevangelist b33df5374f #PLAYERRECCE
* Bug fix for clock view calculation
* Ensure lasing is switched off when using the menu
* Create SPOT more often
2023-11-28 10:36:28 +01:00
Applevangelist f5e3c843c4 Merge remote-tracking branch 'origin/develop' into develop 2023-11-27 16:51:17 +01:00
Applevangelist dd57089fcf Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
2023-11-27 16:51:13 +01:00
Applevangelist f03a48b118 Merge remote-tracking branch 'origin/master' into develop 2023-11-27 16:49:56 +01:00
Applevangelist c489a88106 #GROUP
* Get Link16 S/TN data from a group
2023-11-27 16:49:06 +01:00
Applevangelist 73a62d3a1a #GROUP
STNs
2023-11-27 16:46:47 +01:00
Applevangelist 76493fb6d7 Merge remote-tracking branch 'origin/develop' into develop 2023-11-26 17:00:57 +01:00
Applevangelist 1e783fad29 Merge remote-tracking branch 'origin/master' into develop 2023-11-26 17:00:53 +01:00
Applevangelist 4747dae51a Merge remote-tracking branch 'origin/master' into develop 2023-11-26 17:00:17 +01:00