Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: EasyRPG/Player
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d34a46005207926992116b2f577711e2698ea549
Choose a base ref
..
head repository: EasyRPG/Player
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 64d6d759fb2cab822607bd2c87f06e40f4fefed1
Choose a head ref
Showing 473 changed files with 22,801 additions and 13,954 deletions.
4 changes: 1 addition & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -15,9 +15,7 @@ src/external/* -diff linguist-vendored
src/midiprogram.h -diff linguist-vendored
src/midisequencer.* -diff linguist-vendored
src/midisynth.* -diff linguist-vendored
src/picojson.h -diff linguist-vendored
CMakePresets.json -diff linguist-generated
builds/android/app/src/main/java/org/libsdl/app/SDL*.java -diff linguist-vendored
builds/android/app/src/main/java/org/libsdl/app/*.java -diff linguist-vendored
builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java diff
builds/android/app/src/main/java/org/libsdl/app/HID*.java -diff linguist-vendored
src/generated/* -diff linguist-generated
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: monthly
labels:
- "Building"
#reviewers:
# - carstene1ns
commit-message:
prefix: "CI"
17 changes: 17 additions & 0 deletions .github/gcc_comment_matcher.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"problemMatcher": [
{
"owner": "gcc-problem-matcher",
"pattern": [
{
"regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
"file": 1,
"line": 2,
"column": 3,
"severity": 4,
"message": 5
}
]
}
]
}
129 changes: 129 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
#
# See https://github.com/actions/labeler
# and workflows/pr_labels.yml for reference
#

Building:
- changed-files:
- any-glob-to-any-file:
- .github/**
- CMakeLists.txt
- builds/**
- Makefile.am
- configure.ac

Documentation:
- changed-files:
- any-glob-to-any-file:
- docs/**
- '**/*.md'
- '**/*.adoc'
- src/docmain.h
- '**/Doxyfile*'
- resources/unix/*.metainfo.xml

Tests:
- changed-files:
- any-glob-to-any-file: [ tests/** ]

Window/Scenes:
- changed-files:
- any-glob-to-any-file: [ src/**/window_*, src/**/scene_* ]

# misc

Audio:
- changed-files:
- any-glob-to-any-file: [ src/**/*audio* ]

Battle:
- changed-files:
- any-glob-to-any-file:
- src/**/scene_battle*
- src/**/window_battle*
- src/**/game_battle.*
- src/**/game_battlealgorithm.*

Bitmaps:
- changed-files:
- any-glob-to-any-file:
- src/**/bitmap.*
- src/**/bitmap_*
- src/**/sprite.*
- src/**/sprite_*

FileFinder:
- changed-files:
- any-glob-to-any-file: [ src/**/filefinder*, src/**/filesystem* ]

Fonts:
- changed-files:
- any-glob-to-any-file:
- resources/exfont.png
- resources/ttyp0/**
- resources/shinonome/**
- resources/wenquanyi/**
- src/**/*font*
- src/generated/bitmapfont_*

Input:
- changed-files:
- any-glob-to-any-file: [ src/**/*input* ]

Messages:
- changed-files:
- any-glob-to-any-file: [ src/**/*message* ]

MIDI:
- changed-files:
- any-glob-to-any-file: [ src/**/*midi* ]

Settings:
- changed-files:
- any-glob-to-any-file: [ src/**/*config* ]

Translation:
- changed-files:
- any-glob-to-any-file: [ src/**/translation* ]

# platforms

3DS:
- changed-files:
- any-glob-to-any-file: [ src/platform/3ds/**, resources/3ds/** ]

Android:
- changed-files:
- any-glob-to-any-file: [ src/platform/android/**, builds/android/app/** ]

Emscripten:
- changed-files:
- any-glob-to-any-file: [ src/platform/emscripten/**, resources/emscripten/** ]

libretro:
- changed-files:
- any-glob-to-any-file: [ src/platform/libretro/** ]

macOS:
- changed-files:
- any-glob-to-any-file: [ src/platform/macos/**, resources/macos/** ]

PSVita:
- changed-files:
- any-glob-to-any-file: [ src/platform/psvita/**, resources/psvita/** ]

Switch:
- changed-files:
- any-glob-to-any-file: [ src/platform/switch/**, resources/switch/** ]

Wii:
- changed-files:
- any-glob-to-any-file: [ src/platform/wii/**, resources/wii/** ]

WiiU:
- changed-files:
- any-glob-to-any-file: [ src/platform/wiiu/**, resources/wiiu/** ]

Win32:
- changed-files:
- any-glob-to-any-file: [ src/platform/windows/**, resources/windows/** ]
27 changes: 27 additions & 0 deletions .github/workflows/pr_labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "Label Pull Requests"
on:
pull_request_target:
types: [opened, ready_for_review]

jobs:
update:
permissions:
contents: read
pull-requests: write

runs-on: ubuntu-latest

steps:
- 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

- name: Update labels
uses: actions/labeler@v5
with:
sync-labels: true
dot: true
34 changes: 20 additions & 14 deletions .github/workflows/stable-compilation.yml
Original file line number Diff line number Diff line change
@@ -9,6 +9,10 @@ on:
description: Git Ref (Optional)
required: false

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

defaults:
run:
shell: bash
@@ -24,35 +28,38 @@ jobs:
fail-fast: false
matrix:
image:
- debian:10 # oldstable | CMake 3.13.4 | G++ 8.3.0 | SDL 2.0.9
- ubuntu:20.04 # LTS | CMake 3.16.3 | G++ 9.3.0 | SDL 2.0.10
- debian:11 # stable | CMake 3.18.4 | G++ 10.2.1 | SDL 2.0.14
- ubuntu:22.04 # LTS | CMake 3.22.1 | G++ 11.2.0 | SDL 2.0.20
# 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) #
- debian:12 # 3.25.1 | 12.2.0 | 2.26.5 | stable (6/26) #

steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.8.0

- name: Install dependencies
run: |
export DEBIAN_FRONTEND="noninteractive"
apt-get update
apt-get install -yqq --no-install-recommends --no-install-suggests \
ca-certificates build-essential cmake ninja-build git \
libicu-dev libexpat1-dev libsdl2-dev libpng-dev libpixman-1-dev \
libfmt-dev libfreetype6-dev libharfbuzz-dev libmpg123-dev \
libsndfile-dev libvorbis-dev libopusfile-dev libspeexdsp-dev \
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 \
libdrm-dev libgbm-dev # only needed for sdl2 on debian 11
- name: Clone Repository
uses: actions/checkout@v2
uses: actions/checkout@v4
if: github.event.inputs.git-ref == ''
- name: Clone Repository (with custom ref)
uses: actions/checkout@v2
uses: actions/checkout@v4
if: github.event.inputs.git-ref != ''
with:
ref: ${{ github.event.inputs.git-ref }}

- name: Use gcc problem matcher
run: echo "::add-matcher::.github/gcc_comment_matcher.json"

- name: Compile
run: |
VER="(GA, `date +%Y-%m-%d`)"
@@ -63,8 +70,7 @@ jobs:
- name: Install
run: |
# cmake < 3.16 does not support '--install'
cmake --build build --target install
cmake --install build
- name: Test
run: |
Loading