FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,688 Commits 10 Branches 87 Tags
Commit Graph

6688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
b5bc881d52 Merge remote-tracking branch 'origin/master' into develop 2022-10-10 17:44:55 +02:00
Applevangelist
66d5ba9981 #Core.Point 
* Cleanup GetClosestAirbase()
 2022-10-10 17:44:20 +02:00
Applevangelist
72085a7962 #Core.Point 
* Cleanup GetClosestAirbase()
 2022-10-10 17:44:03 +02:00
Applevangelist
aaa956287f #Core.Point 
* Cleanup GetClosestAirbase()
 2022-10-10 17:43:12 +02:00
Applevangelist
c5145a38e2 #Core.Point 
* Cleanup GetClosestAirbase()
 2022-10-10 17:42:02 +02:00
Applevangelist
c659bc6f2f Merge remote-tracking branch 'origin/Apple/Develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/PlayerTask.lua
 2022-10-10 16:56:49 +02:00
Applevangelist
0323144248 #Playertask 2022-10-10 16:55:58 +02:00
Thomas
19ca30527e
Update PlayerTask.lua 
Added PLAYERTASK:IlluminateTarget(Power,Height)
 2022-10-10 14:30:54 +02:00
Thomas
2b6eba0106
Update PlayerTask.lua 
#PLAYERTASK
* Added Coalition, Freetext and FreetextTTS addition options
 2022-10-10 14:02:37 +02:00
Applevangelist
eecef9a0aa #PLAYERRECCE 
* minor enhancements
 2022-10-09 12:56:54 +02:00
Applevangelist
7e6aa20168 #PLAYERRECCE 
* Minor Enhancement
 2022-10-09 12:56:00 +02:00
Applevangelist
38b9778e9a #SET 
* minor enhancement
 2022-10-09 12:53:45 +02:00
Applevangelist
c0845443d0 #PLAYERRECCE 
* Minor enhancements
 2022-10-09 12:51:53 +02:00
Applevangelist
69a80a6c38 #PLAYERRECCE 
* Added setting of laser distance as camera sight calc is a non-starter
* Added specific laser zone of 20m x length to catch targets to lase
* Reworked detection of hit on lased target
 2022-10-07 14:33:38 +02:00
Applevangelist
ff194b4425 #PLAYERRECCE 
* Added setting of laser distance as camera sight calc is a no-starter
* Added specific laser zone of 20mxlength to catch targets to lase
* Reworked detection of hit on lased target
 2022-10-07 14:29:54 +02:00
Applevangelist
6a22e03689 #PLAYERTASKCONTROLLER 
* Enable PLAYERTASKCONTROLLER:EnableBuddyLasing(Recce) - buddy lasing precision bombing tasks with a PLAYERRECCE connection
 2022-10-06 17:05:35 +02:00
Applevangelist
d63ab1138c #PLAYERTASKCONTROLLER 
* Enable PLAYERTASKCONTROLLER:EnableBuddyLasing(Recce) - buddy lasing precision bombing tasks with a PLAYERRECCE connection
 2022-10-06 17:05:16 +02:00
Applevangelist
f790c4fb9e #PLAYERRECCE 
* Gazelle optics refinement
* Added Shack FSM event
 2022-10-06 13:29:58 +02:00
Applevangelist
40427c75b9 #FlightGroup dual naming in functions 2022-10-06 13:28:19 +02:00
Applevangelist
120b77d853 #PLAYERRECCE 
* Gazelle sight correcions
* Added Shack event
 2022-10-06 13:27:26 +02:00
Applevangelist
e18a5e4832 #PLAYERTASKCONTROLLER 
* Switch comms on opening task
 2022-10-06 08:15:39 +02:00
Applevangelist
e2dce132df #PLAYERTASKCONTROLLER 
* switch names on opening comms
 2022-10-06 08:14:54 +02:00
Applevangelist
b7c572f800 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/PlayerRecce.lua
 2022-10-06 08:09:04 +02:00
Applevangelist
44f7df2ea5 Fixes 2022-10-06 08:07:54 +02:00
Applevangelist
4d2a58e428 Fixes 2022-10-06 08:07:37 +02:00
Applevangelist
005d6d2b06 Merge remote-tracking branch 'origin/master' into develop 2022-10-06 08:03:07 +02:00
Applevangelist
c9ab7dd8e7 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Zone.lua
 2022-10-06 08:02:09 +02:00
