Merge remote-tracking branch 'upstream/master'

Author: Desdaemon

.editorconfig

@@ -11,7 +11,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{sh,rb,js,yml,adoc}]
+[*.{sh,rb,js,yml,yaml,adoc}]
 indent_style = space
 indent_size = 2
 

.github/workflows/linter.yml

@@ -0,0 +1,62 @@
+name: Lint Files
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint:
+    name: YAML, CMake & Markdown
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install tools
+        run: |
+          pip install yamllint
+          pip install cmakelint
+
+      - uses: tj-actions/changed-files@v46
+        if: '!cancelled()'
+        id: changed-files-yaml
+        with:
+          files: |
+            **/*.yaml
+            **/*.yml
+      - name: Lint YAML files
+        if: steps.changed-files-yaml.outputs.any_changed == 'true'
+        run: |
+          yamllint -d "{extends: relaxed, rules: {line-length: {max: 100}}}" \
+            ${{ steps.changed-files-yaml.outputs.all_changed_files }}
+          # we often have extra long lines, so relaxing the check (from 80)
+
+      - uses: tj-actions/changed-files@v46
+        if: '!cancelled()'
+        id: changed-files-cmake
+        with:
+          files: |
+            **/*.cmake
+            **/CMakeLists.txt
+      - name: Lint CMake files
+        if: steps.changed-files-cmake.outputs.any_changed == 'true'
+        run: |
+          cmakelint --filter=-whitespace/tabs --linelength=120 \
+            ${{ steps.changed-files-cmake.outputs.all_changed_files }}
+          # we often have extra long lines, so relaxing the check (from 80)
+          # also do not warn about tabstops
+
+      - uses: tj-actions/changed-files@v46
+        if: '!cancelled()'
+        id: changed-files-md
+        with:
+          files: '**/*.md'
+          separator: ","
+      - name: Lint Markdown files
+        if: steps.changed-files-md.outputs.any_changed == 'true'
+        uses: DavidAnson/markdownlint-cli2-action@v19
+        with:
+          globs: ${{ steps.changed-files-md.outputs.all_changed_files }}
+          separator: ","

.github/workflows/pr_labels.yml

@@ -15,10 +15,10 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
         with:
-           # pull_request_target is run under forks, use main repo source
-           fetch-depth: 0
-           repository: EasyRPG/Player
-           ref: master
+          # pull_request_target is run under forks, use main repo source
+          fetch-depth: 0
+          repository: EasyRPG/Player
+          ref: master
 
       - name: Update labels
         uses: actions/labeler@v5

.github/workflows/stable-compilation.yml

@@ -19,8 +19,8 @@ defaults:
 
 jobs:
   docker:
-    name: ${{ matrix.image }}
-    runs-on: ubuntu-latest
+    name: ${{ matrix.image }} (${{ matrix.os.arch }})
+    runs-on: ${{ matrix.os.name }}
     container:
       image: ${{ matrix.image }}
 
@@ -30,10 +30,22 @@ jobs:
         image:
           #   version of: # CMake  | g++    | SDL    |     support end  #
           # -------------------------------------------------------------
-          - ubuntu:20.04  # 3.16.3 |  9.3.0 | 2.0.10 | LTS       (4/25) #
           - debian:11     # 3.18.4 | 10.2.1 | 2.0.14 | oldstable (8/24) #
-          - ubuntu:22.04  # 3.22.1 | 11.2.0 | 2.0.20 | LTS       (6/27) #
+          - ubuntu:22.04  # 3.22.1 | 11.2.0 | 2.0.20 | LTS       (4/27) #
           - debian:12     # 3.25.1 | 12.2.0 | 2.26.5 | stable    (6/26) #
+          - ubuntu:24.04  # 3.28.3 | 13.2.0 | 2.30.0 | LTS       (4/29) #
+        os:
+          - arch: x86_64
+            name: ubuntu-latest
+          - arch: arm64
+            name: ubuntu-24.04-arm
+        exclude:
+          - os:
+              arch: arm64
+            image: debian:11
+          - os:
+              arch: arm64
+            image: ubuntu:22.04
 
     steps:
       - name: Install dependencies
@@ -45,7 +57,7 @@ jobs:
             libicu-dev libexpat1-dev libinih-dev nlohmann-json3-dev \
             libsdl2-dev libpng-dev libpixman-1-dev libfmt-dev \
             libfreetype6-dev libharfbuzz-dev libmpg123-dev libsndfile-dev \
-            libvorbis-dev libopusfile-dev libspeexdsp-dev \
+            libvorbis-dev libopusfile-dev libspeexdsp-dev liblhasa-dev \
             libdrm-dev libgbm-dev # only needed for sdl2 on debian 11
 
       - name: Clone Repository

CMakeLists.txt

@@ -1,6 +1,6 @@
-cmake_minimum_required(VERSION 3.16...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18...3.31 FATAL_ERROR)
 
