Commit Graph

7475 Commits

Author SHA1 Message Date
Applevangelist 568f76b0b2 #UTILS
* Remove utils.routines
2023-09-07 18:01:16 +02:00
Applevangelist 58f60dbf1b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
2023-09-07 16:17:44 +02:00
Applevangelist 559c8d763b Merge remote-tracking branch 'origin/master' into develop 2023-09-07 16:16:19 +02:00
Applevangelist c5f3bfe4a9 Merge remote-tracking branch 'origin/master' into develop 2023-09-07 16:15:08 +02:00
Applevangelist 326d4b3135 Merge remote-tracking branch 'origin/master' 2023-09-07 16:14:45 +02:00
Applevangelist c4fad08d58 Act 2023-09-07 16:14:42 +02:00
Applevangelist 5a57d05fd6 Deprecated flags 2023-09-07 16:14:21 +02:00
Applevangelist 5329745325 Merge remote-tracking branch 'origin/develop' into develop 2023-09-07 12:45:30 +02:00
Applevangelist 792222f567 #PLAYERTASK, #CLIENTMENU
* Fixes
2023-09-07 12:45:26 +02:00
Applevangelist e6a7416acf #PLAYERTASK 2023-09-07 12:43:23 +02:00
Frank a8f14fca70 Merge branch 'master' into develop 2023-09-06 21:33:29 +02:00
Frank 8a7fa326cd Update MissileTrainer.lua
- Docs: Class deprecated ==> use FOX instead
2023-09-06 21:33:05 +02:00
Frank 02105b1efc Update Airboss.lua
Fixed bug missing end in if statement
2023-09-05 20:53:02 +02:00
Applevangelist 93fd9e5d42 #CLIENTMENU
* Catch error on Menu removes
2023-09-05 10:35:12 +02:00
Applevangelist f43924fbb0 #CLIENTMENU 2023-09-05 10:34:07 +02:00
Applevangelist da77741dab Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
2023-09-01 09:49:13 +02:00
Applevangelist d367f85f06 Merge remote-tracking branch 'origin/master' into develop 2023-09-01 09:47:30 +02:00
Applevangelist 65c384622c #AIRBOSS
* Suppress unnecessary SRS TTS calls with empty text
2023-09-01 09:46:52 +02:00
Applevangelist 18afe9ad7a #AIRBOSS
* Suppress unnecessary SRS TTS calls with empty text
2023-09-01 09:44:12 +02:00
Applevangelist d9c656f6d2 #Airboss 2023-09-01 09:42:24 +02:00
Applevangelist 379dd44c04 Merge remote-tracking branch 'origin/develop' into develop 2023-09-01 08:53:28 +02:00
Applevangelist d9a11588b7 Merge remote-tracking branch 'origin/master' into develop 2023-09-01 08:53:22 +02:00
Applevangelist d7b87b63d8 #MANTIS
* Added zone filter option.
2023-09-01 08:52:46 +02:00
Applevangelist 253cf0f5a5 #MANTIS
* Added zone filter option.
2023-09-01 08:52:13 +02:00
Applevangelist cb6dd0d6c7 #MANTIS 2023-09-01 08:51:51 +02:00
Applevangelist ab2e8efad5 Merge remote-tracking branch 'origin/develop' into develop 2023-08-31 15:12:41 +02:00
Applevangelist 0f5ea8516b Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Mantis.lua
2023-08-31 15:12:00 +02:00
Frank b5b079d75f Merge pull request #2001 from ttrebuchon/tt/auftrag-newcap-nil-ref-bugfix
Fix error in AUFTRAG:NewCAP when Altitude is not explicitly provided
2023-08-31 14:57:31 +02:00
ttrebuchon d0421f5226 Ensure Altitude is not nil in NewCAP to avoid breaking KnotsToAltKIAS. 2023-08-31 08:48:08 -04:00
Applevangelist 7769ca8c3f #MANTIS
* Add zone filter option
2023-08-31 11:59:03 +02:00
Applevangelist 2940eaed63 #AIRBOSS 2023-08-31 11:53:13 +02:00
Applevangelist 79ddc01bf7 Merge remote-tracking branch 'origin/master' into develop 2023-08-30 16:47:19 +02:00
Applevangelist 219e46793e #MANTIS
* CH assets
2023-08-30 16:46:33 +02:00
Applevangelist c5a85456c0 #MANTIS
* CHM Assets
2023-08-30 16:46:13 +02:00
Applevangelist 0fa7897de4 Merge remote-tracking branch 'origin/develop' into develop 2023-08-29 15:50:16 +02:00
Applevangelist fe120542f3 Merge remote-tracking branch 'origin/master' into develop 2023-08-29 15:50:11 +02:00
Applevangelist 9a383826e7 Merge remote-tracking branch 'origin/master' 2023-08-29 15:49:52 +02:00
Applevangelist 1e6731830e #MANTIS
* Added two more CH mod types
2023-08-29 15:49:48 +02:00
Applevangelist c4b874e3f9 #MANTIS
* Added two more CH mod types
2023-08-29 15:49:20 +02:00
Applevangelist d9aff32a36 #MANTIS
* Added two more CH mod types
2023-08-29 15:48:36 +02:00
Frank 8b04d32839 Merge pull request #2000 from FlightControl-Master/FF/Ops
Update OpsGroup.lua
2023-08-28 20:27:39 +02:00
Frank 382605d4cf Update OpsGroup.lua
- Fixed bug loading opsgroups as cargo
2023-08-28 20:23:51 +02:00
Frank 1337815f05 Merge pull request #1999 from FlightControl-Master/FF/Ops
OPSTRANSPORT
2023-08-27 18:46:50 +02:00
Frank 1cd3b6a26b OPSTRANSPORT
- Docs
2023-08-27 15:13:07 +02:00
Frank f34dcdb3db OPSGROUP
- Added parameter to selfdestruct single element
2023-08-27 12:03:26 +02:00
Frank e3b7a85956 OPSTRANSPORT
- Improved storage transport
2023-08-26 23:55:21 +02:00
Applevangelist 1644db1503 Merge remote-tracking branch 'origin/develop' into develop 2023-08-26 16:09:17 +02:00
Applevangelist eb67e938f8 Merge remote-tracking branch 'origin/master' into develop 2023-08-26 16:09:10 +02:00
Applevangelist 30cadf0d42 test 2023-08-26 16:08:45 +02:00
Frank 655282a034 Merge branch 'develop' into FF/Ops 2023-08-26 14:06:15 +02:00