Update XVM 8.1.5 - custom

kipphan · Oct 24, 2019 · 8a293f1 · 8a293f1
1 parent dfc1c14
commit 8a293f1
Show file tree

Hide file tree

Showing 91 changed files with 331 additions and 303 deletions.
diff --git a/source/8.1.3_7 b/source/8.1.3_7
diff --git a/source/8.1.5_7 b/source/8.1.5_7
@@ -0,0 +1,4 @@
+8.1.5
+7
+69bec6eb6b9fca2c85ed0ecda99fc568dc1b7264
+master
diff --git a/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.actionscript_8.1.3.7.wotmod b/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.actionscript_8.1.3.7.wotmod
diff --git a/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.native_1.5.3.wotmod b/source/mods/1.6.1.1/com.modxvm.xfw/com.modxvm.xfw.native_1.5.3.wotmod
diff --git a/source/mods/1.6.1.2/com.modxvm.xfw/com.modxvm.xfw.actionscript_8.1.5.7.wotmod b/source/mods/1.6.1.2/com.modxvm.xfw/com.modxvm.xfw.actionscript_8.1.5.7.wotmod
diff --git a/...com.modxvm.xfw.crashreport_8.1.3.7.wotmod → ...com.modxvm.xfw.crashreport_8.1.5.7.wotmod b/...com.modxvm.xfw.crashreport_8.1.3.7.wotmod → ...com.modxvm.xfw.crashreport_8.1.5.7.wotmod
diff --git a/...com.modxvm.xfw.filewatcher_8.1.3.7.wotmod → ...com.modxvm.xfw.filewatcher_8.1.5.7.wotmod b/...com.modxvm.xfw.filewatcher_8.1.3.7.wotmod → ...com.modxvm.xfw.filewatcher_8.1.5.7.wotmod
diff --git a/...m.xfw/com.modxvm.xfw.fonts_8.1.3.7.wotmod → ...m.xfw/com.modxvm.xfw.fonts_8.1.5.7.wotmod b/...m.xfw/com.modxvm.xfw.fonts_8.1.3.7.wotmod → ...m.xfw/com.modxvm.xfw.fonts_8.1.5.7.wotmod
diff --git a/...w/com.modxvm.xfw.libraries_8.1.3.7.wotmod → ...w/com.modxvm.xfw.libraries_8.1.5.7.wotmod b/...w/com.modxvm.xfw.libraries_8.1.3.7.wotmod → ...w/com.modxvm.xfw.libraries_8.1.5.7.wotmod
diff --git a/....xfw/com.modxvm.xfw.loader_8.1.3.7.wotmod → ....xfw/com.modxvm.xfw.loader_8.1.5.7.wotmod b/....xfw/com.modxvm.xfw.loader_8.1.3.7.wotmod → ....xfw/com.modxvm.xfw.loader_8.1.5.7.wotmod
diff --git a/...m.xfw/com.modxvm.xfw.mutex_8.1.3.7.wotmod → ...m.xfw/com.modxvm.xfw.mutex_8.1.5.7.wotmod b/...m.xfw/com.modxvm.xfw.mutex_8.1.3.7.wotmod → ...m.xfw/com.modxvm.xfw.mutex_8.1.5.7.wotmod
diff --git a/source/mods/1.6.1.2/com.modxvm.xfw/com.modxvm.xfw.native_1.5.4.wotmod b/source/mods/1.6.1.2/com.modxvm.xfw/com.modxvm.xfw.native_1.5.4.wotmod
diff --git a/...vm.xfw/com.modxvm.xfw.ping_8.1.3.7.wotmod → ...vm.xfw/com.modxvm.xfw.ping_8.1.5.7.wotmod b/...vm.xfw/com.modxvm.xfw.ping_8.1.3.7.wotmod → ...vm.xfw/com.modxvm.xfw.ping_8.1.5.7.wotmod
diff --git a/....modxvm.xfw.wotfix.crashes_8.1.3.7.wotmod → ....modxvm.xfw.wotfix.crashes_8.1.5.7.wotmod b/....modxvm.xfw.wotfix.crashes_8.1.3.7.wotmod → ....modxvm.xfw.wotfix.crashes_8.1.5.7.wotmod
diff --git a/...om.modxvm.xfw.wotfix.hidpi_8.1.3.7.wotmod → ...om.modxvm.xfw.wotfix.hidpi_8.1.5.7.wotmod b/...om.modxvm.xfw.wotfix.hidpi_8.1.3.7.wotmod → ...om.modxvm.xfw.wotfix.hidpi_8.1.5.7.wotmod
diff --git a/...m.xfw/com.modxvm.xfw.wwise_8.1.3.7.wotmod → ...m.xfw/com.modxvm.xfw.wwise_8.1.5.7.wotmod b/...m.xfw/com.modxvm.xfw.wwise_8.1.3.7.wotmod → ...m.xfw/com.modxvm.xfw.wwise_8.1.5.7.wotmod
diff --git a/source/res_mods/configs/xvm/default/@xvm.xc b/source/res_mods/configs/xvm/default/@xvm.xc
@@ -58,11 +58,11 @@
 
     // Supported version of the game.
     // Поддерживаемая версия игры.
-    "gameVersion": "1.6.1.1",
+    "gameVersion": "1.6.1.2",
 
     // The minimum required version of the XVM mod.
     // Минимально необходимая версия мода XVM.
-    "modMinVersion": "8.1.2",
+    "modMinVersion": "8.1.4",
 
     // Config last modified.
     // Дата последней модификации конфига.

diff --git a/source/res_mods/configs/xvm/default/battleLabels.xc b/source/res_mods/configs/xvm/default/battleLabels.xc
@@ -25,7 +25,7 @@
       ${"battleLabelsTemplates.xc":"def.repairTimeEngine"},
       ${"battleLabelsTemplates.xc":"def.repairTimeGun"},
       ${"battleLabelsTemplates.xc":"def.repairTimeTurret"},
-      ${"battleLabelsTemplates.xc":"def.repairTimeComplex"}, 
+      ${"battleLabelsTemplates.xc":"def.repairTimeComplex"},
       ${"battleLabelsTemplates.xc":"def.repairTimeSurveying"},
       ${"battleLabelsTemplates.xc":"def.repairTimeRadio"}
     ]

diff --git a/source/res_mods/configs/xvm/default/camera.xc b/source/res_mods/configs/xvm/default/camera.xc
@@ -123,7 +123,7 @@
       // true - отключить затемнение и озеленение в снайперском прицеле.
       "noBinoculars": false,
       // TODO: English comments.
-      // Отключение предела вращения камеры в снайперском прицеле для техники с ограниченными УГН (углами горизонтальной наводки) орудия. 
+      // Отключение предела вращения камеры в снайперском прицеле для техники с ограниченными УГН (углами горизонтальной наводки) орудия.
       "noCameraLimit": {
         // true - enable.
         // true - включить.

diff --git a/source/res_mods/configs/xvm/default/carouselSmall.xc b/source/res_mods/configs/xvm/default/carouselSmall.xc
@@ -87,7 +87,7 @@
       },
       // Vehicle name.
       // Название танка.
