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

5231 Commits

Author SHA1 Message Date
Applevangelist
00ecbc98ba Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Airbase.lua
 2023-06-02 08:46:48 +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
dd7a883a33 Fixes 2023-06-01 10:02:51 +02:00
Applevangelist
878169f51c Fixes 2023-06-01 10:00:31 +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
631d82216e SET 2023-05-30 11:53:15 +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
f7acbc3928 #CSAR 
* Corrected flare distance to kms
 2023-05-30 07:38:19 +02:00
Applevangelist
cf39f494f8 #CSAR 
* Corrected flare distance to kms
 2023-05-30 07:38:05 +02:00
Applevangelist
b70780162b #SPAWN 
* Logic fix for the last parameter of `NewFromTemplate()`
 2023-05-28 15:29:01 +02:00
Applevangelist
2318578126 #SPAWN 
* Logic fix for the last parameter of `NewFromTemplate()`
 2023-05-28 15:27:34 +02:00
Applevangelist
da312cd5ac Merge remote-tracking branch 'origin/develop' into develop 2023-05-27 16:31:12 +02:00
Frank
0c376aec63 OPSTRANSPORT 
Fixed loaded not correctly checked in OPSGROUP
 2023-05-27 14:28:53 +02:00
Frank
81abe422de Merge branch 'develop' into FF/Ops 2023-05-26 11:38:26 +02:00
Frank
fb202012da AUFTRAG 
Reinforcing
- improved check if reinforcing is still ongoing
- improved handling by commander/chief
- added check that assets are not added to a mission twice
 2023-05-26 11:37:19 +02:00
Applevangelist
89223ae142 Merge remote-tracking branch 'origin/master' into develop 2023-05-26 08:28:45 +02:00
Applevangelist
3e6f25f17c #UTILS 
* Added UTILS.PrintTableToLog()
 2023-05-26 08:28:08 +02:00
Applevangelist
dd496d35a8 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
 2023-05-25 09:00:33 +02:00
Applevangelist
158ffde780 #CONTROLLER 
* Fix for Link4
 2023-05-25 08:58:21 +02:00
Applevangelist
2967de8f6e #CONTROLLER 
* Fix for Link4
 2023-05-25 08:57:54 +02:00
Applevangelist
0cd6a59ce4 #CONTROLLER 
* Fix for Link4
 2023-05-25 08:57:15 +02:00
Applevangelist
402674470f Merge remote-tracking branch 'origin/develop' into develop 2023-05-25 08:26:23 +02:00
Applevangelist
31174ae97c Merge remote-tracking branch 'origin/master' into develop 2023-05-25 08:26:06 +02:00
Applevangelist
9c5260f801 Merge remote-tracking branch 'origin/develop' into develop 2023-05-25 08:24:35 +02:00
Applevangelist
4d9ce80c98 Merge remote-tracking branch 'origin/master' into develop 2023-05-25 08:24:16 +02:00
Applevangelist
91a445961b #RESCUEHELO 
* Small fix to get the coordinate of an ejected/crashed unit
 2023-05-25 08:23:31 +02:00
Applevangelist
4c7239c5ec Bugfixes 2023-05-25 08:22:51 +02:00
Frank
ee055531b6 Merge branch 'master' into develop 2023-05-24 11:16:36 +02:00
Frank
749e9b7e08 Update Event.lua 
Fixed bug that statics are handled incorrectly if they are the target object of an event (*e.g.* hit event)
 2023-05-24 11:16:01 +02:00
Frank
21db80afad Merge branch 'develop' into FF/Ops 2023-05-23 01:29:04 +02:00
Frank
d9d5458450 OPS 
**AUFTRAG**
- New type `FAC`

**OPSZONE**
- Improved drawzone on capture
 2023-05-23 01:28:52 +02:00
Applevangelist
0575b366dd #SPAWN 
* Tweaked NewFromTemplate, and gave a better example
 2023-05-22 17:57:50 +02:00
Applevangelist
905d29b279 #SPAWN 
* Tweaked NewFromTemplate, and gave a better example
 2023-05-22 17:57:03 +02:00
Applevangelist
a69e62a66b #SPAWN 
* Tweaked NewFromTemplate, and gave a better example
 2023-05-22 17:56:53 +02:00
Applevangelist
034b2444ff Merge remote-tracking branch 'origin/master' into develop 2023-05-20 12:13:35 +02:00
Applevangelist
5f97299cb2 Small Fix 2023-05-20 12:12:18 +02:00
Applevangelist
c6051f30d0 Small fix 2023-05-20 12:12:00 +02:00
Applevangelist
7901d53d54 #POINT 
* Added FindClosestStatic()
 2023-05-19 17:13:17 +02:00
Applevangelist
60b75a4c8f #POINT 
* Added FindClosestStatic()
 2023-05-19 17:11:54 +02:00
Applevangelist
f1b030f3d5 #Added findcloseststatic 2023-05-19 17:11:26 +02:00
Applevangelist
88f34e5bb0 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 10:28:11 +02:00
Applevangelist
a33ca69368 fixes 2023-05-17 10:26:58 +02:00
Applevangelist
0868286f27 #WAREHOUSE 
* Fixed one omission for SHIP transport types
 2023-05-17 10:26:29 +02:00
Applevangelist
cae084a352 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 09:41:27 +02:00
Applevangelist
c8c031d05f Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
 2023-05-17 09:40:40 +02:00
Applevangelist
ffcc46cb2d #CTLD 
* Changed VHF modulation to AM
* Added option to have a different sound file for UHF, in case you want to silent FC3 radios
* Thanks to Streakeagle
 2023-05-17 09:34:54 +02:00
Frank
6d07f7c48c Merge branch 'develop' into FF/Ops 2023-05-13 23:36:36 +02:00
Frank
014fea5f10 Merge branch 'master' into develop 2023-05-13 23:36:12 +02:00
Frank
21bcd64c9d Update Controllable.lua 
Corrected parameters for enroute tasks according to hoggit for
- CONTROLLABLE:EnRouteTaskFAC
- CONTROLLABLE:EnRouteTaskFAC_EngageGroup
 2023-05-13 23:35:58 +02:00