From 0459d5c6255acfe0860d2b79b4cfa3e8014b2f48 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Fri, 8 Dec 2023 15:38:56 +0100 Subject: [PATCH] v0.4.13-alpha-rc5 --- client/bin/www | 2 +- client/package-lock.json | 4 ++-- client/package.json | 2 +- client/src/olympusapp.ts | 2 +- client/views/other/dialogs/splash.ejs | 2 +- client/views/toolbars/primary.ejs | 2 +- installer/olympus.iss | 3 ++- mod/entry.lua | 2 +- scripts/OlympusCommand.lua | 2 +- scripts/OlympusHook.lua | 2 +- src/shared/include/defines.h | 2 +- src/utils/src/utils.cpp | 2 +- version.json | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) diff --git a/client/bin/www b/client/bin/www index 647f36ff..7180e982 100644 --- a/client/bin/www +++ b/client/bin/www @@ -112,5 +112,5 @@ function onListening() { debug('Listening on ' + bind); } -console.log("DCS Olympus server v0.4.12-alpha-rc4 started correctly!") +console.log("DCS Olympus server v0.4.13-alpha-rc5 started correctly!") console.log("Waiting for connections...") diff --git a/client/package-lock.json b/client/package-lock.json index d0b33fd6..e1fce903 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "DCSOlympus", - "version": "v0.4.12-alpha-rc4", + "version": "v0.4.13-alpha-rc5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "DCSOlympus", - "version": "v0.4.12-alpha-rc4", + "version": "v0.4.13-alpha-rc5", "dependencies": { "@turf/turf": "^6.5.0", "body-parser": "^1.20.2", diff --git a/client/package.json b/client/package.json index 1495bc70..14fa9e48 100644 --- a/client/package.json +++ b/client/package.json @@ -2,7 +2,7 @@ "name": "DCSOlympus", "node-main": "./bin/www", "main": "http://localhost:3000", - "version": "v0.4.12-alpha-rc4", + "version": "v0.4.13-alpha-rc5", "private": true, "scripts": { "build": "browserify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] && copy.bat", diff --git a/client/src/olympusapp.ts b/client/src/olympusapp.ts index d6aac786..af8e05e3 100644 --- a/client/src/olympusapp.ts +++ b/client/src/olympusapp.ts @@ -29,7 +29,7 @@ import { UnitListPanel } from "./panels/unitlistpanel"; import { ContextManager } from "./context/contextmanager"; import { Context } from "./context/context"; -var VERSION = "v0.4.12-alpha-rc4"; +var VERSION = "v0.4.13-alpha-rc5"; var DEBUG = false; export class OlympusApp { diff --git a/client/views/other/dialogs/splash.ejs b/client/views/other/dialogs/splash.ejs index e8543dd9..899639ab 100644 --- a/client/views/other/dialogs/splash.ejs +++ b/client/views/other/dialogs/splash.ejs @@ -3,7 +3,7 @@

DCS Olympus

Dynamic Unit Command

-
Version v0.4.12-alpha-rc4
+
Version v0.4.13-alpha-rc5
Latest version
diff --git a/client/views/toolbars/primary.ejs b/client/views/toolbars/primary.ejs index 7104d88b..fe04e5e6 100644 --- a/client/views/toolbars/primary.ejs +++ b/client/views/toolbars/primary.ejs @@ -6,7 +6,7 @@

DCS Olympus

-
version v0.4.12-alpha-rc4
+
version v0.4.13-alpha-rc5
Discord diff --git a/installer/olympus.iss b/installer/olympus.iss index dc5c05f2..065959dd 100644 --- a/installer/olympus.iss +++ b/installer/olympus.iss @@ -1,6 +1,6 @@ #define nwjsFolder "..\..\nwjs\" #define nodejsFolder "..\..\node\" -#define version "v0.4.12-alpha-rc4" +#define version "v0.4.13-alpha-rc5" [Setup] AppName=DCS Olympus @@ -47,6 +47,7 @@ Source: "..\img\configurator_logo.png"; DestDir: "{app}\Mods\Services\Olympus\im Source: "{#nwjsFolder}\*.*"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion recursesubdirs; Check: CheckLocalInstall Source: "{#nodejsFolder}\*.*"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion recursesubdirs; Check: CheckServerInstall Source: "..\scripts\python\configurator\dist\configurator.exe"; DestDir: "{app}\Mods\Services\Olympus"; Flags: ignoreversion; +Source: "..\LEGAL"; DestDir: "{app}\Mods\Services\Olympus"; Flags: ignoreversion; [Run] Filename: "{app}\Mods\Services\Olympus\configurator.exe"; Parameters: -a {code:GetAddress} -c {code:GetClientPort} -b {code:GetBackendPort} -p {code:GetPassword} -bp {code:GetBluePassword} -rp {code:GetRedPassword}; Check: CheckCallConfigurator diff --git a/mod/entry.lua b/mod/entry.lua index 134198d3..7707fa03 100644 --- a/mod/entry.lua +++ b/mod/entry.lua @@ -15,7 +15,7 @@ declare_plugin(self_ID, shortName = "Olympus", fileMenuName = "Olympus", - version = "v0.4.12-alpha-rc4", + version = "v0.4.13-alpha-rc5", state = "installed", developerName= "DCS Refugees 767 squadron", info = _("DCS Olympus is a mod for DCS World. It allows users to spawn, control, task, group, and remove units from a DCS World server using a real-time map interface, similarly to Real Time Strategy games. The user interface also provides useful informations units, like loadouts, fuel, tasking, and so on. In the future, more features for DCS World GCI and JTAC will be available."), diff --git a/scripts/OlympusCommand.lua b/scripts/OlympusCommand.lua index 93c232f2..e14826b2 100644 --- a/scripts/OlympusCommand.lua +++ b/scripts/OlympusCommand.lua @@ -1,4 +1,4 @@ -local version = "v0.4.12-alpha-rc4" +local version = "v0.4.13-alpha-rc5" local debug = false -- True enables debug printing using DCS messages diff --git a/scripts/OlympusHook.lua b/scripts/OlympusHook.lua index 7d297549..8ec13071 100644 --- a/scripts/OlympusHook.lua +++ b/scripts/OlympusHook.lua @@ -1,4 +1,4 @@ -local version = 'v0.4.12-alpha-rc4' +local version = 'v0.4.13-alpha-rc5' local lfs = require("lfs") Olympus = {} diff --git a/src/shared/include/defines.h b/src/shared/include/defines.h index 304e7717..714985a9 100644 --- a/src/shared/include/defines.h +++ b/src/shared/include/defines.h @@ -1,6 +1,6 @@ #pragma once -#define VERSION "v0.4.12-alpha-rc4" +#define VERSION "v0.4.13-alpha-rc5" #define LOG_NAME "Olympus_log.txt" #define REST_ADDRESS "http://localhost:30000" #define REST_URI "olympus" diff --git a/src/utils/src/utils.cpp b/src/utils/src/utils.cpp index 7d8f6501..a959cdfe 100644 --- a/src/utils/src/utils.cpp +++ b/src/utils/src/utils.cpp @@ -44,7 +44,7 @@ std::string to_string(const std::wstring& wstr) std::string random_string(size_t length) { - srand(time(NULL)); + srand(static_cast(time(NULL))); auto randchar = []() -> char { const char charset[] = diff --git a/version.json b/version.json index 9bf57430..bb31d6c7 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "v0.4.12-alpha-rc4" + "version": "v0.4.13-alpha-rc5" }