Merge pull request #617 from ciribob/beta

Release 2.0.5.0
ciribob · Jul 10, 2022 · c64c94b · c64c94b
2 parents 7e17c11 + c2cfe67
commit c64c94b
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 22 deletions.
diff --git a/AutoUpdater/Properties/AssemblyInfo.cs b/AutoUpdater/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
diff --git a/DCS-SR-Client/Properties/AssemblyInfo.cs b/DCS-SR-Client/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
diff --git a/DCS-SR-Common/Network/UpdaterChecker.cs b/DCS-SR-Common/Network/UpdaterChecker.cs
@@ -21,7 +21,7 @@ public class UpdaterChecker
 
         public static readonly string MINIMUM_PROTOCOL_VERSION = "1.9.0.0";
 
-        public static readonly string VERSION = "2.0.4.0";
+        public static readonly string VERSION = "2.0.5.0";
 
         private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
 

diff --git a/DCS-SR-ExternalAudio/Properties/AssemblyInfo.cs b/DCS-SR-ExternalAudio/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
diff --git a/DCS-SimpleRadio Server/Properties/AssemblyInfo.cs b/DCS-SimpleRadio Server/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
diff --git a/Installer/Properties/AssemblyInfo.cs b/Installer/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
diff --git a/Scripts/DCS-SRS-AutoConnectGameGUI.lua b/Scripts/DCS-SRS-AutoConnectGameGUI.lua
@@ -1,4 +1,4 @@
--- Version 2.0.4.0
+-- Version 2.0.5.0
 -- ONLY COPY THIS WHOLE FILE IS YOU ARE GOING TO HOST A SERVER!
 -- The file must be in Saved Games\DCS\Scripts\Hooks or Saved Games\DCS.openalpha\Scripts\Hooks
 -- Make sure you enter the correct address into SERVER_SRS_HOST and SERVER_SRS_PORT (5002 by default) below.
@@ -225,4 +225,4 @@ SRSAuto.sendMessage = function(msg, showTime, gid)
 end
 
 DCS.setUserCallbacks(SRSAuto)
-net.log("Loaded - DCS-SRS-AutoConnect 2.0.4.0")
+net.log("Loaded - DCS-SRS-AutoConnect 2.0.5.0")
diff --git a/Scripts/DCS-SRS/Scripts/DCS-SRS-OverlayGameGUI.lua b/Scripts/DCS-SRS/Scripts/DCS-SRS-OverlayGameGUI.lua
@@ -1,9 +1,9 @@
--- Version 2.0.4.0
+-- Version 2.0.5.0
 -- Make sure you COPY this file to the same location as the Export.lua as well! 
 -- Otherwise the Overlay will not work
 
 
-net.log("Loading - DCS-SRS Overlay GameGUI - Ciribob: 2.0.4.0 ")
+net.log("Loading - DCS-SRS Overlay GameGUI - Ciribob: 2.0.5.0 ")
 
 local base = _G
 
@@ -672,4 +672,4 @@ end
 
 DCS.setUserCallbacks(srsOverlay)
 
-net.log("Loaded - DCS-SRS Overlay GameGUI - Ciribob: 2.0.4.0 ")
+net.log("Loaded - DCS-SRS Overlay GameGUI - Ciribob: 2.0.5.0 ")
diff --git a/Scripts/DCS-SRS/Scripts/DCS-SRSGameGUI.lua b/Scripts/DCS-SRS/Scripts/DCS-SRSGameGUI.lua
@@ -1,8 +1,8 @@
--- Version 2.0.4.0
+-- Version 2.0.5.0
 -- Make sure you COPY this file to the same location as the Export.lua as well! 
 -- Otherwise the Radio Might not work
 
-net.log("Loading - DCS-SRS GameGUI - Ciribob: 2.0.4.0")
+net.log("Loading - DCS-SRS GameGUI - Ciribob: 2.0.5.0")
 local SRS = {}
 
 SRS.CLIENT_ACCEPT_AUTO_CONNECT = true --- Set to false if you want to disable AUTO CONNECT
@@ -354,5 +354,5 @@ end
 
 DCS.setUserCallbacks(SRS)
 
-net.log("Loaded - DCS-SRS GameGUI - Ciribob: 2.0.4.0")
+net.log("Loaded - DCS-SRS GameGUI - Ciribob: 2.0.5.0")
 
diff --git a/Scripts/DCS-SRS/Scripts/DCS-SimpleRadioStandalone.lua b/Scripts/DCS-SRS/Scripts/DCS-SimpleRadioStandalone.lua
@@ -1,4 +1,4 @@
--- Version 2.0.4.0
+-- Version 2.0.5.0
 -- Special thanks to Cap. Zeen, Tarres and Splash for all the help
 -- with getting the radio information :)
 -- Run the installer to correctly install this file
@@ -90,6 +90,7 @@ SR.fc3["MiG-29A"] = true
 SR.fc3["MiG-29S"] = true
 SR.fc3["MiG-29G"] = true
 SR.fc3["Su-27"] = true
+SR.fc3["J-11A"] = true
 SR.fc3["Su-33"] = true
 SR.fc3["Su-25"] = true
 SR.fc3["Su-25T"] = true
@@ -131,6 +132,9 @@ function SR.exporter()
     local _update
     local _data = LoGetSelfData()
 
+    -- REMOVE
+    -- SR.log(SR.debugDump(_data).."\n\n")
+
     if _data ~= nil and not SR.fc3[_data.Name] then
         -- check for death / eject -- call below returns a number when ejected - ignore FC3
         local _device = GetDevice(0)
@@ -4806,6 +4810,7 @@ SR.exporters["MiG-29A"] = SR.exportRadioMiG29
 SR.exporters["MiG-29S"] = SR.exportRadioMiG29
 SR.exporters["MiG-29G"] = SR.exportRadioMiG29
 SR.exporters["Su-27"] = SR.exportRadioSU27
+SR.exporters["J-11A"] = SR.exportRadioSU27
 SR.exporters["Su-33"] = SR.exportRadioSU27
 SR.exporters["Su-25"] = SR.exportRadioSU25
 SR.exporters["Su-25T"] = SR.exportRadioSU25
@@ -4908,4 +4913,4 @@ end
 -- Load mods' SRS plugins
 SR.LoadModsPlugins()
 
-SR.log("Loaded SimpleRadio Standalone Export version: 2.0.4.0")
+SR.log("Loaded SimpleRadio Standalone Export version: 2.0.5.0")
diff --git a/Scripts/DCS-SRS/entry.lua b/Scripts/DCS-SRS/entry.lua
@@ -4,7 +4,7 @@ declare_plugin("DCS-SRS", {
 	developerName = _("Ciribob"),
 	developerLink = _("https://github.com/ciribob/DCS-SimpleRadioStandalone"),
 	displayName = _("DCS SimpleRadio Standalone"),
-	version = "2.0.4.0",
+	version = "2.0.5.0",
 	state = "installed",
 	info = _("DCS-SimpleRadio Standalone\n\nBrings realistic VoIP comms to DCS with a cockpit integration with every aircraft\n\nCheck Special Settings for SRS integration settings\n\nSRS Discord for Support: https://discord.gg/baw7g3t"),
 	binaries = {"srs.dll"},