Merge branch 'meridian/oxce-plus' into Extended

.gitignore

@@ -77,4 +77,6 @@ Dependencies/
 #Ignore NetBeans project directory
 nbproject/
 .tx/
+src/OpenXcom.2010.VC.opendb
+bin/user
 /makefile

Extended.txt

@@ -195,6 +195,7 @@ Breaking change: Renamed access function to statis in armor (added prefix `Stats
 Bug fix.[br/]
 [br/]
 5.0:[br/]
+Merge both OXCE and OXCE+ into one.[br/]
 [br/]
 
 [examples]

bin/common/Language/Android/en-GB.yml

@@ -0,0 +1,38 @@
+en-GB:
+  STR_SYSTEM: "SYSTEM"
+  STR_SWIPE: "Swipe to turn"
+  STR_HOLD: "Hold to turn"
+  STR_SWIPE_DESC: "Swipe from a soldier in the direction you want him to face"
+  STR_HOLD_DESC: "Tap and hold in the direction you want your soldier to face"
+  STR_SYSTEM_UI: "Android UI display mode"
+  STR_SYSTEM_UI_DESC: "Changes Android navigation bar display mode"
+  STR_ALWAYS_SHOWN: "Always shown"
+  STR_LOW_PROFILE: "Low profile"
+  STR_IMMERSIVE: "Immersive mode"
+  STR_CONTROLS_LABEL: "Customise controls"
+  STR_RECONFIGURE_DIRS: "Set game folders"
+  STR_RECONFIGURE_DIRS_BTN: "Set folders"
+  STR_LOG_DESTINATION: "Log to"
+  STR_LOG_FILE: "File"
+  STR_LOG_FILE_DESC: "Write log to openxcom.log. May cause SEVERE performance drops!"
+  STR_LOG_SYSTEM: "Logcat"
+  STR_LOG_SYSTEM_DESC: "Write log to Android system log. Disabling this option might increase performance a bit, but will prevent useful messages from appearing in log."
+  STR_DEBUG_OPTIONS: "Debug options"
+  STR_LOG_TOUCH_EVENTS: "Log touches"
+  STR_LOG_TOUCH_EVENTS_DESC: "Write all touch events to log. Will decrease performance significantly, but should be useful for debugging."
+  STR_FAKE_EVENTS: "Fake events"
+  STR_FAKE_EVENTS_DESC: "Sends fake fingerUp touch events. Use this if you keep getting stuck buttons."
+  STR_FORCE_GL_MODE: "Force GL mode"
+  STR_FORCE_GL_MODE_DESC: "Forces texture format to RGB565. Use this setting if you're getting red-tinted screen. Applies after restart."
+  STR_MOUSE_MODE: "Mouse mode"
+  STR_MOUSE_BASIC: "Basic"
+  STR_MOUSE_EXTENDED: "Extended"
+  STR_MOUSE_MODE_DESC: "Extended mode enables native mouse events, providing near-desktop experience."
+  STR_LISTDRAGSCROLL: "List drag-scrolling"
+  STR_LISTDRAGSCROLL_DESC: "Enable drag-scrolling for scrollable lists. Useful for touchscreen-based devices."
+  STR_DRAGREORDER: "Drag to reorder soldiers"
+  STR_DRAGREORDER_DESC: "Drag soldiers to reorder them in the craft equipment screen."
+  STR_SHOW_CURSOR: "Show cursor"
+  STR_SHOW_CURSOR_DESC: "Draw the yellow cursor arrow. Useful with a mouse."
+  STR_FRAMESKIP: "Maximum frames skipped"
+  STR_FRAMESKIP_DESC: "This is the maximum number of frames that may be skipped by the draw code during gameplay"

bin/common/Language/Android/en-US.yml

@@ -0,0 +1,38 @@
+en-US:
+  STR_SYSTEM: "SYSTEM"
+  STR_SWIPE: "Swipe to turn"
+  STR_HOLD: "Hold to turn"
+  STR_SWIPE_DESC: "Swipe from a soldier in the direction you want him to face"
+  STR_HOLD_DESC: "Tap and hold in the direction you want your soldier to face"
+  STR_SYSTEM_UI: "Android UI display mode"
+  STR_SYSTEM_UI_DESC: "Changes Android navigation bar display mode"
+  STR_ALWAYS_SHOWN: "Always shown"
+  STR_LOW_PROFILE: "Low profile"
+  STR_IMMERSIVE: "Immersive mode"
+  STR_CONTROLS_LABEL: "Customize controls"
+  STR_RECONFIGURE_DIRS: "Set game folders"
+  STR_RECONFIGURE_DIRS_BTN: "Set folders"
+  STR_LOG_DESTINATION: "Log to"
+  STR_LOG_FILE: "File"
+  STR_LOG_FILE_DESC: "Write log to openxcom.log. May cause SEVERE performance drops!"
+  STR_LOG_SYSTEM: "Logcat"
+  STR_LOG_SYSTEM_DESC: "Write log to Android system log. Disabling this option might increase performance a bit, but will prevent useful messages from appearing in log."
+  STR_DEBUG_OPTIONS: "Debug options"
+  STR_LOG_TOUCH_EVENTS: "Log touches"
+  STR_LOG_TOUCH_EVENTS_DESC: "Write all touch events to log. Will decrease performance significantly, but should be useful for debugging."
+  STR_FAKE_EVENTS: "Fake events"
+  STR_FAKE_EVENTS_DESC: "Sends fake fingerUp touch events. Use this if you keep getting stuck buttons."
+  STR_FORCE_GL_MODE: "Force GL mode"
+  STR_FORCE_GL_MODE_DESC: "Forces texture format to RGB565. Use this setting if you're getting red-tinted screen. Applies after restart."
+  STR_MOUSE_MODE: "Mouse mode"
+  STR_MOUSE_BASIC: "Basic"
+  STR_MOUSE_EXTENDED: "Extended"
+  STR_MOUSE_MODE_DESC: "Extended mode enables native mouse events, providing near-desktop experience."
+  STR_LISTDRAGSCROLL: "List drag-scrolling"
+  STR_LISTDRAGSCROLL_DESC: "Enable drag-scrolling for scrollable lists. Useful for touchscreen-based devices."
+  STR_DRAGREORDER: "Drag to reorder soldiers"
+  STR_DRAGREORDER_DESC: "Drag soldiers to reorder them in the craft equipment screen."
+  STR_SHOW_CURSOR: "Show cursor"
+  STR_SHOW_CURSOR_DESC: "Draw the yellow cursor arrow. Useful with a mouse."
+  STR_FRAMESKIP: "Maximum frames skipped"
+  STR_FRAMESKIP_DESC: "This is the maximum number of frames that may be skipped by the draw code during gameplay"

bin/common/Language/Android/ja.yml

@@ -0,0 +1,38 @@
+ja:
+  STR_SYSTEM: "システム"
+  STR_SWIPE: "スワイプで向き変更"
+  STR_HOLD: "タップ保持で向き変更"
+  STR_SWIPE_DESC: "対象の兵の上でスワイプをして向きを変える"
+  STR_HOLD_DESC: "対象の兵をタップしたままで動かして向きを変える"
+  STR_SYSTEM_UI: "Android用UIモード"
+  STR_SYSTEM_UI_DESC: "ナビゲーションバーをAndroid向け表示に切り替える"
+  STR_ALWAYS_SHOWN: "常時表示"
+  STR_LOW_PROFILE: "最低限"
+  STR_IMMERSIVE: "特化モード"
+  STR_CONTROLS_LABEL: "入力のカスタマイズ"
+  STR_RECONFIGURE_DIRS: "ゲームフォルダの指定"
+  STR_RECONFIGURE_DIRS_BTN: "フォルダの設定"
+  STR_LOG_DESTINATION: "ログの記録先"
+  STR_LOG_FILE: "ファイル"
+  STR_LOG_FILE_DESC: "openxcom.logの名でログを記録保存しますが、ゲームの動作が非常に重くなる場合が有ります。"
+  STR_LOG_SYSTEM: "Logcat"
+  STR_LOG_SYSTEM_DESC: "ログをAndroidのシステムログに書き込みます。このオプションをオフにすると多少動作が軽くなる場合がありますが、詳細は記録されません。"
+  STR_DEBUG_OPTIONS: "デバッグオプション"
+  STR_LOG_TOUCH_EVENTS: "タッチイベントのログ"
+  STR_LOG_TOUCH_EVENTS_DESC: "タッチイベントを全てログに残します。動作が非常に重くなる場合が有りますが、デバッグ目的の為には有用です。"
+  STR_FAKE_EVENTS: "タッチオフの疑似情報を内部的に使用します。ボタンが押されっぱなしになる状態を解消したい時に有効です。"
+  STR_FAKE_EVENTS_DESC: "タッチオフの疑似情報を内部的に使用します。ボタンが押されっぱなしになる状態の解消に有効です。"
+  STR_FORCE_GL_MODE: "強制GLモード"
+  STR_FORCE_GL_MODE_DESC: "テクスチャのフォーマットを強制的にRGB565にします。画面が赤色っぽくなる場合にオンにして下さい。ゲームの再起動後に適用されます。"
+  STR_MOUSE_MODE: "マウスモード"
+  STR_MOUSE_BASIC: "基本"
+  STR_MOUSE_EXTENDED: "拡張"
+  STR_MOUSE_MODE_DESC: "拡張モードはネイティブでマウスをサポートし、デスクトップ環境に近い者にします。"
+  STR_LISTDRAGSCROLL: "ドラッグスクロールによるリスト"
+  STR_LISTDRAGSCROLL_DESC: "スクロール可能なリストでドラッグスクロールを使用可能にします。タッチ入力系でプレイする場合に便利です。"
+  STR_DRAGREORDER: "ドラッグで兵の並び替え"
+  STR_DRAGREORDER_DESC: "機体の装備画面で表示される兵の並び順をドラッグで変更可能にします。"
+  STR_SHOW_CURSOR: "カーソルの表示"
+  STR_SHOW_CURSOR_DESC: "黄色いマウスカーソルを表示します。マウス入力向けの機能です。"
+  STR_FRAMESKIP: "フレームスキップの最大数"
+  STR_FRAMESKIP_DESC: "ゲーム中の描画の際に行われるフレームスキップの最大数を指定します。"

bin/common/Language/Android/pl.yml

@@ -0,0 +1,38 @@
+pl:
+  STR_SYSTEM: "SYSTEM"
+  STR_SWIPE: "Przesuń by obrócić"
+  STR_HOLD: "Przytrzymaj by obrócić"
+  STR_SWIPE_DESC: "Przesuń od żołnierza w stronę, w którą ma spojrzeć"
+  STR_HOLD_DESC: "Kliknij i przytrzymaj od żołnierza w stronę, w którą ma spojrzeć"
+  STR_SYSTEM_UI: "Tryb wyświetlania interfejsu Androida"
+  STR_SYSTEM_UI_DESC: "Zmienia tryb wyświetlania paska nawigacji Androida"
+  STR_ALWAYS_SHOWN: "Zawsze widoczny"
+  STR_LOW_PROFILE: "Niski profil"
+  STR_IMMERSIVE: "Tryb immersji"
+  STR_CONTROLS_LABEL: "Przedefiniuj klawisze"
+  STR_RECONFIGURE_DIRS: "Ustaw foldery gry"
+  STR_RECONFIGURE_DIRS_BTN: "Ustaw foldery"
+  STR_LOG_DESTINATION: "Zaloguj do"
+  STR_LOG_FILE: "Plik"
+  STR_LOG_FILE_DESC: "Zapisuj w openxcom.log. Może spowodować POWAŻNY spadek szybkości!"
+  STR_LOG_SYSTEM: "Logcat"
+  STR_LOG_SYSTEM_DESC: "Zapisuje log systemu Android. Wyłączenie tej opcji może nieco zwiększyć wydajność, ale użyteczne informacje nie będą pojawiały się w logu."
+  STR_DEBUG_OPTIONS: "Opcje debugu"
+  STR_LOG_TOUCH_EVENTS: "Loguj dotyk"
+  STR_LOG_TOUCH_EVENTS_DESC: "Zapisuje wszystkie zdarzenia dotykowe w logu. Znacznie obniży wydajność, ale może się przydać przy debugowaniu."
+  STR_FAKE_EVENTS: "Fałszywe zdarzenia"
+  STR_FAKE_EVENTS_DESC: "Wysyła fałszywe zdarzenia dotykowe fingerUp. Użyj, jeśli przyciski ci się zacinają."
+  STR_FORCE_GL_MODE: "Wymuś tryb GL"
+  STR_FORCE_GL_MODE_DESC: "Wymusza format tekstur RGB565. Użyj tej opcji, jeśli twój ekran jest zabarwiony czerwonawo. Działa po restarcie."
+  STR_MOUSE_MODE: "Tryb myszy"
+  STR_MOUSE_BASIC: "Podstawowy"
+  STR_MOUSE_EXTENDED: "Rozszerzony"
+  STR_MOUSE_MODE_DESC: "Tryb rozszerzony pozwala na natywne zdarzenia myszy, dając wrażenie grania na komputerze."
+  STR_LISTDRAGSCROLL: "Przewijanie list trzymaniem"
+  STR_LISTDRAGSCROLL_DESC: "Włącza skrolowanie list poprzez ciągnięcie. Przydatne dla urządzeń dotykowych."
+  STR_DRAGREORDER: "Przeciągaj żołnierzy, by zmienić kolejność"
+  STR_DRAGREORDER_DESC: "Przeciągaj żołnierzy, by zmienić ich kolejność w ekranie pojazdu."
+  STR_SHOW_CURSOR: "Pokaż kursor"
+  STR_SHOW_CURSOR_DESC: "Rysuje żółtą strzałkę kursora. Przydatne wraz z myszą."
+  STR_FRAMESKIP: "Maksymalna liczba pominiętych klatek"
+  STR_FRAMESKIP_DESC: "Maksymalna liczba klatek, które podczas gry mogą zostać pominięte przez kod wyświetlający"

bin/common/Language/Android/ro.yml

@@ -0,0 +1,38 @@
+ro:
+  STR_SYSTEM: "SISTEM"
+  STR_SWIPE: "Glisați pentru a întoarce"
+  STR_HOLD: "Țineți pentru a întoarce"
+  STR_SWIPE_DESC: "Glisați de la un soldat în direcția în care îl vreți să fie poziționat"
+  STR_HOLD_DESC: "Loviți si țineți apăsat în direcția în care vreți să fie poziționați soldatul vostru"
+  STR_SYSTEM_UI: "Mod de afișare Android UI "
+  STR_SYSTEM_UI_DESC: "Schimbă modul de afișare al barei de navigare Android"
+  STR_ALWAYS_SHOWN: "Întotdeauna arătat"
+  STR_LOW_PROFILE: "Profil scăzut"
+  STR_IMMERSIVE: "Modul imersiv"
+  STR_CONTROLS_LABEL: "Customizează controale"
+  STR_RECONFIGURE_DIRS: "Setează dosare de joc"
+  STR_RECONFIGURE_DIRS_BTN: "Seteaza dosare"
+  STR_LOG_DESTINATION: "Scrie log la"
+  STR_LOG_FILE: "Fisier"
+  STR_LOG_FILE_DESC: "Scrie log la openxcom.log. Poate cauza cădere de performanţă SEVERĂ!"
+  STR_LOG_SYSTEM: "Logcat"
+  STR_LOG_SYSTEM_DESC: "Scrie log la log-ul de system Android. Dezactivarea acestei opțiuni poate crește performanța un pic, dar va preveni mesaje utile să apareă în log."
+  STR_DEBUG_OPTIONS: "Opțiuni de depanare"
+  STR_LOG_TOUCH_EVENTS: "Scrie atingeri in log"
+  STR_LOG_TOUCH_EVENTS_DESC: "Scrie orice eveniment tactil la log. Va scade performanța semnificativ, dar poate fii folositor pentru depanare."
+  STR_FAKE_EVENTS: "Evenimente false"
+  STR_FAKE_EVENTS_DESC: "Trimite evenimente tactile false fingerUp. Folosește această opțiune dacă aveți butoanele care rămân blocate. "
+  STR_FORCE_GL_MODE: "Forțează modul GL"
+  STR_FORCE_GL_MODE_DESC: "Forțeaza formatul de textura la RGB565. Folosește aceasta opțiune dacă vedeți ecran cu tentă roșie. Este aplicat după restartare. "
+  STR_MOUSE_MODE: "Modul mouse"
+  STR_MOUSE_BASIC: "Bază"
+  STR_MOUSE_EXTENDED: "Extins"
+  STR_MOUSE_MODE_DESC: "Modul extins permite evenimente native de mouse, furnizând o experiență aproape-desktop."
+  STR_LISTDRAGSCROLL: "Liste cu defilare prin glisare"
+  STR_LISTDRAGSCROLL_DESC: "Permite defilare prin glisare a listelor de parurgere. Folositor pentru dispositive cu touchscreen."
+  STR_DRAGREORDER: "Trage să reorganizezi soldații"
+  STR_DRAGREORDER_DESC: "Trage soldații să îi reorganizezi in meniul de echipament al navei"
+  STR_SHOW_CURSOR: "Afișează cursorul"
+  STR_SHOW_CURSOR_DESC: "Desenează cursorul sageată galbenă. Folositor cu mouse."
+  STR_FRAMESKIP: "Maximum frame-uri sărite."
+  STR_FRAMESKIP_DESC: "Acesta este numărul maxim de frame-uri care pot fi sărite de codul de desenare in timpul jocului."

bin/common/Language/Android/ru.yml

@@ -0,0 +1,38 @@
+ru:
+  STR_SYSTEM: "СИСТЕМА"
+  STR_SWIPE: "Поворот свайпом"
+  STR_HOLD: "Поворот удержанием"
+  STR_SWIPE_DESC: "Проведите пальцем от солдата в ту сторону, в которую хотите его развернуть"
+  STR_HOLD_DESC: "Удерживайте палец в точке, к которой хотите развернуть солдата"
+  STR_SYSTEM_UI: "Интерфейс системы"
+  STR_SYSTEM_UI_DESC: "Позволяет выбрать стиль отображения системной навигационной панели (для совместимых устройств)"
+  STR_ALWAYS_SHOWN: "Отображается"
+  STR_LOW_PROFILE: "Затемнён"
+  STR_IMMERSIVE: "Скрыт"
+  STR_CONTROLS_LABEL: "Настройки управления"
+  STR_RECONFIGURE_DIRS: "Папки игры"
+  STR_RECONFIGURE_DIRS_BTN: "Изменить"
+  STR_LOG_DESTINATION: "Журналирование"
+  STR_LOG_FILE: "Файл"
+  STR_LOG_FILE_DESC: "Записывать события в openxcom.log. Производительность может СИЛЬНО упасть!"
+  STR_LOG_SYSTEM: "Logcat"
+  STR_LOG_SYSTEM_DESC: "Записывать события в системный журнал. Отключение может немного повысить производительность."
+  STR_DEBUG_OPTIONS: "Отладка"
+  STR_LOG_TOUCH_EVENTS: "Нажатия"
+  STR_LOG_TOUCH_EVENTS_DESC: "Запись всех событий, связанных с нажатиями, в журнал. Только для отладки."
+  STR_FAKE_EVENTS: "События"
+  STR_FAKE_EVENTS_DESC: "Включает генерирование дополнительных событий mouseUp для предотвращения залипаний."
+  STR_FORCE_GL_MODE: "Режим GL"
+  STR_FORCE_GL_MODE_DESC: "Принуд. выбор формата текстур RGB565. Может помочь при красных экранах. Требует перезапуска игры."
+  STR_MOUSE_MODE: "Режим мыши"
+  STR_MOUSE_BASIC: "Обычный"
+  STR_MOUSE_EXTENDED: "Расширенный"
+  STR_MOUSE_MODE_DESC: "Расширенный режим включает полноценную поддержку событий мыши."
+  STR_LISTDRAGSCROLL: "Прокрутка списков удержанием"
+  STR_LISTDRAGSCROLL_DESC: "Позволяет прокручивать списки удержанием клавиши мыши/пальца. Подходит для тачскринов."
+  STR_DRAGREORDER: "Сортировка бойцов перетаскиванием"
+  STR_DRAGREORDER_DESC: "Позволяет изменять порядок расположения солдат в транспорте перетаскиванием."
+  STR_SHOW_CURSOR: "Курсор мыши"
+  STR_SHOW_CURSOR_DESC: "Отображать игровой курсор мыши. Необязательно для тачскринов."
+  STR_FRAMESKIP: "Макс. количество пропущенных кадров"
+  STR_FRAMESKIP_DESC: "Максимальное количество кадров, которое может быть пропущено при отрисовке во время игры"