Skip to content

Commit

Permalink
Merge pull request #16 from CleverRaven/master
Browse files Browse the repository at this point in the history
Hi. I am a Title.
  • Loading branch information
faefux committed Jul 1, 2021
2 parents 0a935ee + 9749161 commit 56511e4
Show file tree
Hide file tree
Showing 211 changed files with 22,092 additions and 17,894 deletions.
70 changes: 70 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master, 0.8-branch, 0.9-branch, 0.A-branch, 0.B-branch, 0.C-branch, 0.D-branch, 0.E-branch, gh-pages ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '31 12 * * 6'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'cpp', 'javascript', 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
#- name: Autobuild
# uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

- run: |
make RELEASE=1 RUNTESTS=0
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
16 changes: 14 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ jobs:
ext: zip
content: application/zip
- name: Linux Tiles x64
os: ubuntu-latest
os: ubuntu-18.04
mxe: none
android: none
tiles: 1
artifact: linux-tiles-x64
ext: tar.gz
content: application/gzip
- name: linux-curses-x64
os: ubuntu-latest
os: ubuntu-18.04
mxe: none
android: none
tiles: 0
Expand Down Expand Up @@ -178,6 +178,8 @@ jobs:
mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
- name: Build CDDA (osx)
if: runner.os == 'macOS'
env:
USE_HOME_DIR: 1
run: |
cat >VERSION.txt <<EOL
build type: ${{ matrix.artifact }}
Expand Down Expand Up @@ -237,3 +239,13 @@ jobs:
asset_path: cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
asset_name: cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
asset_content_type: ${{ matrix.content }}
- name: Trigger GitHub pages rebuild
run: |
curl --fail --request POST \
--url https://api.github.com/repos/${{ github.repository }}/pages/builds \
--header "Authorization: Bearer $USER_TOKEN" \
--header "Accept: application/vnd.github.v3+json"
env:
# You must create a personal token with repo access as GitHub does
# not yet support server-to-server page builds.
USER_TOKEN: ${{ secrets.USER_TOKEN }}
2 changes: 0 additions & 2 deletions .lgtm.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Disable FIXME query, in DDA it is as likely to be a future feature as a bug.
# Disable "potentially dangerous function" warning like localtime, there is no good alternative and we aren't multithreaded.
queries:
- exclude: cpp/fixme-comment
- exclude: cpp/potentially-dangerous-function
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,7 @@ ifeq ($(TARGETSYSTEM), LINUX)
DATA_PREFIX=$(DESTDIR)$(PREFIX)/share/cataclysm-dda/
BIN_PREFIX=$(DESTDIR)$(PREFIX)/bin
LOCALE_DIR=$(DESTDIR)$(PREFIX)/share/locale
SHARE_DIR=$(DESTDIR)$(PREFIX)/share
install: version $(TARGET)
mkdir -p $(DATA_PREFIX)
mkdir -p $(BIN_PREFIX)
Expand All @@ -1016,6 +1017,9 @@ install: version $(TARGET)
cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
ifeq ($(TILES), 1)
cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
install -Dm755 -t $(SHARE_DIR)/applications/ data/xdg/org.cataclysmdda.CataclysmDDA.desktop
install -Dm644 -t $(SHARE_DIR)/metainfo/ data/xdg/org.cataclysmdda.CataclysmDDA.appdata.xml
install -Dm644 -t $(SHARE_DIR)/icons/hicolor/scalable/apps/ data/xdg/org.cataclysmdda.CataclysmDDA.svg
endif
ifeq ($(SOUND), 1)
cp -R --no-preserve=ownership data/sound $(DATA_PREFIX)
Expand All @@ -1032,6 +1036,7 @@ ifeq ($(TARGETSYSTEM), CYGWIN)
DATA_PREFIX=$(DESTDIR)$(PREFIX)/share/cataclysm-dda/
BIN_PREFIX=$(DESTDIR)$(PREFIX)/bin
LOCALE_DIR=$(DESTDIR)$(PREFIX)/share/locale
SHARE_DIR=$(DESTDIR)$(PREFIX)/share
install: version $(TARGET)
mkdir -p $(DATA_PREFIX)
mkdir -p $(BIN_PREFIX)
Expand All @@ -1048,6 +1053,9 @@ install: version $(TARGET)
cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
ifeq ($(TILES), 1)
cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
install -Dm755 -t $(SHARE_DIR)/applications/ data/xdg/org.cataclysmdda.CataclysmDDA.desktop
install -Dm644 -t $(SHARE_DIR)/metainfo/ data/xdg/org.cataclysmdda.CataclysmDDA.appdata.xml
install -Dm644 -t $(SHARE_DIR)/icons/hicolor/scalable/apps/ data/xdg/org.cataclysmdda.CataclysmDDA.svg
endif
ifeq ($(SOUND), 1)
cp -R --no-preserve=ownership data/sound $(DATA_PREFIX)
Expand Down
15 changes: 15 additions & 0 deletions android/app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="installTitle">Installiere Spieldaten...</string>
<string name="upgradeTitle">Aktualisiere Spieldaten...</string>
<string name="helpTitle">Hilfe &amp; Steuerung</string>
<string name="helpMessage">\"Wischen\" für Richtungsbewegung (Halten für virtuellen Joystick). \"Tippen\" um Auswahl in Menüs zu bestätigen oder pausiere einen Zug In-Game (Halten zum pausieren mehrerer Züge). \"Doppel Tippen\" zum Abbrechen oder Zurück in Menüs (Wie ESC auf Tastatur). \"Zusammenkneifen\" zum Rein/Raus zoomen (In-Game). Drücke Hardware \"Zurück\" Knopf fürs Umschalten der virtuellen Tastaur (Halten zum Umschalten der Tastatur Shortcuts).</string>
<string name="softwareRendering">Software-Rendering</string>
<string name="forceFullscreen">Erwzinge Vollbild</string>
<string name="trapBackButton">Verstecke Zurück Knopf</string>
<string name="settings">Einstellungen</string>
<string name="startGame">Starte Spiel</string>
<string name="showHelp">Zeige Hilfe</string>
<string name="crashAlert">Das Spiel wurde beim letzten Mal nicht richtig beendet</string>
<string name="crashMessage">Der Crash Report der sich in ./config/crash.log befindet könnten den Entwicklern helfen Programmfehler zu beheben.</string>
</resources>
15 changes: 15 additions & 0 deletions android/app/src/main/res/values-it-rIT/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="installTitle">Sto installando i dati di gioco...</string>
<string name="upgradeTitle">Sto aggiornando i dati di gioco...</string>
<string name="helpTitle">Aiuto &amp; Controlli</string>
<string name="helpMessage">Fai \"swipe\" per il controllo direzionale (tieni premuto per il joystick virtuale). Tocca lo schermo per dare conferma nei menù contestuali o per passare un turno nel gioco (tieni premuto per passare più turni). Tocca due volte lo schermo per annullare o tornare indietro nei menù (funziona come il tasto ESC). Fai un \"pinch\" per zoommare vicino o lontano (dentro al gioco). Usa il tasto \"Indietro\" del tuo dispositivo per attivare la tastiera virtuale (tieni premuto per attivare le scorciatoie della tastiera).</string>
<string name="softwareRendering">Modalità software</string>
<string name="forceFullscreen">Forza schermo intero</string>
<string name="trapBackButton">Blocca il tasto Indietro</string>
<string name="settings">Impostazioni</string>
<string name="startGame">Avvia gioco</string>
<string name="showHelp">Mostra aiuto</string>
<string name="crashAlert">Il gioco non è stato chiuso correttamente l\'ultima volta</string>
<string name="crashMessage">Il crash report localizzato in ./config/crash.log può aiutare gli sviluppatori a comprendere gli errori di programmazione.</string>
</resources>
15 changes: 15 additions & 0 deletions android/app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="installTitle">Instalando dados do jogo...</string>
<string name="upgradeTitle">Melhorando dados do jogo...</string>
<string name="helpTitle">Controles</string>
<string name="helpMessage">\"Deslize\" para movimento direcional (mantenha pressionado para joystick virtual). \"Toque\" para confirmar a seleção no menu, ou Pausar um turno em jogo (mantenha pressionado para Pausar diversos turnos em jogo). \"Toque duas vezes\" para cancelar, ou voltar em menus (funciona como tecla Esc). \"Pince\" para aumentar e diminuir o zoom (em jogo). Use o botão de \"Voltar\" do dispositivo para ativar o teclado virtual (mantenha pressionado para alternar atalhos de teclado).</string>
<string name="softwareRendering">Renderização de software</string>
<string name="forceFullscreen">Forçar tela cheia</string>
<string name="trapBackButton">Manter botão de voltar </string>
<string name="settings">Configurações</string>
<string name="startGame">Iniciar jogo</string>
<string name="showHelp">Mostrar ajuda</string>
<string name="crashAlert">O jogo não foi encerrado corretamente na última vez</string>
<string name="crashMessage">O relatório de erro localizado em ./config/crash.log pode ajudar desenvolvedores a solucionarem erros no programa.</string>
</resources>
15 changes: 15 additions & 0 deletions android/app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="installTitle">Oyun verileri yükleniyor...</string>
<string name="upgradeTitle">Oyun verileri güncelleniyor...</string>
<string name="helpTitle">Yardım &amp; Kontroller</string>
<string name="helpMessage">Yönlü hareket için \"Kaydırın\" (sanal joystick için basılı tutun). Menüde seçimi onaylamak veya oyunda bir turu atlamak için \"Dokunun\" (birkaç Tur Atlamak için basılı tutun). İptal etmek veya menülere geri dönmek için \"Çift dokunun\" (ESC tuşu gibi çalışır). (Oyun İçinde) yakınlaştırmak/uzaklaştırmak için \"Sıkıştırın\". Sanal klavyeyi açmak için telefonun \"Geri\" tuşunu kullanın (klavye kısayollarını değiştirmek için basılı tutun).</string>
<string name="softwareRendering">Software rendering</string>
<string name="forceFullscreen">Tam ekrana zorla</string>
<string name="trapBackButton">Geri düğmesi</string>
<string name="settings">Ayarlar</string>
<string name="startGame">Oyunu başlat</string>
<string name="showHelp">Yardımı göster</string>
<string name="crashAlert">Oyun geçen sefer düzgün şekilde kapatılmadı</string>
<string name="crashMessage">\"./config/crash.log\" \'taki çökme raporu geliştiricilerin program hatalarını gidermelerine yardımcı olabilir.</string>
</resources>
32 changes: 16 additions & 16 deletions android/app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="installTitle">正在解压游戏数据…</string>
<string name="upgradeTitle">正在合并游戏数据…</string>
<string name="helpTitle">游戏控制帮助</string>
<string name="helpMessage">[屏幕上滑动]可定向移动([按住]可显示虚拟操纵杆,可在设置中选择关闭)
[轻触屏幕]可确认菜单中的选项\'或\'在游戏中等待一个回合([长按]可等待几个回合)
[双击屏幕]可取消当前操作\'或\'返回菜单(类似于Escape键)
游戏中[双指并拢手势]可放大/缩小视图当前分辨率(仅限开启贴图包状态下)
[点击系统后退键(手机上的小于号键,在菜单键旁边)]可切出虚拟键盘,按住直至弹窗出现可隐藏/显示下方快捷键栏
*设置中可绑定四个双指方向滑动快捷键;例双指向下滑动绑定键为\"i\",即可游戏内双指向下滑动打开物品栏。</string>
<string name="installTitle">正在安装游戏数据……</string>
<string name="upgradeTitle">正在合并游戏数据…</string>
<string name="helpTitle">帮助及设置</string>
<string name="helpMessage">[滑动] 按方向移动([长按] 显示虚拟手柄)
[短按] 确认菜单选项 或 等待一回合([长按] 等待多回合)
[双击] 取消当前操作 或 返回菜单 (等同于 Esc 键)
[双指内缩] 放大/缩小视野(游戏中)
[系统返回键] 切出虚拟键盘([长按] 隐藏/显示快捷键栏)
*设置中可设置四个双指方向滑动快捷键;例:[双指向下滑动] 设置为 \"i\",即可游戏内双指向下滑动打开物品栏。</string>
<string name="softwareRendering">软件渲染
(不可开启)</string>
(仅在硬件渲染失效时尝试使用)</string>
<string name="forceFullscreen">强制全屏
(开启后不显示通知栏与虚拟键)</string>
(隐藏通知栏与虚拟键)</string>
<string name="trapBackButton">限制返回
(禁止返回按键退出APP)</string>
(返回按键不会退出游戏)</string>
<string name="settings">预设
进入游戏后请到 设置-图形 中修改终端宽高比)</string>
<string name="startGame">载入游戏</string>
首次启动建议进入 设置-图形 调整终端宽高比)</string>
<string name="startGame">开始游戏</string>
<string name="showHelp">查看帮助</string>
<string name="crashAlert">上一次游戏遇到错误异常退出</string>
<string name="crashMessage">日志文件位于Android/data/CataclysmDDA/files/config/crash.log,可有助于开发者解决程序错误。</string>
<string name="crashAlert">检测到上次游戏未正常退出</string>
<string name="crashMessage">崩溃日志已保存至安装目录 ./config/debug.log,上传至官方论坛协助开发者解决游戏异常提供帮助。</string>
</resources>
4 changes: 2 additions & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ version_header_path=./../src/version.h

# This property controls which compileSdkVersion should be used
# You can override this from the command line by passing "-Poverride_compileSdkVersion=#"
override_compileSdkVersion=28
override_compileSdkVersion=29

# This property controls which minSdkVersion should be used
# You can override this from the command line by passing "-Poverride_minSdkVersion=#"
override_minSdkVersion=14

# This property controls which targetSdkVersion should be used
# You can override this from the command line by passing "-Poverride_targetSdkVersion=#"
override_targetSdkVersion=28
override_targetSdkVersion=29

# This property controls which ndkBuildAppPlatform should be used
# You can override this from the command line by passing "-Poverride_ndkBuildAppPlatform=#"
Expand Down
Loading

0 comments on commit 56511e4

Please sign in to comment.