Skip to content

Commit 1623df2

Browse files
carstene1nscarstene1ns
committed
Prepare 20260218 release
1 parent 3fe1d65 commit 1623df2

17 files changed

Lines changed: 25 additions & 27 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ jobs:
243243
./gradlew assembleDebug -Pandroid.native.buildOutput=verbose
244244
- name: Prepare artifact
245245
env:
246-
SHORT_SHA: ${{ needs.prepare.outputs.short_sha }}
246+
OJ_VERSION: ${{ needs.prepare.outputs.oj_version }}
247247
run: |
248-
mv build-android/OpenJazz/app/outputs/apk/debug/app-debug.apk OJ-${SHORT_SHA}-debug.apk
248+
mv build-android/OpenJazz/app/outputs/apk/debug/app-debug.apk OJ-${OJ_VERSION}-debug.apk
249249
- name: Upload artifact
250250
uses: actions/upload-artifact@v6
251251
with:

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
cmake_minimum_required(VERSION 3.18...4.0)
1+
cmake_minimum_required(VERSION 3.18...4.2)
22

33
project(OpenJazz
4-
VERSION 20240919
4+
VERSION 20260218
55
LANGUAGES CXX
66
HOMEPAGE_URL http://alister.eu/jazz/oj/)
77

‎licenses.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
The OpenJazz source code is available from http://alister.eu/jazz/oj/
66
and the code repository lives at https://github.com/AlisterT/openjazz
77

8-
Copyright (c) 2005-2019 AJ Thomson
8+
Copyright (c) 2005-2025 AJ Thomson
99
Copyright (c) 2015-2026 Carsten Teibes
1010
Menu plasma effect Copyright (c) 2010 Alireza Nejati
1111

@@ -36,7 +36,7 @@ https://www.libsdl.org/
3636
Version 1.2 of this library is distributed under the terms of the GNU LGPL
3737
license: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
3838

39-
Version 2 uses the zlib license: https://www.libsdl.org/license.php
39+
Version 2 and 3 use the zlib license: https://www.libsdl.org/license.php
4040

4141

4242
================================================================================

‎res/wii/READMII.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ OpenJazz for Wii
33
Licensed under GPLv2. See included licenses.txt for details.
44

55
OpenJazz written by AJ Thomson http://alister.eu/jazz/oj/
6-
Originally ported to the Wii by tehpola.
7-
Thanks to the developers of SDL-Wii for making this a breeze to port.
6+
Originally ported to the Wii by tehpola, maintained by carstene1ns.
87

98
Installation:
109
Copy the contents of the archive into the /apps directory of your SD card.

‎res/wii/meta.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<app version="1">
33
<name>OpenJazz</name>
4-
<version>20240919000000</version>
4+
<version>20260218000000</version>
55
<coder>AlisterT, tehpola, carstene1ns</coder>
66
<short_description>Open source Jazz Jackrabbit engine</short_description>
77
<long_description>
@@ -15,8 +15,6 @@
1515
Home: Esc
1616
+: Pause
1717

18-
Special thanks to the developers of SDL-Wii for making this a breeze to port.
19-
2018
TODO:
2119
* Network games don't work yet.
2220

‎res/windows/OpenJazz.rc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FILETYPE 0x00000001L {
66
BLOCK "040904b0" {
77
VALUE "CompanyName", ""
88
VALUE "ProductName", "OpenJazz"
9-
VALUE "ProductVersion", "2024.09.19.0"
9+
VALUE "ProductVersion", "2026.02.18.0"
1010
VALUE "FileDescription", "Jazz Jackrabbit™ engine reimplementation"
1111
VALUE "LegalCopyright", "AJ Thomson et al."
1212
VALUE "OriginalFilename", "OpenJazz.exe"

‎src/io/controls.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*
1212
* @par Licence:
1313
* Copyright (c) 2005-2012 AJ Thomson
14+
* Copyright (c) 2015-2026 Carsten Teibes
1415
*
1516
* OpenJazz is distributed under the terms of
1617
* the GNU General Public License, version 2.0

‎src/io/file.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*
1414
* @par Licence:
1515
* Copyright (c) 2005-2017 AJ Thomson
16+
* Copyright (c) 2015-2026 Carsten Teibes
1617
*
1718
* OpenJazz is distributed under the terms of
1819
* the GNU General Public License, version 2.0

‎src/io/file.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*
1212
* @par Licence:
1313
* Copyright (c) 2005-2010 AJ Thomson
14+
* Copyright (c) 2015-2026 Carsten Teibes
1415
*
1516
* OpenJazz is distributed under the terms of
1617
* the GNU General Public License, version 2.0

‎src/io/gfx/font.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ Font::Font (unsigned char* pixels, bool big) {
234234
}
235235

236236
characterAtlas = video.createSurface(nullptr, aW, aH);
237+
if (big) video.enableColorKey(characterAtlas, 31);
237238

238239
stbrp_context ctx;
239240
stbrp_node nodes[aW];
@@ -256,8 +257,6 @@ Font::Font (unsigned char* pixels, bool big) {
256257
for (int i = 0; i < nCharacters; i++)
257258
video.destroySurface(chars[i]);
258259

259-
if (big) video.enableColorKey(characterAtlas, 31);
260-
261260
// Create ASCII->font map
262261
if (big) {
263262
// Goes " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-:."

0 commit comments

Comments
 (0)