weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

v0.4.11-alpha-rc3

Browse Source
This commit is contained in:
Pax1601 2023-12-06 09:15:44 +01:00
parent fa04e5f8bb
commit dcff462b32
14 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/@types/olympus/index.d.ts vendored
View File

@ -2031,6 +2031,19 @@ declare module "unit/unitsmanager" {
* @param category Either "Aircraft", "Helicopter", "GroundUnit", or "NavyUnit". Determines what class will be used to create the new unit accordingly.
*/
addUnit(ID: number, category: string): void;
/** Sort units segregated groups based on controlling type and protection, if DCS-controlled
*
* @param units <Unit[]>
* @returns Object
*/
segregateUnits(units: Unit[]): {
[key: string]: [];
};
/**
*
* @param numOfProtectedUnits number
*/
showProtectedUnitsPopup(numOfProtectedUnits: number): void;
/** Update the data of all the units. The data is directly decoded from the binary buffer received from the REST Server. This is necessary for performance and bandwidth reasons.
*
* @param buffer The arraybuffer, encoded according to the ICD defined in: TODO Add reference to ICD

2
client/bin/www
View File

@ -112,5 +112,5 @@ function onListening() {
debug('Listening on ' + bind);
}
console.log("DCS Olympus server v0.4.10-alpha-rc2 started correctly!")
console.log("DCS Olympus server v0.4.11-alpha-rc3 started correctly!")
console.log("Waiting for connections...")

4
client/package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "DCSOlympus",
"version": "v0.4.10-alpha-rc2",
"version": "v0.4.11-alpha-rc3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "DCSOlympus",
"version": "v0.4.10-alpha-rc2",
"version": "v0.4.11-alpha-rc3",
"dependencies": {
"@turf/turf": "^6.5.0",
"body-parser": "^1.20.2",

2
client/package.json
View File

@ -2,7 +2,7 @@
"name": "DCSOlympus",
"node-main": "./bin/www",
"main": "http://localhost:3000",
"version": "v0.4.10-alpha-rc2",
"version": "v0.4.11-alpha-rc3",
"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",

6
client/src/olympusapp.ts
View File

@ -29,7 +29,7 @@ import { UnitListPanel } from "./panels/unitlistpanel";
import { ContextManager } from "./context/contextmanager";
import { Context } from "./context/context";
var VERSION = "v0.4.10-alpha-rc2";
var VERSION = "v0.4.11-alpha-rc3";
var DEBUG = false;
export class OlympusApp {
@ -262,9 +262,7 @@ export class OlympusApp {
const latestVersionSpan = document.getElementById("latest-version") as HTMLElement;
if (latestVersionSpan) {
latestVersionSpan.innerHTML = this.#latestVersion ?? "Unknown";
if (this.#latestVersion !== VERSION) {
latestVersionSpan.classList.add("new-version");
}
latestVersionSpan.classList.toggle("new-version", this.#latestVersion !== VERSION);
}
})
}

2
client/views/other/dialogs/splash.ejs
View File

@ -3,7 +3,7 @@
<div id="app-summary">
<h2>DCS Olympus</h2>
<h4>Dynamic Unit Command</h4>
<div class="app-version">Version <span class="app-version-number">v0.4.10-alpha-rc2</span></div>
<div class="app-version">Version <span class="app-version-number">v0.4.11-alpha-rc3</span></div>
<div class="app-version">Latest version <span id="latest-version" class="app-version-number"></span></div>
</div>

2
client/views/toolbars/primary.ejs
View File

@ -6,7 +6,7 @@
<div class="ol-select-options">
<div id="toolbar-summary">
<h3>DCS Olympus</h3>
<div class="accent-green app-version-number">version v0.4.10-alpha-rc2</div>
<div class="accent-green app-version-number">version v0.4.11-alpha-rc3</div>
</div>
<div>
<a href="https://discord.gg/wWXyVVBZT7" target="_blank">Discord</a>

44
installer/olympus.iss
View File

@ -1,6 +1,6 @@
#define nwjsFolder "..\..\nwjs\"
#define nodejsFolder "..\..\node\"
#define version "v0.4.10-alpha-rc2"
#define version "v0.4.11-alpha-rc3"
[Setup]
AppName=DCS Olympus
@ -51,35 +51,35 @@ Source: "..\scripts\python\configurator\dist\configurator.exe"; DestDir: "{app}\
[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
[Registry]
Root: HKCU; Subkey: "Environment"; ValueType: string; ValueName: "DCSOLYMPUS_PATH"; ValueData: "{app}\Mods\Services\Olympus"; Flags: preservestringtype
Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};%DCSOLYMPUS_PATH%\bin"; Check: NeedsAddPath('%DCSOLYMPUS_PATH%\bin');
;[Registry]
;Root: HKCU; Subkey: "Environment"; ValueType: string; ValueName: "DCSOLYMPUS_PATH"; ValueData: "{app}\Mods\Services\Olympus"; Flags: preservestringtype
;Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};%DCSOLYMPUS_PATH%\bin"; Check: NeedsAddPath('%DCSOLYMPUS_PATH%\bin');
[Setup]
;[Setup]
; Tell Windows Explorer to reload the environment
ChangesEnvironment=yes
;ChangesEnvironment=yes
[Icons]
Name: "{userdesktop}\DCS Olympus Client"; Filename: "{app}\Mods\Services\Olympus\client\nw.exe"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus.ico"; Check: CheckLocalInstall
Name: "{userdesktop}\DCS Olympus Server"; Filename: "{app}\Mods\Services\Olympus\client\node.exe"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus_server.ico"; Parameters: ".\bin\www"; Check: CheckServerInstall
Name: "{userdesktop}\DCS Olympus Configurator"; Filename: "{app}\Mods\Services\Olympus\configurator.exe"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus_configurator.ico"; Check: CheckServerInstall
[Code]
function NeedsAddPath(Param: string): boolean;
var
OrigPath: string;
begin
if not RegQueryStringValue(HKCU,
'Environment',
'Path', OrigPath)
then begin
Result := True;
exit;
end;
{ look for the path with leading and trailing semicolon }
{ Pos() returns 0 if not found }
Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
end;
;[Code]
;function NeedsAddPath(Param: string): boolean;
;var
; OrigPath: string;
;begin
; if not RegQueryStringValue(HKCU,
; 'Environment',
; 'Path', OrigPath)
; then begin
; Result := True;
; exit;
; end;
; { look for the path with leading and trailing semicolon }
; { Pos() returns 0 if not found }
; Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
;end;
[Code]
var

2
mod/entry.lua
View File

@ -15,7 +15,7 @@ declare_plugin(self_ID,
shortName = "Olympus",
fileMenuName = "Olympus",
version = "v0.4.10-alpha-rc2",
version = "v0.4.11-alpha-rc3",
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."),

2
scripts/OlympusCommand.lua
View File

@ -1,4 +1,4 @@
local version = "v0.4.10-alpha-rc2"
local version = "v0.4.11-alpha-rc3"
local debug = false -- True enables debug printing using DCS messages

2
scripts/OlympusHook.lua
View File

@ -1,4 +1,4 @@
local version = 'v0.4.10-alpha-rc2'
local version = 'v0.4.11-alpha-rc3'
Olympus = {}
Olympus.OlympusDLL = nil

BIN
src/olympus/olympus.aps Normal file
View File

Binary file not shown.

2
src/shared/include/defines.h
View File

@ -1,6 +1,6 @@
#pragma once
#define VERSION "v0.4.10-alpha-rc2"
#define VERSION "v0.4.11-alpha-rc3"
#define LOG_NAME "Olympus_log.txt"
#define REST_ADDRESS "http://localhost:30000"
#define REST_URI "olympus"

2
version.json
View File

@ -1,3 +1,3 @@
{
"version": "v0.4.10-alpha-rc2"
"version": "v0.4.11-alpha-rc3"
}