Commit 18b63ab6 authored by Mikhail Paulyshka's avatar Mikhail Paulyshka

Merge branch 'master' into 'master'

some update

See merge request !45
parents 8f020b30 5d15f223
Pipeline #94398936 passed with stage
in 0 seconds
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM nightly build system
CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM nightly build system
CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM nightly build system
CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM nightly build system
CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM nightly build system functions library
#Actionscript constants
......
......@@ -50,7 +50,7 @@
"definition": {
// Config author.
// Автор конфига.
"author": "XVM team",
"author": "XVM Team",
// Config description.
// Описание конфига.
......@@ -66,11 +66,11 @@
// The minimum required version of the XVM mod.
// Минимально необходимая версия мода XVM.
"modMinVersion": "8.1.7",
"modMinVersion": "8.1.8",
// Config last modified.
// Дата последней модификации конфига.
"date": "03.11.2019"
"date": "07.11.2019"
},
// Parameters for login screen.
......
......@@ -4,7 +4,7 @@ import BigWorld
# Import logger
from xvm_main.python.logger import *
# Import config. Usage example: config.get('definition/author', 'XVM team')
# Import config. Usage example: config.get('definition/author', 'XVM Team')
import xvm_main.python.config as config
from xvm import utils
......
......@@ -3,7 +3,7 @@
* Renamed options in the "hangar"/"equipmentPanel" section:
"showNumberEquipment" -> "showConsumablesCount"
"showNumberDirectives" -> "showDirectivesCount"
* The functionality in the "hangar"/"filters" section has been restored.
* The functionality in the "hangar"/"filters" section has been restored
* Added options:
"hangar"/"filters"/"elite"/"enabled" - show/hide "Elite Vehicle" filter
"hangar"/"filters"/"premium"/"enabled" - show/hide "Premium Vehicle" filter
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM nightly build system
XVMINST_ROOT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
......
......@@ -3,13 +3,13 @@
#include "dll\findwot\src_innosetup\findwot.iss"
[Setup]
AppCopyright = "2019 (c) XVM team"
AppCopyright = "2019 (c) XVM Team"
AppId = {{2865cd27-6b8b-4413-8272-cd968f316050}
AppName = "XVM"
AppPublisher = "XVM team"
AppPublisherURL = "http://modxvm.com/"
AppSupportURL = "http://modxvm.com/"
AppUpdatesURL = "http://modxvm.com/"
AppPublisher = "XVM Team"
AppPublisherURL = "https://modxvm.com/"
AppSupportURL = "https://modxvm.com/"
AppUpdatesURL = "https://modxvm.com/"
AppVersion = {#VersionXVM}
WizardImageFile = images\big_image.bmp
......@@ -35,18 +35,18 @@ UninstallFilesDir={app}\xvm_uninst
DefaultDirName=C:\
[Tasks]
Name: "xvmbackup"; Description: "{cm:backupXVM}"; Flags: unchecked
Name: "xvmbackup"; Description: "{cm:backupXVM}"; Flags: unchecked;
[Run]
Filename: http://modxvm.com/; Description: "{cm:websiteXVM}"; Flags: postinstall nowait shellexec;
Filename: https://modxvm.com/; Description: "{cm:websiteXVM}"; Flags: postinstall nowait shellexec;
[Components]
Name: "XVM"; Description: "{cm:component_XVM}"; Types: full compact custom; Flags: fixed
Name: "XVM"; Description: "{cm:component_XVM}"; Types: full compact custom; Flags: fixed;
[Files]
;backup
Source: "{app}\res_mods\configs\*"; DestDir: "{app}\xvm_backup\configs"; Tasks: xvmbackup; Flags: external skipifsourcedoesntexist createallsubdirs recursesubdirs uninsneveruninstall
Source: "{app}\res_mods\mods\shared_resources\xvm\res\*"; DestDir: "{app}\xvm_backup\mods\shared_resources\xvm\res"; Tasks: xvmbackup; Flags: external skipifsourcedoesntexist createallsubdirs recursesubdirs uninsneveruninstall
Source: "{app}\res_mods\configs\*"; DestDir: "{app}\xvm_backup\configs"; Tasks: xvmbackup; Flags: external skipifsourcedoesntexist createallsubdirs recursesubdirs uninsneveruninstall;
Source: "{app}\res_mods\mods\shared_resources\xvm\res\*"; DestDir: "{app}\xvm_backup\mods\shared_resources\xvm\res"; Tasks: xvmbackup; Flags: external skipifsourcedoesntexist createallsubdirs recursesubdirs uninsneveruninstall;
;xvm
Source: "..\..\..\~output\deploy\mods\*"; DestDir: "{app}\mods"; Flags: createallsubdirs recursesubdirs; Components: XVM
......@@ -54,7 +54,7 @@ Source: "..\..\..\~output\deploy\res_mods\*"; DestDir: "{app}\res_mods"; Flags:
Source: "..\..\..\~output\deploy\readme*.*"; DestDir: "{app}"; Components: XVM
;installer libs
Source: "dll\findwot\bin\findwot.dll"; Flags: dontcopy
Source: "dll\findwot\bin\findwot.dll"; Flags: dontcopy;
[InstallDelete]
;mods\ver\com.modxvm.xfw\*.wotmod
......@@ -135,20 +135,20 @@ begin
if ClientsCount > 0 then
begin
for Index:=0 to ClientsCount-1 do
for Index := 0 to ClientsCount - 1 do
begin
WOT_GetClientVersionW(Buffer,1024,Index);
Str:=Copy(Buffer,0,Pos(#0, Buffer));
WOT_GetClientVersionW(Buffer, 1024, Index);
Str := Copy(Buffer, 0, Pos(#0, Buffer));
case WOT_GetClientBranch(Index) of
1: Insert(' Release: ',Str,Pos(#0, Str));
2: Insert(' Common Test: ',Str,Pos(#0, Str));
3: Insert(' Super Test: ',Str,Pos(#0, Str));
4: Insert(' Sandbox: ',Str,Pos(#0, Str));
1: Insert(' Release: ', Str, Pos(#0, Str));
2: Insert(' Common Test: ', Str, Pos(#0, Str));
3: Insert(' Super Test: ', Str, Pos(#0, Str));
4: Insert(' Sandbox: ', Str, Pos(#0, Str));
end;
WOT_GetClientPathW(Buffer,1024,Index);
Insert(Buffer,Str,Pos(#0, Str));
WOT_GetClientPathW(Buffer, 1024, Index);
Insert(Buffer, Str, Pos(#0, Str));
WotList.Items.Add(Str);
end;
......@@ -164,30 +164,32 @@ var
begin
if Length(ClientPath) = 0 then
begin
WotList.ItemIndex:=-1;
exit;
WotList.ItemIndex := -1;
Exit;
end;
Index := WOT_AddClientW(ClientPath);
if Index>=0 then begin
if Index >= 0 then
begin
WotList_Update();
WotList.ItemIndex:=Index;
end else begin
MsgBox( ExpandConstant('{cm:wotNotFound}'), mbError, MB_OK);
WotList.ItemIndex:=-1;
WotList.ItemIndex := Index;
end else
begin
MsgBox(ExpandConstant('{cm:wotNotFound}'), mbError, MB_OK);
WotList.ItemIndex := -1;
end;
end;
procedure WotList_OnChange(Sender: TObject);
begin
if WoTList.Text = ExpandConstant('{cm:browse}') then
if WoTList.Text = ExpandConstant('{cm:browse}') then
begin
WizardForm.DirBrowseButton.OnClick(nil);
WotList_AddClient(WizardForm.DirEdit.Text);
end;
WOT_GetClientPathW(Buffer,1024,WotList.ItemIndex);
WizardForm.DirEdit.Text:=Buffer;
WOT_GetClientPathW(Buffer, 1024, WotList.ItemIndex);
WizardForm.DirEdit.Text := Buffer;
end;
procedure InitializeWizard();
......@@ -229,13 +231,13 @@ function NextButtonClick(CurPage: Integer): Boolean;
begin
Result := True;
if CurPage = wpSelectDir then
if (CurPage = wpSelectDir) then
begin
if not FileExists(ExpandConstant('{app}\WorldOfTanks.exe')) then
begin
MsgBox( ExpandConstant('{cm:wotNotFound}'), mbError, MB_OK);
MsgBox(ExpandConstant('{cm:wotNotFound}'), mbError, MB_OK);
Result := False;
exit;
Exit;
end;
end;
end;
[Defines]
#define VersionXVM "XVM_VERSION"
#define VersionWOT "XVM_WOTVERSION"
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XFW Framework build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
#!/bin/bash
# XVM team (c) https://modxvm.com 2014-2019
# XVM Team (c) https://modxvm.com 2014-2019
# XVM build system
set -e
......
......@@ -178,7 +178,7 @@ package com.xvm.lobby.ui.tankcarousel
{
this.vehicleFilters.listHotFilter.height += vehicleFilters.paramsFilter.height;
this.vehicleFilters.listHotFilter.y = vehicleFilters.paramsFilter.y;
vehicleFilters.paramsFilter.visible = false;
vehicleFilters.paramsFilter.visible = false;
}
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment