weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-25 06:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,148 Commits 15 Branches 93 Tags
079e60163dbd8123569ce7b2efeb2bfcbb2f39e9
Commit Graph

9148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Applevangelist 079e60163d Merge remote-tracking branch 'origin/master' into develop 2024-07-12 08:10:20 +02:00
Applevangelist 29fb03e903 xx 2024-07-12 08:09:59 +02:00
Applevangelist e6484c1598 various 2024-07-12 08:08:57 +02:00
Applevangelist 336ac9eddb #AWACS - MS TTS - fix spelling out B-R-A in Threat call 2024-07-11 08:35:16 +02:00
Applevangelist 1d64ac3469 Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 11:32:28 +02:00
Applevangelist 26adb7934e Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
 2024-07-09 11:32:23 +02:00
Applevangelist c51a6da5ff Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 11:31:33 +02:00
Applevangelist 5629a8fcd6 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
 2024-07-09 11:31:29 +02:00
Applevangelist 65c7b0d12f Docu fixes 2024-07-09 11:30:41 +02:00
Frank 1a0e2e0ea1 OPS 
- Added method to reduce asset count for cohorts #2103
- Added tacview on legion level
 2024-07-07 23:15:20 +02:00
Frank f74c0e29a5 Merge branch 'master' into develop 2024-07-07 11:32:08 +02:00
Frank 9f8e7f4f3c Merge pull request #2144 from FlightControl-Master/FF/MasterDevel 
RANGE
 2024-07-07 11:05:05 +02:00
Frank b215d0e7d4 Update Range.lua 
- reduced initial status update
 2024-07-07 11:03:03 +02:00
Frank 6f3d9a497a Update Chief.lua 
- Added unsupported mission type for OPSZONE to error log output
 2024-07-06 21:51:20 +02:00
Frank 13b272b6e5 Update Range.lua 
Allow zone to be a string in RANGE:SetRangeZone
 2024-07-06 21:48:07 +02:00
Frank f9031dba42 Merge branch 'master' into FF/MasterDevel 2024-07-06 19:15:05 +02:00
Frank ead7844e5f Merge branch 'master' into develop 2024-07-05 21:36:12 +02:00
Frank 29a4f7c160 Update Event.lua 
#2143 Try with isExist
 2024-07-05 21:35:55 +02:00
Frank d25d89afbb Merge branch 'master' into develop 2024-07-05 17:54:06 +02:00
Frank 55a9c7e020 Update Event.lua 
#2143
 2024-07-05 17:53:50 +02:00
Frank e30fb1c9bd Merge branch 'master' into develop 2024-07-03 23:17:49 +02:00
Frank 84dd1fa21c Update Range.lua 
- Fixe F10 menu bug
 2024-07-03 23:17:37 +02:00
Frank 64039ae770 Merge branch 'master' into develop 2024-07-03 17:45:33 +02:00
Frank 42979093b8 Update Range.lua 
- Added `RANGE:SetMenuRoot`
 2024-07-03 17:45:21 +02:00
Frank 0aa78ec0c8 Merge branch 'master' into develop 2024-07-03 09:47:07 +02:00
Frank edf7f4677c Update Range.lua 
- Fixed name of mission menu
- Improved AddBombingTargetGroup to be passed as string
 2024-07-03 09:46:51 +02:00
Frank 8958d7b71f Update Range.lua 
Replaced RANGE.Sound. by self.Sound.
 2024-07-02 18:04:36 +02:00
Frank 6083191f32 Update Range.lua 
- Added `RANGE:SetSoundfilesInfo`
 2024-07-02 18:02:33 +02:00
Frank 34698a1b4e Merge branch 'master' into develop 2024-07-02 15:52:55 +02:00
Frank 8e0446c594 Update Range.lua 
- Fixed  RANGE.MenuF10Root
 2024-07-02 15:52:44 +02:00
Applevangelist 083bedcc2d Merge remote-tracking branch 'origin/develop' into develop 2024-07-02 12:48:15 +02:00
Applevangelist aad17f97fc Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
 2024-07-02 12:48:09 +02:00
Applevangelist 6a83b48429 Merge remote-tracking branch 'origin/develop' into develop 2024-07-02 12:46:50 +02:00
Applevangelist 77a1150037 #EASYGCICAP - add options to set default despawn after holding or landing 2024-07-02 12:46:45 +02:00
Applevangelist 19ff7ce9a0 #EASYGCICAP - add options to set default despawn after holding or landing 2024-07-02 12:46:35 +02:00
Frank 86508d49ee Merge branch 'master' into develop 2024-07-01 22:15:39 +02:00
Frank 7e20a0a0dc Merge pull request #2142 from FlightControl-Master/FF/MasterDevel 
ATIS
 2024-07-01 22:14:49 +02:00
Frank 58139b34a8 Update ATIS.lua 
- renamed function
 2024-07-01 22:13:55 +02:00
Frank 9ceb26c7b1 ATIS 
- Cleaned up debug lines
 2024-07-01 22:07:55 +02:00
Applevangelist 0058383e64 Merge remote-tracking branch 'origin/master' into develop 
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
 2024-06-30 16:02:11 +02:00
Applevangelist 1549ca1cc4 Merge remote-tracking branch 'origin/master' into develop 2024-06-30 16:01:22 +02:00
Applevangelist 7abb6680b4 fixes 2024-06-30 16:01:02 +02:00
Applevangelist 9ca30fc00c Fixes 2024-06-30 16:00:49 +02:00
Applevangelist 9479b338c5 xxx 2024-06-30 15:57:09 +02:00
Applevangelist b6ac1e86e4 xx 2024-06-30 15:20:23 +02:00
Applevangelist a4b187d561 xx 2024-06-30 15:20:17 +02:00
Applevangelist 335bd897d5 Merge remote-tracking branch 'origin/master' into develop 2024-06-30 11:31:51 +02:00
Frank 1ba1738aa0 Merge branch 'master' into FF/MasterDevel 2024-06-29 13:59:50 +02:00
Frank c8cdbeac5c Update ATIS.lua 
- Added option to specify Airbase and NATO paths to sound files
- Fixed Rainy presets not recognized correctly
 2024-06-29 13:57:51 +02:00
Frank 4b12b04840 Merge pull request #2140 from DarthZyll/patch-3 
Update UserFlag.lua for incorrect documentation
 2024-06-28 23:02:24 +02:00