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

2096 Commits

Author SHA1 Message Date
Applevangelist
0577e5171b #AIRBOSS 
* SRS: Remove lines starting with # from being spelled out
 2023-06-18 12:19:28 +02:00
Applevangelist
09f0c9e069 #AIRBOSS 2023-06-18 12:18:09 +02:00
ttrebuchon
9c1acc731a Make Attributes parameter documentation conform to other similar descriptions 2023-06-17 17:32:49 -04:00
ttrebuchon
92f81614ba Update/fix lua docs for new AUFTRAG transport fields 2023-06-17 17:09:50 -04:00
ttrebuchon
2a11c4c98a Rename AUFTRAG.transportCategories/etc to carrierCategories/etc 2023-06-17 17:07:56 -04:00
ttrebuchon
e284773492 Move transport categories/etc to SetRequiredCarriers, to allow for specifying them without always needing to specify zones 2023-06-17 17:06:16 -04:00
ttrebuchon
b3d46618c2 Missed 2 spots in Legion/Commander for transport filters. 2023-06-17 16:56:46 -04:00
ttrebuchon
4e36e2011f Add categories/attributes/properties filters for AUFTRAG transports 2023-06-17 15:35:11 -04:00
Applevangelist
0d40b36613 #AIRBOSS 
* Added option to set Airboss voice for SRS etc
* Nicer read out of weather info and carrier info
 2023-06-17 15:01:57 +02:00
Applevangelist
a3876c296e #AIRBOSS 
* Added option to set Airboss voice for SRS etc
* Nicer read out of weather info and carrier info
 2023-06-17 15:01:33 +02:00
Applevangelist
c80213b4cf #AIRBOSS 
* Initial SRS addition
 2023-06-16 18:18:18 +02:00
Applevangelist
ef17399128 #AIRBOSS SRS 2023-06-16 18:10:07 +02:00
Applevangelist
cca8c31ff4 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
 2023-06-16 11:08:54 +02:00
Frank
bffb3e7778 OPS 
UNIT and POSITIONABLE
- Removed pcall for GetVec3 and GetAmmo

CHIEF
- Deploy resources if zone is empty and owned by itself
 2023-06-15 19:12:26 +02:00
Applevangelist
b2c95e37ae Merge remote-tracking branch 'origin/develop' into develop 2023-06-15 14:50:30 +02:00
Frank
eec7e5f8d9 Merge branch 'develop' into FF/Ops 2023-06-15 01:25:10 +02:00
Frank
a9b51cca93 Update Auftrag.lua 2023-06-15 01:24:59 +02:00
ttrebuchon
a7806deb76 Recruit assets using resource Nmin and Nmax, rather than Nmax and Nmax. 2023-06-14 12:41:05 -04:00
Applevangelist
27011f3ce6 Merge remote-tracking branch 'origin/develop' into develop 2023-06-14 17:25:33 +02:00
ttrebuchon
83353d710d Use GetRelativeCoordinate in FLIGHTGROUP:GetParkingSpot 2023-06-13 13:04:24 -04:00
Applevangelist
e2e2b44fb8 Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 18:01:46 +02:00
Frank
8855b117a8 Update OpsGroup.lua 
- exists check for ammo and vec3
 2023-06-13 16:01:47 +02:00
Applevangelist
9e84c6af1b Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 08:35:53 +02:00
Frank
d31db1351a
Merge pull request #1956 from FlightControl-Master/FF/Ops 
AUFTRAG
 2023-06-11 22:52:28 +02:00
Frank
0f33603ecc AUFTRAG 
- Changed ingress waypoint of CASENHANCED
 2023-06-11 22:45:59 +02:00
ttrebuchon
163273096c Set life0 based on itself, rather than off of life 2023-06-10 18:08:29 -04:00
Applevangelist
8658804c82 Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 13:25:54 +02:00
Applevangelist
fd51ec6932 #FIX 2023-06-09 13:25:29 +02:00
Frank
1b6648996c OPSGROUP 
- Improved CAPTUREZONE for FLIGHTGROUP
 2023-06-08 19:51:09 +02:00
Frank
f45a22fe78 Merge branch 'develop' into FF/Ops 2023-06-08 15:52:25 +02:00
Applevangelist
77c4eb0d54 Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:59:05 +02:00
Applevangelist
fad85ef7ed #PLAYERTASK 
* Added basic scoring
 2023-06-08 13:56:59 +02:00
