Commit Graph

8388 Commits

Author SHA1 Message Date
Applevangelist cf4d35efa2 xxx 2024-01-07 13:25:14 +01:00
Applevangelist 7e842fbd46 xxx 2024-01-07 13:16:52 +01:00
Applevangelist 0009539eef Merge remote-tracking branch 'origin/develop' into develop 2024-01-06 18:23:46 +01:00
Applevangelist 1490eee0e9 Merge remote-tracking branch 'origin/master' into develop 2024-01-06 18:23:42 +01:00
Applevangelist 406dbb707a Merge remote-tracking branch 'origin/develop' into develop 2024-01-06 18:22:41 +01:00
Applevangelist 4758af61c2 Merge remote-tracking branch 'origin/master' into develop 2024-01-06 18:22:36 +01:00
Applevangelist 729c1f5e33 Fixes for MSRS changes
#STRATEGO
* fix for an AB not having a zone
2024-01-06 18:22:18 +01:00
Applevangelist fce7b07014 Fixes for MSRS changes 2024-01-06 18:21:39 +01:00
Applevangelist 45fb191483 Fixes for MSRS changes 2024-01-06 18:21:10 +01:00
Applevangelist cfe99341d7 STRATEGO
* Fix if an airbase has no zone predefined
2024-01-06 18:20:55 +01:00
Applevangelist 0db96082a1 xxx 2024-01-06 18:17:56 +01:00
kaltokri 8386fe5f67 Merge branch 'master' into develop 2024-01-06 12:22:25 +01:00
kaltokri 4696569f83 Added mission check for desanitized io 2024-01-06 12:22:02 +01:00
Applevangelist 0d224ee2fd Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 16:09:59 +01:00
Applevangelist 15482bb734 Merge remote-tracking branch 'origin/master' into develop 2024-01-05 16:09:55 +01:00
Applevangelist 2c695e187f Merge remote-tracking branch 'origin/master' into develop 2024-01-05 16:09:22 +01:00
Applevangelist 048ab6acfe Fixes for 4th SRS Parameter 2024-01-05 16:09:05 +01:00
Applevangelist 84230e2360 Fixes for 4th SRS Parameter 2024-01-05 16:08:46 +01:00
Applevangelist fd86b17b6d Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 15:52:21 +01:00
Applevangelist 492900d5d1 Merge remote-tracking branch 'origin/master' into develop 2024-01-05 15:52:16 +01:00
Applevangelist f2783c46c2 Merge remote-tracking branch 'origin/master' into develop 2024-01-05 15:51:35 +01:00
Applevangelist ca9913e38b nu aber 2024-01-05 15:51:09 +01:00
Applevangelist df1bc5c55d Merge remote-tracking branch 'origin/master' into develop 2024-01-05 15:46:45 +01:00
Applevangelist fba19bc755 Merge remote-tracking branch 'origin/master' into develop 2024-01-05 15:46:10 +01:00
Applevangelist ff951c69d9 Error dfix 2024-01-05 15:45:40 +01:00
Applevangelist 0c3caffe93 Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 15:44:32 +01:00
Applevangelist 642824818c Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2024-01-05 15:44:24 +01:00
Applevangelist e53a80783e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2024-01-05 15:43:33 +01:00
Applevangelist a1fb09285b STRATEGO - Improvements 2024-01-05 15:42:33 +01:00
Applevangelist f2f7c88299 SRS changes 2024-01-05 15:42:11 +01:00
Applevangelist 1a1c3a6c9f xx 2024-01-05 15:41:01 +01:00
Applevangelist e2bf1f727d FLIGHTGROUP - Amending landing on an AFB w/o runways
SRS - some improvements
2024-01-05 15:37:52 +01:00
Applevangelist b90853f431 xxx 2024-01-05 15:36:03 +01:00
Applevangelist 4ad51b8866 xxx 2024-01-05 15:35:54 +01:00
Applevangelist 71f12f1856 Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 12:20:21 +01:00
Applevangelist b329bf8088 xxx 2024-01-05 12:13:18 +01:00
Applevangelist 65315251b5 PLAYERTASK, AWACS - small fix for the revamped SRS 2024-01-05 12:13:04 +01:00
Applevangelist b8f5e55ac9 Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 10:26:07 +01:00
Applevangelist 2a9e98c21e Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 18:49:50 +01:00
Applevangelist b40c1e4575 Fixes 2024-01-04 18:49:47 +01:00
Applevangelist 8171e3aad2 xxx 2024-01-04 18:48:26 +01:00
Frank a9befc4d96 Merge branch 'master' into develop 2024-01-04 15:13:26 +01:00
Applevangelist 039be9790d Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 14:02:09 +01:00
Applevangelist 1599b14beb Merge remote-tracking branch 'origin/master' into develop 2024-01-04 14:02:04 +01:00
Applevangelist f5d6d31b10 xxx 2024-01-04 14:01:12 +01:00
Applevangelist 170f97d013 xxx 2024-01-04 14:01:02 +01:00
Applevangelist 65fb22b6cc xxx 2024-01-04 14:00:43 +01:00
Applevangelist d0346c4aa3 MSRS
line 953 has no self
2024-01-04 13:59:41 +01:00
Applevangelist 96da09b9e0 Picture link 2024-01-04 12:44:43 +01:00
Applevangelist 8fa89753b6 Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 11:29:10 +01:00