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
7,042 Commits 10 Branches 87 Tags
Commit Graph

5133 Commits

Author SHA1 Message Date
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
Frank
60cf7506f8 Update Airboss.lua 
- Added `landingdist` as carrier parameter and into LSO result
- Case III does not check groove time for unicorns
 2022-10-02 16:10:14 +02:00
Applevangelist
894062c757 #POINT 
* Added COORDINATE:ToStringFromRPShort
 2022-10-02 13:16:56 +02:00
Applevangelist
d9acce04b6 #POINT 
* Added COORDINATE:ToStringFromRPShort
 2022-10-02 13:16:21 +02:00
Applevangelist
165a5d7364 #PLAYERRECCE 
* Message improvements
* Laser Distance 8km
* Option to set RP Reference Point
 2022-10-02 13:16:00 +02:00
Applevangelist
30aba1258d #POINT 
* Added COORDINATE:ToStringFromRPShort
 2022-10-02 13:14:57 +02:00
Applevangelist
405e66ea72 #PLAYERTASK 
* SRS transmit option only when players are on
 2022-10-01 16:36:29 +02:00
Applevangelist
c351c446a0 * SRS silent when no player is on 2022-10-01 16:35:51 +02:00
Applevangelist
a42ff85406 #PLAYERRECCE 
* Integrated SRS
* Integrated PLAYERTASKCONTROLLER (optional), can upload target data from Recce
 2022-10-01 16:03:05 +02:00
Applevangelist
ddde0f8629 #PLAYERRECCE 
* Integrated SRS
* Integrated PLAYERTASKCONTROLLER (optional), can upload target data from Recce
 2022-10-01 16:01:41 +02:00
Applevangelist
2eba68b35c #ATIS, MSRSQUEUE 
* Added option to only transmit via SRS if there are active Players
 2022-10-01 11:58:28 +02:00
Applevangelist
f2ed920214 #SRSQUEUE, ATIS 
* Added option to only transmit via SRS if there are active players
 2022-10-01 11:57:22 +02:00
Applevangelist
dd1cd3bc79 ATIS 2022-10-01 11:56:39 +02:00
Applevangelist
fb4f7acb16 SRS additions 2022-10-01 11:53:50 +02:00
Frank
efe7673c4c Merge branch 'develop' into FF/Ops 2022-09-30 19:34:23 +02:00
Applevangelist
ab42e506e8 #PLAYERRECCE 
* Some nicefications
 2022-09-30 19:07:26 +02:00
Applevangelist
ca92d7d569 #PLAYERRECCE 
* Some nicefications
 2022-09-30 19:07:12 +02:00
Applevangelist
0ee2baadce #AWACS 
* Make Markers and Drawings strictly coalition specific
 2022-09-30 19:03:26 +02:00
Applevangelist
3322609f87 #AWACS 
* Make markers and drawings strictly coalition specific
 2022-09-30 19:02:45 +02:00
Applevangelist
43856341e6 #PLAYERRECCE 
* Initial Release
 2022-09-30 18:49:08 +02:00
Applevangelist
c7baaa26f2 #PLAYERRECCE 
* Initial Release
 2022-09-30 18:47:28 +02:00
Applevangelist
aefc655535 Merge remote-tracking branch 'origin/develop' into develop 2022-09-30 14:49:30 +02:00