Jason du Plessis
2ca6168f47
#ZONE * Fixed ZONE_RADIUS Not being added to _Database (#1798) 
* #ZONE * Fixed ZONE_RADIUS Not being added to _Database

Bugfix for #1797.

ZONE_RADIUS was not being registered within the _Database table, thus for CTLD, the Zone could not be found for moving units to ZONE_RADIUS zones. Because other Zone types inherit ZONE_RADIUS, I've added a RegisterZone parameter that is default to true, and modified the inheritance of the other Zone types to register the zone in the _Database depending if the zone does not get registered in that zone type.

* #ZONE * Updated ZONE_RADIUS RegisterZone to DoNotRegisterZone

Changed RegisterZone to DoNotRegisterZone and updated the different zone types values for RegisterZone.

Suggested by Applevangelist.

Co-authored-by: Jason du Plessis <jason.duplessis@ebtax.co.za>
 2022-10-06 07:27:07 +02:00
Thomas
7ada57033a
Update PlayerRecce.lua (#1796) 
* Update PlayerRecce.lua

* Update PlayerRecce.lua
 2022-10-06 07:25:24 +02:00
Thomas
22d98fe753
Update Zone.lua 
fix for #1797
 2022-10-05 16:01:56 +02:00
Thomas
929f3d2e16
Update PlayerRecce.lua 2022-10-05 14:27:03 +02:00
Thomas
db85478381
ZONE_BASE/RADIUS not registering in the DB 
if not _DATABASE:FindZone(ZoneName) then
	  _EVENTDISPATCHER:CreateEventNewZone(self)
  end

-- problem when creating zones on the fly and trying to find them with :FindByName() laters
 2022-10-05 14:19:39 +02:00
Applevangelist
8fa4c04b16 Merge remote-tracking branch 'origin/develop' into develop 2022-10-05 07:34:27 +02:00
Applevangelist
1a332ae6ab Merge remote-tracking branch 'origin/master' into develop 2022-10-05 07:33:46 +02:00
Applevangelist
41cd3ea23c Merge remote-tracking branch 'origin/master' into develop 2022-10-05 07:33:17 +02:00
Applevangelist
dae2da4a5d PlayerRecce 2022-10-05 07:32:57 +02:00
Applevangelist
0da2299472 Docu changes 2022-10-05 07:32:17 +02:00
Frank
064e082a12 Airwing 
- Added `:IncreasePayloadAmount` function
 2022-10-03 19:12:19 +02:00
Frank
10eec8a47b Update FlightGroup.lua 
- Added `GetSquadronName` and `GetAirwingName` functions
 2022-10-03 16:32:55 +02:00
Frank
db469d1b84 Merge branch 'develop' into FF/Ops 2022-10-02 22:10:52 +02:00
Frank
1e04aaa77d Update Airboss.lua 
- reenabled ai handling
 2022-10-02 19:45:48 +02:00
Applevangelist
63a03dc361 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
 2022-10-02 19:36:41 +02:00
Applevangelist
e97753125d Merge remote-tracking branch 'origin/master' into develop 2022-10-02 19:35:15 +02:00
Applevangelist
1474ff9b88 Merge remote-tracking branch 'origin/develop' into develop 2022-10-02 19:34:09 +02:00
Applevangelist
39bb95f127 #PLAYERRECCE 
-- DONE: Sort for multiple targets in one direction
-- DONE: Targets with forget timeout, also report
 2022-10-02 19:34:04 +02:00
Applevangelist
94fb59f8bf #PLAYERRECCE 
-- DONE: Sort for multiple targets in one direction
-- DONE: Targets with forget timeout, also report
 2022-10-02 19:33:46 +02:00
Frank
bf2ce3c4af AIRBOSS v1.3.0 
- Copy from `develop` branch.
- Disabled AI handling as this is bugged (needs `FLIGHTGROUP` class)
 2022-10-02 19:20:25 +02:00
Frank
42baf6c8d2 AIRBOSS v1.3.0 
- Added Invincible parameters from master branch
- Increased version number
 2022-10-02 19:13:51 +02:00
Frank
73b9552b5c Merge branch 'master' into develop 2022-10-02 16:55:47 +02:00
Frank
c0f82eabb2 Server Name 
**GLOBALS**
- Read out server name from `Config/serverSettings.lua`
**SOCKET**
- Added `server_name` to transmitted UDP data
 2022-10-02 16:54:48 +02:00