Applevangelist
0a0a4684f8 #PLAYERTASKCONTROLLER 
* Added basic scoring
 2023-06-08 13:55:52 +02:00
Applevangelist
910da86caf Merge remote-tracking branch 'origin/develop' into develop 2023-06-07 17:25:49 +02:00
ttrebuchon
73ff2c576d
Fix typo from TRANSPORT. to OPSTRANSPORT. (#1950) 2023-06-07 17:26:20 +02:00
Applevangelist
d5ffb48548 #PLAYERTASK 
* Fix for one tts output
 2023-06-07 17:25:45 +02:00
Frank
8ce371f898 WAREHOUSE 
- Runway destroyed event only triggered if it was operational
 2023-06-07 09:03:01 +02:00
Thomas
6f02f23240
PlayerTask.lua (#1948) 
Small fix for one tts text
 2023-06-06 16:20:16 +02:00
Applevangelist
00f89f0855 PLAYERTASK 
* Small fix in TTS text
 2023-06-06 16:13:23 +02:00
Applevangelist
823f8fb4fb Merge remote-tracking branch 'origin/master' into develop 2023-06-03 12:35:05 +02:00
Applevangelist
41bb2551d3 #CTLD 
* Ensure new menus can be build if player changes helos
 2023-06-03 12:34:18 +02:00
Applevangelist
bb17e8cc1f #CTLD 
* Ensure new menus can be build if player changes helos
 2023-06-03 12:34:09 +02:00
Applevangelist
f7e64bc9b5 #UNIT #CTLD 
* Stabilize that sometimes a unit coordinate cannot be found
 2023-06-02 08:45:35 +02:00
Applevangelist
065c59f167 #UNIT #CTLD 
* Stabilize that sometimes a unit coordinate cannot be found
 2023-06-02 08:44:43 +02:00
Applevangelist
55ed394782 #UNIT #CTLD 
* Stabilize that sometimes a unit coordinate cannot be found
 2023-06-02 08:44:14 +02:00
Applevangelist
6773ac7841 #PLAYERTASK 
* Added FSM event "Progress" that will be triggered if the targetcount goes down for a task, but is not yet zero. This will bubble up to PLAYERTASKCONTROLLER

#PLAYERTASKCONTROLLER
* Added FSM event"TaskProgess" (see above). The event function will recveive the PLAYERTASK and the current target count
* Changed the menu build strategy to ensure a lot less menu rebuilds. Menus are now only build if
	* A new player joins (for the joining single player)
	* On joining a task (for the joining single player)
	* When aborting a task (for the aborting single player)
	* On Task succes (for all players)
	* Removal of time based builds: The status loop will now only enforce the menu build if the task count in the queue is smaller than the menu item limit. This effectively enforces a time-based order of tasks, and newer, even higher prio task will not bubble into the task list of pilots automatically.
 2023-05-30 12:06:03 +02:00
Applevangelist
5afad6e313 #PLAYERTASK 
* Added FSM event "Progress" that will be triggered if the targetcount goes down for a task, but is not yet zero. This will bubble up to PLAYERTASKCONTROLLER

#PLAYERTASKCONTROLLER
* Added FSM event"TaskProgess" (see above). The event function will recveive the PLAYERTASK and the current target count
* Changed the menu build strategy to ensure a lot less menu rebuilds. Menus are now only build if
	* A new player joins (for the joining single player)
	* On joining a task (for the joining single player)
	* When aborting a task (for the aborting single player)
	* On Task succes (for all players)
	* Removal of time based builds: The status loop will now only enforce the menu build if the task count in the queue is smaller than the menu item limit. This effectively enforces a time-based order of tasks, and newer, even higher prio task will not bubble into the task list of pilots automatically.
 2023-05-30 12:05:51 +02:00
Applevangelist
b03f03bf06 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/CSAR.lua
 2023-05-30 07:40:32 +02:00
Applevangelist
39f29b066b Merge remote-tracking branch 'origin/master' into develop 2023-05-30 07:38:48 +02:00
Applevangelist
f7acbc3928 #CSAR 
* Corrected flare distance to kms
 2023-05-30 07:38:19 +02:00