Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-14 22:42:34 +02:00
Code Issues Projects Releases Activity

Fix godot wallpaperData

Browse Source 
Update godot to 4.3rc1
This commit is contained in:
Elias Steurer 2024-07-31 16:18:49 +02:00
parent ca7908d844
commit 0474b8422b
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/tasks.json vendored
View File

@ -33,7 +33,7 @@
},
{
"type": "process",
"label": "⚙️ Build Godot Wallpaper",
"label": "⚙️ Build Godot Wallpaper plugin",
"command": "python3",
"windows": {
"command": "python"

6
CMakeLists.txt
View File

@ -60,9 +60,9 @@ set(VCPKG_BIN_PATH "${VCPKG_INSTALLED_PATH}/bin")
# Godot Editor
set(GODOT_VERSION_MAJOR "4")
set(GODOT_VERSION_MINOR "2")
set(GODOT_VERSION_PATCH "1")
set(GODOT_RELEASE_TYPE "stable")
set(GODOT_VERSION_MINOR "3")
set(GODOT_VERSION_PATCH "")
set(GODOT_RELEASE_TYPE "rc1")
# Use an if statement to check if GODOT_VERSION_PATCH is empty or not
if(GODOT_VERSION_PATCH STREQUAL "")

5
ScreenPlay/qml/Installed/InstalledDrawer.qml
View File

@ -274,9 +274,10 @@ Drawer {
dialog.message = result.message;
dialog.open();
} else {
const screenFile = item.m_file;
const file = item.m_file;
let volume = 1;
let success = App.screenPlayManager.createWallpaper(root.type, cbVideoFillMode.currentValue, absoluteStoragePath, previewImage, screenFile, activeMonitors, volume, 1, {}, true);
const selectedTimeline = timeline.getSelectedTimeline();
let success = App.screenPlayManager.setWallpaperAtTimelineIndex(root.type, absoluteStoragePath, previewImage, file, activeMonitors, selectedTimeline.index, selectedTimeline.identifier, true);
}
});
root.close();

2
ScreenPlayWallpaper/Godot/GDExtention/extern/godot-cpp vendored

@ -1 +1 @@
Subproject commit 32409472b785fd6f9062300664fa55b46bfd07e7
Subproject commit f2b521f55a0a2ba7080418ba898b97028da6134a

2
ScreenPlayWallpaper/Godot/ScreenPlayGodot/project.godot
View File

@ -12,7 +12,7 @@ config_version=5
config/name="ScreenPlay"
run/main_scene="res://main.tscn"
config/features=PackedStringArray("4.2", "Mobile")
config/features=PackedStringArray("4.3", "Mobile")
run/flush_stdout_on_print=true
boot_splash/bg_color=Color(0.141176, 0.141176, 0.141176, 0)
boot_splash/show_image=false

5
Tools/defines.py
View File

@ -37,8 +37,9 @@ VCPKG_BASE_PACKAGES = [
PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
FFMPEG_VERSION_MAC = "6.1.1"
FFMPEG_VERSION_WIN = "7.0"
GODOT_VERSION = "4.2.1"
GODOT_RELEASE_TYPE = "stable"
# None stable version omit patch: 4.3-rc1
GODOT_VERSION = "4.3"
GODOT_RELEASE_TYPE = "rc1"
GODOT_DOWNLOAD_SERVER = "https://github.com/godotengine/godot-builds/releases/download"
if sys.platform == "win32":
SCREENPLAYWALLPAPER_GODOT_EXECUTABLE = "ScreenPlayWallpaperGodot.exe"