-      { 
+      {
         "enabled": true,
         "x": 159, "y": 14, "align": "right",
         "format": "<font face='$FieldFont' size='15' color='{{v.premium?#FFA759|#C8C8B5}}'>{{v.name}}</font>",

diff --git a/source/res_mods/configs/xvm/default/damageLog.xc b/source/res_mods/configs/xvm/default/damageLog.xc
@@ -3,7 +3,7 @@
  * For additional settings see battleLabelsTemplates.xc
  * Лог полученного урона.
  * Дополнительные настройки см. в battleLabelsTemplates.xc
- * 
+ *
  * https://kr.cm/f/t/35169/
 
   Macros used in damageLog:

diff --git a/source/res_mods/configs/xvm/default/hitLog.xc b/source/res_mods/configs/xvm/default/hitLog.xc
@@ -3,12 +3,12 @@
  * For additional settings see battleLabelsTemplates.xc
  * Лог нанесенного урона.
  * Дополнительные настройки см. в battleLabelsTemplates.xc
- * 
+ *
  * https://kr.cm/f/t/40466/
 
   Macros used in hitLog:
   Макросы используемые в hitLog:
-   
+
     {{dmg}}                - last damage / последний нанесенный урон.
     {{dmg-kind}}           - type of damage / тип нанесенного урона (атака, пожар, таран, ...).
     {{c:dmg-kind}}         - color by damage kind / цвет по типу урона.
@@ -30,7 +30,7 @@
     {{squad-num}}          - number of squad (1,2,...), empty if not in squad / номер взвода (1,2,...), пусто - если игрок не во взводе.
     {{dmg-ratio}}          - last damage in percent / последний нанесенный урон в процентах.
     {{splash-hit}}         - value 'splash', if damage is caused by shell splinters (HE/HESH), empty if not / возвращает 'splash', если урон нанесен осколками снаряда (ОФ/ХФ), иначе пусто.
-    {{critical-hit}}       - value 'crit', if critical damage was done, empty if not / возвращает 'crit', если было нанесено критическое повреждение, иначе пусто.    
+    {{critical-hit}}       - value 'crit', if critical damage was done, empty if not / возвращает 'crit', если было нанесено критическое повреждение, иначе пусто.
     {{alive}}              - value 'al', if the vehicle after the attack is not destroyed, empty if destroyed / возвращает 'al', если техника после атаки не разрушена, пусто для разрушенной.
     {{wn8}}, {{xwn8}}, {{wtr}}, {{xwtr}}, {{eff}}, {{xeff}}, {{wgr}}, {{xwgr}}, {{xte}}, {{r}}, {{xr}} - statistics macros (see macros.txt) / макросы статистики (смотрите macros_ru.txt).
     {{c:wn8}}, {{c:xwn8}}, {{c:wtr}}, {{c:xwtr}}, {{c:eff}}, {{c:xeff}}, {{c:wgr}}, {{c:xwgr}}, {{c:xte}}, {{c:r}}, {{c:xr}} - color according to the corresponding statistics macro (see macros.txt) / цвет по соответствующему макросу статистики (смотрите macros_ru.txt).
@@ -104,7 +104,7 @@
         "death_zone": "#CCCCCC",      // death zone / смертельная зона.
         "gas_attack": "#CCCCCC",      // gas attack / газовая атака.
         "art_attack": "#CCCCCC",      // art attack / артиллерийская поддержка.
-        "air_strike": "#CCCCCC"       // air strike / поддержка авиации.        
+        "air_strike": "#CCCCCC"       // air strike / поддержка авиации.
       },
       // Type of damage (macro {{dmg-kind-player}}).
       // Тип нанесенного урона (макрос {{dmg-kind-player}}).

diff --git a/source/res_mods/configs/xvm/default/markersDeadExtended.xc b/source/res_mods/configs/xvm/default/markersDeadExtended.xc
@@ -245,7 +245,7 @@
       ${ "def.tankName" },
       ${ "def.playerName" }
     ]
