Commit Graph

8367 Commits

Author SHA1 Message Date
Applevangelist 492900d5d1 Merge remote-tracking branch 'origin/master' into develop 2024-01-05 15:52:16 +01:00
Applevangelist ca9913e38b nu aber 2024-01-05 15:51:09 +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
Applevangelist 67bd4429f5 Merge remote-tracking branch 'origin/master' into develop 2024-01-04 11:29:06 +01:00
Applevangelist c1d468b35f Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 11:27:54 +01:00
Applevangelist 109270d717 STRATEGO
* Renamed knots to nodes to have the correc lingo
2024-01-04 11:27:48 +01:00
Applevangelist 98d131881f xxx 2024-01-04 11:27:24 +01:00
Frank f80e7a2166 Merge branch 'master' into develop 2024-01-03 22:32:50 +01:00
Frank 9b95e71d75 Update Airboss.lua
- Potential fix for error raised on discord
2024-01-03 22:32:37 +01:00
Applevangelist de6c7d636b docu 2024-01-03 18:56:43 +01:00
Applevangelist 57ff653dc3 xxx 2024-01-03 18:56:28 +01:00
Applevangelist f8a3e7fc2e Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Stratego.lua
#	Moose Development/Moose/Functional/Tiresias.lua
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2024-01-03 18:16:59 +01:00
Applevangelist 8910311c5c Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_Balancer.lua
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua
2024-01-03 18:15:58 +01:00
Applevangelist f57beab6d2 #STRATEGO 2024-01-03 18:14:12 +01:00
Applevangelist 29414bfd21 Merge remote-tracking branch 'origin/develop' into develop 2024-01-03 18:06:21 +01:00
Applevangelist 60b8a5f5af Merge remote-tracking branch 'origin/master' into develop 2024-01-03 18:06:15 +01:00
Applevangelist db6dc7b77e SET: Added GetRandomSurely() 2024-01-03 18:05:29 +01:00
Applevangelist e5fbaeafcd xxx 2024-01-03 18:03:53 +01:00
Applevangelist 90e7711788 STRATEGO 2024-01-03 18:03:45 +01:00
kaltokri aaf3553597 Merge branch 'master' into develop 2024-01-03 11:59:27 +01:00
kaltokri 4e50bd213c No fixes for broken links 2024-01-03 09:04:43 +01:00
kaltokri c813e2dbc4 Fixed broken links 2024-01-03 07:53:41 +01:00
Rolf Geuenich 4c81333a0a Add the dynamic loading of developer files (#2090) 2024-01-03 07:19:18 +01:00
kaltokri 761d83a68f Fix broken link in Awacs.lua 2024-01-02 22:10:08 +01:00