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

8569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist
afe2b675e5 #RAT 
* Fixes from dev
 2023-06-08 13:59:59 +02:00
Applevangelist
77c4eb0d54 Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:59:05 +02:00
Applevangelist
238640ec91 Merge remote-tracking branch 'origin/master' into develop 2023-06-08 13:58:58 +02:00
Applevangelist
2c14ee74b0 #SCORING 
* Can leave text empty on some instances
 2023-06-08 13:58:26 +02:00
Applevangelist
4314959cbb Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:57:03 +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
Frank
569b3df6af Merge branch 'master' into develop 2023-06-08 09:46:24 +02:00
Frank
f351d2a37e
Merge pull request #1951 from FlightControl-Master/FF/MasterDevel 
Update RAT.lua
 2023-06-08 09:45:49 +02:00
Frank
4cb0e70184 Update RAT.lua 
- Fixed RATMANAGER spamming due to not accounting for planned/scheduled groups
 2023-06-08 09:43:11 +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
Applevangelist
a12f874e34 Merge remote-tracking branch 'origin/develop' into develop 2023-06-06 16:29:22 +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
ttrebuchon
0a1d469c68
Fix Offset values being saved to the ZONE_UNIT class itself (#1947) 2023-06-03 20:15:33 +02:00
Applevangelist
4cc14b93b6 Merge remote-tracking branch 'origin/develop' into develop 2023-06-03 12:35:59 +02:00
Applevangelist
f5aa294c70 Merge remote-tracking branch 'origin/master' into develop 2023-06-03 12:35:54 +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
69f2acae72 Merge remote-tracking branch 'origin/develop' into develop 2023-06-02 08:46:56 +02:00
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
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
261f79851c Merge remote-tracking branch 'origin/master' into develop 2023-06-01 10:03:34 +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
d9ee3a2323 Merge remote-tracking branch 'origin/develop' into develop 2023-05-30 12:06:46 +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
631d82216e SET 2023-05-30 11:53:15 +02:00
Applevangelist
0b7148f675 Merge remote-tracking branch 'origin/develop' into develop 2023-05-30 07:40:41 +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
Applevangelist
cf39f494f8 #CSAR 
* Corrected flare distance to kms
 2023-05-30 07:38:05 +02:00
Applevangelist
ca9a5187f6 Merge remote-tracking branch 'origin/develop' into develop 2023-05-28 15:29:40 +02:00
Applevangelist
f8201ffed7 Merge remote-tracking branch 'origin/master' into develop 2023-05-28 15:29:30 +02:00
Applevangelist
b70780162b #SPAWN 
* Logic fix for the last parameter of `NewFromTemplate()`
 2023-05-28 15:29:01 +02:00
Applevangelist
246879c003 Merge remote-tracking branch 'origin/master' into develop 2023-05-28 15:28:37 +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
709621967d
Merge pull request #1945 from FlightControl-Master/FF/Ops 
OPSTRANSPORT
 2023-05-27 14:38:30 +02:00
Frank
0c376aec63 OPSTRANSPORT 
Fixed loaded not correctly checked in OPSGROUP
 2023-05-27 14:28:53 +02:00
Frank
725efc3e70
Merge pull request #1944 from FlightControl-Master/FF/Ops 
AUFTRAG
 2023-05-26 11:42:26 +02:00
Frank
81abe422de Merge branch 'develop' into FF/Ops 2023-05-26 11:38:26 +02:00