Skip to content

Commit 683a1b1

Browse files
committed
Merge https://github.com/supertuxkart/stk-code into command-manager-prototype
2 parents 0099336 + 02e60fc commit 683a1b1

File tree

365 files changed

+55718
-2656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+55718
-2656
lines changed

.github/workflows/apple.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ jobs:
151151
HOMEBREW_NO_AUTO_UPDATE=1 brew install dylibbundler
152152
lipo -create ./macosx-x86_64/supertuxkart.app/Contents/MacOS/supertuxkart ./macosx-arm64/supertuxkart.app/Contents/MacOS/supertuxkart -output ./macosx-arm64/supertuxkart.app/Contents/MacOS/supertuxkart
153153
chmod 755 ./macosx-arm64/supertuxkart.app/Contents/MacOS/supertuxkart
154-
dylibbundler -od -b -x ./macosx-arm64/supertuxkart.app/Contents/MacOS/supertuxkart -d ./macosx-arm64/supertuxkart.app/Contents/libs/ -p @executable_path/../libs/ -s dependencies-macosx/lib -ns
154+
install_name_tool -change libcurl.4.dylib @rpath/libcurl.4.dylib ./macosx-arm64/supertuxkart.app/Contents/MacOS/supertuxkart
155+
dylibbundler -od -b -x ./macosx-arm64/supertuxkart.app/Contents/MacOS/supertuxkart -d ./macosx-arm64/supertuxkart.app/Contents/libs/ -p @executable_path/../libs/ -s ./dependencies-macosx/lib -ns
155156
# We use SDL_Vulkan_LoadLibrary for 10.9 compatibility, so otool -L supertuxkart has no libMoltenVK.dylib
156157
cp ./dependencies-macosx/lib/libMoltenVK.dylib ./macosx-arm64/supertuxkart.app/Contents/libs/
157158
cd ./macosx-arm64/supertuxkart.app/Contents/Resources/data

android/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript
1111
// 4.1.2 is the minimum version to support native debug symbols file
1212
// https://developer.android.com/studio/build/shrink-code#android_gradle_plugin_version_41_or_later
1313
// 7.0.0 to fix https://stackoverflow.com/questions/68387270/android-studio-error-installed-build-tools-revision-31-0-0-is-corrupted
14-
classpath 'com.android.tools.build:gradle:8.2.1'
14+
classpath 'com.android.tools.build:gradle:8.5.1'
1515
}
1616
}
1717

@@ -48,6 +48,7 @@ android
4848
versionCode project.getProperty('version_code').toInteger()
4949
versionName project.getProperty('version_name')
5050
minSdkVersion min_sdk_version.toInteger()
51+
compileSdkVersion compile_sdk_version.toInteger()
5152
targetSdkVersion target_sdk_version.toInteger()
5253
externalNativeBuild
5354
{
-16.9 KB
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Sun Dec 03 18:24:53 EET 2023
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

android/gradlew

+22-13
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
147+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148+
# shellcheck disable=SC2039,SC3045
146149
MAX_FD=$( ulimit -H -n ) ||
147150
warn "Could not query maximum file descriptor limit"
148151
esac
149152
case $MAX_FD in #(
150153
'' | soft) :;; #(
151154
*)
155+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156+
# shellcheck disable=SC2039,SC3045
152157
ulimit -n "$MAX_FD" ||
153158
warn "Could not set maximum file descriptor limit to $MAX_FD"
154159
esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
193198
done
194199
fi
195200

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
201210

202211
set -- \
203212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

android/make.sh

+2
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ convert -scale 432x432 "$APP_ICON_ADAPTIVE_FG" "$DIRNAME/res/drawable-xxxhdpi/ic
435435
export ANDROID_HOME="$SDK_PATH"
436436
./gradlew -Pcompile_sdk_version="$COMPILE_SDK_VERSION" \
437437
-Pmin_sdk_version="$STK_MIN_ANDROID_SDK" \
438+
-Pcompile_sdk_version="$STK_TARGET_ANDROID_SDK"\
438439
-Ptarget_sdk_version="$STK_TARGET_ANDROID_SDK" \
439440
-Pstorepass="$STK_STOREPASS" \
440441
-Pkeystore="$STK_KEYSTORE" \
@@ -450,6 +451,7 @@ export ANDROID_HOME="$SDK_PATH"
450451
if [ "$GRADLE_BUILD_TYPE" = "assembleRelease" ]; then
451452
./gradlew -Pcompile_sdk_version="$COMPILE_SDK_VERSION" \
452453
-Pmin_sdk_version="$STK_MIN_ANDROID_SDK" \
454+
-Pcompile_sdk_version="$STK_TARGET_ANDROID_SDK"\
453455
-Ptarget_sdk_version="$STK_TARGET_ANDROID_SDK" \
454456
-Pstorepass="$STK_STOREPASS" \
455457
-Pkeystore="$STK_KEYSTORE" \

data/gui/screens/arenas.stkgui

+10-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@
33
<icon-button id="back" x="1%" y="0" height="9%" icon="gui/icons/back.png"/>
44

55
<div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
6-
<header height="8%" width="80%" I18N="Section in arena tracks selection screen" text="Arenas"
7-
align="center" text_align="center" />
8-
<spacer width="20" height="1%" />
6+
<div width="100%" height="8%" layout="horizontal-row" >
7+
<spacer width="30%" height="100%" />
8+
<header height="8%" width="40%" I18N="Section in arena tracks selection screen" text="Arenas"
9+
align="center" text_align="center" />
10+
<spacer width="1%" height="100%" />
11+
<checkbox id="favorite" align="center"/>
12+
<spacer width="1%" height="100%" />
13+
<bright width="30%" height="100%" I18N="In the track and grand prix selection screen" text="Edit favorite tracks"/>
14+
<spacer width="20" height="1%" />
15+
</div>
916

1017
<box proportion="1" width="100%" layout="vertical-row" padding="2">
1118
<ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"

data/gui/screens/tracks_and_gp.stkgui

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
<div width="100%" height="fit" layout="horizontal-row" >
2525
<header width="30%" I18N="In the track and grand prix selection screen" text="All Tracks"
2626
align="center" text_align="center" />
27-
<textbox width="60%" id="search"/>
27+
<textbox width="40%" id="search"/>
28+
<spacer width="1%" height="100%" />
29+
<checkbox id="favorite"/>
30+
<spacer width="1%" height="100%" />
31+
<bright width="25%" height="100%" I18N="In the track and grand prix selection screen" text="Edit favorite tracks"/>
2832
</div>
2933

3034
<spacer width="100%" height="1%" />

data/supertuxkart.appdata.xml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<id>supertuxkart.desktop</id>
44
<metadata_license>CC0-1.0</metadata_license>
55
<project_license>GPL-3.0+</project_license>
6+
<launchable type="desktop-id">supertuxkart.desktop</launchable>
67
<name>SuperTuxKart</name>
78
<summary>A 3D open-source kart racing game</summary>
89
<summary xml:lang="zh_TW">3D 開源卡丁車賽車遊戲</summary>

lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param)
9292
// Switch SDL disables this hint by default: https://github.com/devkitPro/SDL/pull/55#issuecomment-633775255
9393
SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "1");
9494

95+
#ifdef ANDROID
96+
SDL_SetHint(SDL_HINT_ORIENTATIONS, "LandscapeLeft LandscapeRight");
97+
#endif
98+
9599
#ifndef MOBILE_STK
96100
// Prevent fullscreen minimizes when losing focus
97101
if (CreationParams.Fullscreen)

0 commit comments

Comments
 (0)