-project(EasyRPG_Player VERSION 0.8
+project(EasyRPG_Player VERSION 0.8.1
 	DESCRIPTION "Interpreter for RPG Maker 2000/2003 games"
 	HOMEPAGE_URL "https://easyrpg.org"
 	LANGUAGES CXX)
@@ -68,8 +68,6 @@ add_library(${PROJECT_NAME} OBJECT
 	src/baseui.h
 	src/battle_animation.cpp
 	src/battle_animation.h
-	src/battle_message.cpp
-	src/battle_message.h
 	src/bitmap.cpp
 	src/bitmapfont.h
 	src/bitmapfont_glyph.h
@@ -192,6 +190,8 @@ add_library(${PROJECT_NAME} OBJECT
 	src/game_map.h
 	src/game_message.cpp
 	src/game_message.h
+	src/game_message_terms.cpp
+	src/game_message_terms.h
 	src/game_party_base.cpp
 	src/game_party_base.h
 	src/game_party.cpp
@@ -629,7 +629,7 @@ elseif(PLAYER_TARGET_PLATFORM STREQUAL "SDL2")
 	# SDL2 depends on some systems on SDL2::SDL2main but SDL2::SDL2 is not always a dependency of it
 	# Manually add the dependencies
 	player_find_package(NAME SDL2
-		VERSION 2.0.5
+		VERSION 2.0.14
 		TARGET SDL2::SDL2
 		REQUIRED)
 
@@ -801,6 +801,10 @@ endif()
 # Shared by homebrew platforms
 if(NINTENDO_3DS OR NINTENDO_WII OR NINTENDO_WIIU OR NINTENDO_WIIU OR NINTENDO_SWITCH OR VITA)
 	target_compile_options(${PROJECT_NAME} PUBLIC -fno-exceptions -fno-rtti)
+	if(VITA)
+		# This optimisation is unstable on Vita (crashes at the end of MainLoop)
+		target_compile_options(${PROJECT_NAME} PUBLIC -fno-optimize-sibling-calls)
+	endif()
 	set(CMAKE_DL_LIBS "") # hack4icu!
 	set(PLAYER_ENABLE_TESTS OFF)
 	option(PLAYER_VERSIONED_PACKAGES "Create zip packages with versioned name (for internal use)" ON)
@@ -942,7 +946,7 @@ if(PLAYER_BUILD_LIBLCF)
 	target_link_libraries(${PROJECT_NAME} lcf)
 else()
 	# Use system package
-	player_find_package(NAME liblcf VERSION 0.8
+	player_find_package(NAME liblcf VERSION 0.8.1
 		TARGET liblcf::liblcf
 		REQUIRED)
 endif()

Makefile.am

@@ -42,8 +42,6 @@ libeasyrpg_player_a_SOURCES = \
 	src/baseui.h \
 	src/battle_animation.cpp \
 	src/battle_animation.h \
-	src/battle_message.cpp \
-	src/battle_message.h \
 	src/bitmap.cpp \
 	src/bitmap.h \
 	src/bitmapfont.h \
@@ -168,6 +166,8 @@ libeasyrpg_player_a_SOURCES = \
 	src/game_map.h \
 	src/game_message.cpp \
 	src/game_message.h \
+	src/game_message_terms.cpp \
+	src/game_message_terms.h \
 	src/game_party.cpp \
 	src/game_party.h \
 	src/game_party_base.cpp \

README.md

@@ -16,7 +16,7 @@ Documentation is available at the documentation wiki: https://wiki.easyrpg.org
 ### minimal / required
 
 - [liblcf] for RPG Maker data reading.
-- SDL3 or SDL2 >= 2.0.5 for screen backend support.
+- SDL3 or SDL2 >= 2.0.14 for screen backend support.
 - Pixman for low level pixel manipulation.
 - libpng for PNG image support.
 - zlib for XYZ image and ZIP archive support.

builds/android/app/build.gradle

@@ -5,9 +5,9 @@ android {
     assetPacks = [":assets"]
     defaultConfig {
         applicationId "org.easyrpg.player"
-        compileSdk 35
+        compileSdk 34
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 34
         versionName VERSION_NAME
         versionCode Integer.parseInt(VERSION_CODE)
     }

builds/android/app/src/main/AndroidManifest.xml

@@ -70,7 +70,8 @@
         <!-- Player's Activity -->
         <activity
             android:name=".player.EasyRpgPlayerActivity"
-            android:configChanges="orientation|screenSize" />
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/AppThemePlayerActivity"/>
         <!-- Settings' Activity -->
         <activity
             android:name=".settings.SettingsMainActivity"

builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java

@@ -142,7 +142,6 @@ public void onDrawerStateChanged(int newState) {
 
         NavigationView navigationView = findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
-        hideStatusBar();
 
         // Screen orientation
         if (SettingsManager.isForcedLandscape()) {
@@ -207,12 +206,6 @@ public boolean onNavigationItemSelected(MenuItem item) {
         return false;
     }
 
-    public void hideStatusBar() {
-        // Hide the status bar
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-    }
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == LAYOUT_EDIT) {