-  }, 
+  },
   // Settings for enemies.
   // Настройки для противников.
   "enemy": {

diff --git a/source/res_mods/configs/xvm/default/sounds.xc b/source/res_mods/configs/xvm/default/sounds.xc
@@ -1,7 +1,7 @@
 /**
  * Extra sounds settings.
  * Настройки дополнительных звуков.
- * 
+ *
  * https://kr.cm/f/t/18955/
  */
 {

diff --git a/source/res_mods/configs/xvm/default/texts.xc b/source/res_mods/configs/xvm/default/texts.xc
@@ -77,7 +77,7 @@
       // Battle training.
       // Боевое обучение.
       "tutorial": "",
-      // Team battles.      
+      // Team battles.
       // Командный бой.
       "cybersport": "cybersport",
       // Special game mode (racing, football and other).

diff --git a/source/res_mods/configs/xvm/default/tooltips.xc b/source/res_mods/configs/xvm/default/tooltips.xc
@@ -231,7 +231,7 @@
   "gravity",                              - Гравитация \ Gravity
   "shellSpeedSummary",                    - Сводка скоростей снарядов \ Summary of shell speeds
   "radioRange",                           - Дальность связи \ Range of radio signal
-  "rateOfFire",                           - Скорострельность оружия \ Rate of Fire 
+  "rateOfFire",                           - Скорострельность оружия \ Rate of Fire
   "battleTiers",                          - Уровни боев танка \ Battle tiers of vehicle
   "maxHealth",                            - ХП танка \ HP of vehicle
   "invisibilityStillFactor"               - Незаметность неподвижной машины (%) \ Concealment of Stationary Vehicle (%)

diff --git a/source/res_mods/configs/xvm/py_macro/repairTime.py b/source/res_mods/configs/xvm/py_macro/repairTime.py
@@ -48,7 +48,7 @@ def eventHandler(self, device):
     def addTimer(self, device, duration):
         if device in self.timers:
             self.timers[device]['timer'].stop()
-        
+
         self.timers.update({
             device: {
                 'duration': duration,
@@ -136,21 +136,21 @@ def _switching(self, _):
 @registerEvent(DamagePanel, '_updateRepairingDevice')
 def _updateRepairingDevice(self, value):
     device = value[0]
-    
+
     if device.find('wheel') > -1: #remove all indices, e.g.: "wheel0", "wheel1" etc.
         device = 'wheel'
-    
+
     if device in DEVICES:
         RepairTimers.addTimer(device, float(value[2]))
 
 @registerEvent(DamagePanel, '_updateDeviceState')
 def _updateDeviceState(self, value):
     device = value[0]
     state = value[2]
-    
+
     if device.find('wheel') > -1: #remove all indices, e.g.: "wheel0", "wheel1" etc.
         device = 'wheel'
-    
+
     if device in DEVICES:
         if ('destroyed' != state) and (device in RepairTimers.timers):
             RepairTimers.delTimer(device)

diff --git a/source/res_mods/configs/xvm/py_macro/xvm.py b/source/res_mods/configs/xvm/py_macro/xvm.py
@@ -43,7 +43,7 @@ def getValue(value, isUpper, isLower):
                 return 'AM' if dt.hour < 12 else 'PM'
             else:
                 return ''
-        
+
     def processDirective(value, formatDate):
         directive = '%'+value
         if directive in formatDate:

diff --git a/source/res_mods/configs/xvm/py_macro/xvm/damageLog.py b/source/res_mods/configs/xvm/py_macro/xvm/damageLog.py
@@ -922,7 +922,7 @@ def output(self):
                 self.timerLastHit = TimeInterval(timeDisplayLastHit, self, 'hideLastHit')
                 self.timerLastHit.start()
                 as_event(EVENTS_NAMES.ON_LAST_HIT)
-        return 
+        return
 
 
 _log = DamageLog(DAMAGE_LOG_SECTIONS.LOG)

diff --git a/source/res_mods/configs/xvm/sirmax/sirmax-battleLabels.xc b/source/res_mods/configs/xvm/sirmax/sirmax-battleLabels.xc
@@ -31,7 +31,7 @@
       ${ "../default/battleLabelsTemplates.xc":"def.repairTimeEngine" },
       ${ "../default/battleLabelsTemplates.xc":"def.repairTimeGun" },
       ${ "../default/battleLabelsTemplates.xc":"def.repairTimeTurret" },
-      ${ "../default/battleLabelsTemplates.xc":"def.repairTimeComplex" }, 
+      ${ "../default/battleLabelsTemplates.xc":"def.repairTimeComplex" },
       ${ "../default/battleLabelsTemplates.xc":"def.repairTimeSurveying" },
       ${ "../default/battleLabelsTemplates.xc":"def.repairTimeRadio" }
   ]

diff --git a/source/res_mods/configs/xvm/xvm.xc.sample b/source/res_mods/configs/xvm/xvm.xc.sample
@@ -11,7 +11,7 @@
  * Format à utiliser : ${"chemin vers fichier de config":"."}
  * // - commente la ligne (elle ne sera pas utilisée)
  *
- * --------------------------------------------------------------- 
+ * ---------------------------------------------------------------
  * Пример загрузочного файла конфигов. Для использования переименовать в xvm.xc.
  *
  * Формат ссылки: ${"путь к файлу конфига":"."}

diff --git a/source/res_mods/mods/shared_resources/xvm/doc/ChangeLog-en.txt b/source/res_mods/mods/shared_resources/xvm/doc/ChangeLog-en.txt
@@ -1,5 +1,15 @@
-XVM-8.1.3:
-  [XFW.Native] 
+XVM-8.1.5:
+  [GENERAL]
+  * Fixed XVM loading if WoT path has non-latin characters
+  * Initial macOS Catalina support
+
+XVM-8.1.4:
+  [GENERAL]
+  * World of Tanks 1.6.1.2
+  * Added support for <WoT_DIR> working directory
+
+XVM-8.1.3:
+  [XFW.Native]
   * Fixed loading error if vcomp140.dll is not present in the operating systems
 
 XVM-8.1.2:

diff --git a/source/res_mods/mods/shared_resources/xvm/doc/ChangeLog-ru.txt b/source/res_mods/mods/shared_resources/xvm/doc/ChangeLog-ru.txt
@@ -1,6 +1,16 @@
-XVM-8.1.3:
-  [XFW.Native] 
-  * Исправлена ошибка связанная с отсутствием vcomp140.dll в системе 
+XVM-8.1.5:
+  [ОБЩЕЕ]
+  * Исправлена загрузка при наличии нелатинских символов в пути
+  * Начальная поддержка macOS Catalina
+
+XVM-8.1.4:
+  [ОБЩЕЕ]
+  * World of Tanks 1.6.1.2
+  * Добавлена поддержка рабочей директории в <WoT_DIR>
+
+XVM-8.1.3:
+  [XFW.Native]
+  * Исправлена ошибка связанная с отсутствием vcomp140.dll в системе
 
 XVM-8.1.2:
   [ОБЩЕЕ]

diff --git a/source/res_mods/mods/shared_resources/xvm/l10n/en.xc b/source/res_mods/mods/shared_resources/xvm/l10n/en.xc
@@ -54,14 +54,14 @@
     "gun": "gun",
     "turret_rotator": "turret rotator",
     "surveying_device": "surveying device",
-    
+
     // Tankmen
     "commander": "commander",
     "driver": "driver",
     "radioman": "radioman",
     "gunner": "gunner",
     "loader": "loader",
-    
+
     // DamageLog:
     "sec": "sec",
     "reloaded": "reloaded",
@@ -172,7 +172,7 @@
     "Battle tiers": "Battle tiers",
     "Type": "Type",
     "Nation": "Nation",
-    
+
     // Nation
     "ussr": "USSR",
     "germany": "Germany",
@@ -185,7 +185,7 @@
     "poland": "Poland",
     "sweden": "Sweden",
     "italy": "Italy",
-    
+
     // Vehicle type
     "HT": "HT",
     "MT": "MT",

diff --git a/source/res_mods/mods/shared_resources/xvm/l10n/ru.xc b/source/res_mods/mods/shared_resources/xvm/l10n/ru.xc
@@ -54,14 +54,14 @@
     "gun": "орудие",
     "turret_rotator": "вращение башни",
     "surveying_device": "приборы наблюдения",
-    
+
     // Tankmen
     "commander": "командир экипажа",
     "driver": "механик-водитель",
     "radioman": "радист",
     "gunner": "наводчик",
     "loader": "заряжающий",
-    
+
     // DamageLog:
     "sec": "сек",
     "reloaded": "перезарядился",
@@ -172,7 +172,7 @@
     "Battle tiers": "Уровень боёв",
     "Type": "Тип",
     "Nation": "Нация",
-    
+
     // Nation
     "ussr": "СССР",
     "germany": "Германия",
@@ -185,7 +185,7 @@
     "poland": "Польша",
     "sweden": "Швеция",
     "italy": "Италия",
-    
+
     // Vehicle type
     "HT": "ТТ",
     "MT": "СТ",

diff --git a/source/res_mods/mods/xfw_packages/xvm_autologin/python/__init__.py b/source/res_mods/mods/xfw_packages/xvm_autologin/python/__init__.py
@@ -51,7 +51,7 @@ def LoginView_populate(base, self):
 def tryWgcLogin(base, self, serverName=None):
     if not serverName and not config.get('login/autologin'): return
     base(self, serverName)
-    
+
 @registerEvent(LoginView, 'onLogin')
 def LoginView_onLogin(self, userName, password, serverName, isSocialToken2Login):
     if config.get('login/saveLastServer'):

diff --git a/source/res_mods/mods/xfw_packages/xvm_autologin/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_autologin/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.3'
-__wot_version__ = '1.6.1.1'
+__xvm_version__ = '8.1.5'
+__wot_version__ = '1.6.1.2'
 __revision__ = '7'
 __branch__ = 'master'
-__node__ = 'c23d30763ff5f460ab71e98afb52440bf2eb89ac'
+__node__ = '69bec6eb6b9fca2c85ed0ecda99fc568dc1b7264'
 __development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_autologin/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_autologin/xfw_package.json
@@ -3,13 +3,13 @@
     "name": "XVM Autologin",
     "description": "XVM Autologin module",
 
-    "version": "8.1.3.7",
+    "version": "8.1.5.7",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",
     "url_update": "https://modxvm.com/",
 
-    "wot_version_min": "1.6.1.1",
+    "wot_version_min": "1.6.1.2",
     "wot_version_exactmatch": false,
 
     "features": ["python"]

diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_ranked/xvm_battle_ranked.swf b/source/res_mods/mods/xfw_packages/xvm_battle/as_battle_ranked/xvm_battle_ranked.swf
diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_battle/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.3'
-__wot_version__ = '1.6.1.1'
+__xvm_version__ = '8.1.5'
+__wot_version__ = '1.6.1.2'
 __revision__ = '7'
 __branch__ = 'master'
-__node__ = 'c23d30763ff5f460ab71e98afb52440bf2eb89ac'
+__node__ = '69bec6eb6b9fca2c85ed0ecda99fc568dc1b7264'
 __development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_battle/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_battle/xfw_package.json
@@ -3,13 +3,13 @@
     "name": "XVM Battle",
     "description": "XVM Battle module",
 
-    "version": "8.1.3.7",
+    "version": "8.1.5.7",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",
     "url_update": "https://modxvm.com/",
 
-    "wot_version_min": "1.6.1.1",
+    "wot_version_min": "1.6.1.2",
     "wot_version_exactmatch": false,
 
     "features": ["actionscript", "python"]

diff --git a/source/res_mods/mods/xfw_packages/xvm_battleresults/python/__version__.py b/source/res_mods/mods/xfw_packages/xvm_battleresults/python/__version__.py
@@ -1,7 +1,7 @@
 # This file was created automatically from build script
-__xvm_version__ = '8.1.3'
-__wot_version__ = '1.6.1.1'
+__xvm_version__ = '8.1.5'
+__wot_version__ = '1.6.1.2'
 __revision__ = '7'
 __branch__ = 'master'
-__node__ = 'c23d30763ff5f460ab71e98afb52440bf2eb89ac'
+__node__ = '69bec6eb6b9fca2c85ed0ecda99fc568dc1b7264'
 __development__ = 'False'
diff --git a/source/res_mods/mods/xfw_packages/xvm_battleresults/xfw_package.json b/source/res_mods/mods/xfw_packages/xvm_battleresults/xfw_package.json
@@ -3,13 +3,13 @@
     "name": "XVM Battle Results",
     "description": "XVM Battle Results module",
 
-    "version": "8.1.3.7",
+    "version": "8.1.5.7",
     "dependencies": ["com.modxvm.xvm"],
 
     "url": "https://modxvm.com/",
     "url_update": "https://modxvm.com/",
 
-    "wot_version_min": "1.6.1.1",
+    "wot_version_min": "1.6.1.2",
     "wot_version_exactmatch": false,
 
     "features": ["python"]