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

8149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank
b1436b66d4 LEGION 
- Added random asset score
- Added nil check for request.cargogroupset in :onafterAssetDead
 2023-09-20 21:52:28 +02:00
Applevangelist
d2107466cc Merge remote-tracking branch 'origin/develop' into develop 2023-09-20 17:17:43 +02:00
Applevangelist
3975e1961e Merge remote-tracking branch 'origin/master' into develop 2023-09-20 17:17:40 +02:00
Applevangelist
ca84fa11cd #ATIS 
* Added Spanish TTS locale ("es")
 2023-09-20 17:17:12 +02:00
Applevangelist
f71039e840 #ATIS 
* Added Spanish TTS locale ("es"
 2023-09-20 17:16:52 +02:00
Frank
78ffaf6e0a Update OpsGroup.lua 
- Fix that loading is never done
 2023-09-20 14:38:24 +02:00
Applevangelist
01bd921d30 Merge remote-tracking branch 'origin/develop' into develop 2023-09-19 18:09:00 +02:00
Applevangelist
ad079cc416 Merge remote-tracking branch 'origin/master' into develop 2023-09-19 18:08:56 +02:00
Applevangelist
7c3c39c1ba Merge remote-tracking branch 'origin/master' into develop 2023-09-19 18:08:16 +02:00
Applevangelist
ed614767e6 #ATIS 
* Added localization option
 2023-09-19 18:07:51 +02:00
Applevangelist
1e966ee217 #ATIS 
* Added SRS localization
 2023-09-19 18:06:48 +02:00
Applevangelist
523c36100a Merge remote-tracking branch 'origin/develop' into develop 2023-09-19 12:15:01 +02:00
Applevangelist
fa4e3ebc7e Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
 2023-09-19 12:14:54 +02:00
Applevangelist
147f39981b Merge remote-tracking branch 'origin/master' into develop 2023-09-19 12:14:19 +02:00
Applevangelist
6d94a0c776 Smaller fixes 2023-09-19 12:13:39 +02:00
Applevangelist
3cc6f53374 Serialize 2023-09-19 12:10:04 +02:00
Applevangelist
80fdbc4960 Merge remote-tracking branch 'origin/master' into develop 2023-09-19 11:31:18 +02:00
Applevangelist
81fd5cb605 One Typo Less 2023-09-19 11:30:46 +02:00
Applevangelist
03e1b28c97 Typo 2023-09-19 11:30:27 +02:00
Applevangelist
2a761ff8d0 Merge remote-tracking branch 'origin/develop' into develop 2023-09-19 11:11:18 +02:00
Applevangelist
ed6a388a8e Merge remote-tracking branch 'origin/master' into develop 2023-09-19 11:11:14 +02:00
Applevangelist
fc9ddae9b2 Merge remote-tracking branch 'origin/master' into develop 2023-09-19 11:10:33 +02:00
Applevangelist
b70bf3b9af #SEAD 
* Better calculation of switch-on again time
 2023-09-19 11:10:06 +02:00
Applevangelist
75529958f6 #SEAD 
* Better calculation of switch-on again time
 2023-09-19 11:09:55 +02:00
Applevangelist
2e7cbe989a Merge remote-tracking branch 'origin/develop' into develop 2023-09-17 17:17:13 +02:00
Applevangelist
b0db51fa5a Merge remote-tracking branch 'origin/master' into develop 2023-09-17 17:17:03 +02:00
Applevangelist
d0330cc696 Merge remote-tracking branch 'origin/master' into develop 2023-09-17 17:16:30 +02:00
Applevangelist
250d640e76 #SPAWN 
* Added option for Modex pre- and postfix strings
* Added string check for SpawnAtParkingSpot when Airbase is handed as string
 2023-09-17 17:15:12 +02:00
Applevangelist
5886d154ae #SPAWN 
* Added option for Modex pre- and postfix
 2023-09-17 17:13:51 +02:00
Applevangelist
f6fcf41c70 Merge remote-tracking branch 'origin/develop' into develop 2023-09-17 16:54:02 +02:00
Applevangelist
a22ad88bda Merge remote-tracking branch 'origin/master' into develop 2023-09-17 16:53:58 +02:00
Applevangelist
c173fe0cb8 Quick check on airbase being a string 2023-09-17 16:52:45 +02:00
Frank
dca70eaa05 Merge branch 'master' into develop 2023-09-17 16:13:50 +02:00
Frank
6a05789db5 Update Controllable.lua 
- Fixed wrong id of task`EnrouteTaskEngageGroup`
- Fixed wrong id of task `EnrouteTaskFAC_EngageGroup`
 2023-09-17 16:13:28 +02:00
Applevangelist
7b027c0802 Merge remote-tracking branch 'origin/develop' into develop 2023-09-15 09:13:05 +02:00
Applevangelist
df05290180 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Utilities/Enums.lua
 2023-09-15 09:13:01 +02:00
Applevangelist
5048201771 #Startup 
* Re-instate suppression of error box.
 2023-09-15 09:12:17 +02:00
Applevangelist
5e20874dca #Startup 
* Re-instate suppression of error box.
 2023-09-15 09:11:32 +02:00
Applevangelist
dd41cd4b4f #Startup 
* Re-instate suppression of error box.
 2023-09-15 09:11:20 +02:00
Applevangelist
c4e3e4420c Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
 2023-09-14 16:34:24 +02:00
Applevangelist
5e36425058 #PLAYERTASKCONTROLLER 
* Fix a problem that sometimes the object event is called prior to the SET_CLIENT event for players joining, leading to false negatives on specifically filtered SET_CLIENT objects
 2023-09-14 12:36:51 +02:00
Applevangelist
bc16970d96 #SET_CLIENT 
* Small fix for FilterCallsign string search
 2023-09-14 12:36:15 +02:00
Applevangelist
97809cdb65 #PLAYERTASKCONTROLLER 
* Fix a problem that sometimes the object event is called prior to the SET_CLIENT event for players joining, leading to false negatives on specifically filtered SET_CLIENT objects
 2023-09-14 12:35:43 +02:00
Applevangelist
4e44d979a1 Merge remote-tracking branch 'origin/develop' into develop 2023-09-13 16:05:02 +02:00
Applevangelist
0e0d22e7ce Merge remote-tracking branch 'origin/master' into develop 2023-09-13 16:04:57 +02:00
Applevangelist
3f1ad24f6a Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Functional/MissileTrainer.lua
 2023-09-13 16:04:23 +02:00
Applevangelist
674fef554d Intellisense docu fixes 2023-09-13 16:03:32 +02:00
Applevangelist
f8f4bac77e Intellisense docu fixes 2023-09-13 16:03:05 +02:00
Applevangelist
74f87b3f2d Intellisense 2023-09-13 16:02:38 +02:00
Applevangelist
0e3d4205c9 Merge remote-tracking branch 'origin/develop' into develop 2023-09-13 15:31:55 +02:00