Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CLANG_TIDY_BUILD_DIR=build-clang-tidy
CLANG_TIDY_COMPILE_COMMANDS_FILE=$(CLANG_TIDY_BUILD_DIR)/compile_commands.json
CLANG_TIDY_BINDINGS_FILE=$(CLANG_TIDY_BUILD_DIR)/godot-cpp/gen/include/godot_cpp/classes/node.hpp
LIBMASZYNA_DEBUG:=""
CMAKE_GODOTCPP_API_VERSION=4.6
CMAKE_GODOTCPP_API_VERSION=4.7

#Helper for CLion so it would see generated bindings
generate-bindings:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ least two cores.
| 30.09.2025 | 4.5 | ✅ | ✅ | ❌ | ✅ (Target API Level: 34) | ❌ | C++ 17 | 24.06 |
| 30.11.2025 | 4.5.x | ✅ | ✅ | ❌ | ✅ (Target API Level: 34) | ❌ | C++ 17 | 24.06, 25.11 |
| 27.01.2026 | 4.6 | ✅ | ✅ | ❌ | ✅ (Target API Level: 34) | ❌ | C++ 17 | 24.06, 25.11, 26.01 |
| 06.07.2026 | 4.7.x | ✅ | ✅ | ❌ | ✅ (Target API Level: 34) | ❌ | C++ 17 | 24.06, 25.11, 26.01 |
### Documentation

Project documentation: https://maszyna-reloaded.github.io/MaSzyna-API-wrapper/
Expand Down
2 changes: 1 addition & 1 deletion demo/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ config/name="MaSzyna Reloaded"
config/description="A port of MaSzyna Train Simulator"
run/main_scene="uid://1djubq5jy2wx"
run/print_header=false
config/features=PackedStringArray("4.6", "Forward Plus")
config/features=PackedStringArray("4.7", "Forward Plus")
boot_splash/bg_color=Color(0, 0, 0, 1)
boot_splash/show_image=false
boot_splash/image="res://splash.png"
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ services:
unit_tests:
environment:
- ${TARGET:-template_debug}
image: jezsonic/build-tools:4.6.stable
image: jezsonic/build-tools:4.7.stable
container_name: unit_tests
entrypoint: /var/maszyna/ci/docker/entrypoint.sh -t template_debug -u true
volumes:
Expand All @@ -12,7 +12,7 @@ services:
windows_x86_64:
environment:
- ${TARGET:-template_debug}
image: jezsonic/build-tools:4.6.stable
image: jezsonic/build-tools:4.7.stable
container_name: windows_x86_64
entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p windows -a x86_64 -t $TARGET
volumes:
Expand All @@ -22,7 +22,7 @@ services:
windows_x86_32:
environment:
- ${TARGET:-template_debug}
image: jezsonic/build-tools:4.6.stable
image: jezsonic/build-tools:4.7.stable
container_name: windows_x86_32
entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p windows -a x86_32 -t $TARGET
volumes:
Expand All @@ -32,7 +32,7 @@ services:
linux_x86_64:
environment:
- ${TARGET:-template_debug}
image: jezsonic/build-tools:4.6.stable
image: jezsonic/build-tools:4.7.stable
container_name: linux_x86_64
entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p linux -a x86_64 -t $TARGET
volumes:
Expand All @@ -42,7 +42,7 @@ services:
linux_x86_32:
environment:
- ${TARGET:-template_debug}
image: jezsonic/build-tools:4.6.stable
image: jezsonic/build-tools:4.7.stable
container_name: linux_x86_32
entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p linux -a x86_32 -t $TARGET
volumes:
Expand All @@ -52,7 +52,7 @@ services:
android_x86_64:
environment:
- ${TARGET:-template_debug}
image: jezsonic/build-tools:4.6.stable.android
image: jezsonic/build-tools:4.7.stable.android
container_name: android_x86_64
entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p android -a x86_64 -t $TARGET
volumes:
Expand All @@ -62,7 +62,7 @@ services:
android_x86_32:
environment:
- ${TARGET:-template_debug}
image: jezsonic/build-tools:4.6.stable.android
image: jezsonic/build-tools:4.7.stable.android
container_name: android_x86_32
entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p android -a x86_32 -t $TARGET
volumes:
Expand All @@ -72,7 +72,7 @@ services:
android_arm64:
environment:
- ${TARGET:-template_debug}
image: jezsonic/build-tools:4.6.stable.android
image: jezsonic/build-tools:4.7.stable.android
container_name: android_arm64
entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p android -a arm64 -t $TARGET
volumes:
Expand All @@ -82,7 +82,7 @@ services:
android_arm32:
environment:
- ${TARGET:-template_debug}
image: jezsonic/build-tools:4.6.stable.android
image: jezsonic/build-tools:4.7.stable.android
container_name: android_arm32
entrypoint: /var/maszyna/ci/docker/entrypoint.sh -p android -a arm32 -t $TARGET
volumes:
Expand Down
2 changes: 1 addition & 1 deletion vendor/gut
Submodule gut updated 117 files