Relintai/broken_seals_2d
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals_2d.git synced 2025-03-22 18:47:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated the engine and the tool scripts.

Browse Source
This commit is contained in:
Relintai 2022-04-08 22:10:02 +02:00
parent 22e66a9236
commit d270fe9dd2
11 changed files with 102 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9b512dd510207d32911064a1bbe15b80c91b006b"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "60a7e84a5dc2fc252b0c582dd8f877685d28d74a"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "props_2d": {"master": "a45822b63519d7f9fb391ab6b1dced468c6f399d"}, "pandemonium_engine": {"master": "4b2f580fda56de21dba70863518d0f59958dcf4a"}}
{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9b512dd510207d32911064a1bbe15b80c91b006b"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "60a7e84a5dc2fc252b0c582dd8f877685d28d74a"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "props_2d": {"master": "a45822b63519d7f9fb391ab6b1dced468c6f399d"}, "pandemonium_engine": {"master": "d4c57cf537fc8f92d0f9ab7df1ed9dcf7a432de0"}}

19
build_ios.sh
View File

@ -1,19 +0,0 @@
export SCONS_CACHE=~/.scons_cache
export SCONS_CACHE_LIMIT=5000
cd ./pandemonium_engine
scons -j6 p=iphone tools=no target=release_debug arch=arm module_arkit_enabled=no game_center=no
scons -j6 p=iphone tools=no target=release_debug arch=arm64 module_arkit_enabled=no game_center=no
lipo -create bin/libpandemonium.iphone.opt.debug.arm.a bin/libpandemonium.iphone.opt.debug.arm64.a -output bin/libpandemonium.iphone.debug.fat.a
rm bin/ios_xcode/libpandemonium.iphone.debug.fat.a
cp bin/libpandemonium.iphone.debug.fat.a bin/ios_xcode/libpandemonium.iphone.debug.fat.a
rm bin/iphone.zip
cd bin/ios_xcode
zip -r -X ../iphone.zip .
cd ..
cd ..
cd ..

21
build_ios_release.sh
View File

@ -1,21 +0,0 @@
export SCONS_CACHE=~/.scons_cache
export SCONS_CACHE_LIMIT=5000
cd ./pandemonium_engine
scons -j6 p=iphone tools=no target=release arch=arm module_arkit_enabled=no game_center=no
scons -j6 p=iphone tools=no target=release arch=arm64 module_arkit_enabled=no game_center=no
lipo -create bin/libpandemonium.iphone.opt.arm.a bin/libpandemonium.iphone.opt.arm64.a -output bin/libpandemonium.iphone.release.fat.a
rm bin/ios_xcode/libpandemonium.iphone.release.fat.a
cp bin/libpandemonium.iphone.release.fat.a bin/ios_xcode/libpandemonium.iphone.release.fat.a
rm bin/iphone.zip
cd bin/ios_xcode
zip -r -X ../iphone.zip .
cd ..
cd ..
cd ..

15
build_osx.sh
View File

@ -1,15 +0,0 @@
export SCONS_CACHE=~/.scons_cache
export SCONS_CACHE_LIMIT=5000
cd ./pandemonium_engine
scons -j6 platform=osx target=release_debug
rm -Rf bin/Godot.app
cp -r misc/dist/osx_tools.app ./bin/Godot.app
mkdir -p ./bin/Godot.app/Contents/MacOS
cp bin/pandemonium.osx.opt.tools.64 bin/Godot.app/Contents/MacOS/Godot
chmod +x bin/Godot.app/Contents/MacOS/Godot
cd ..

14
build_uwp.bat
View File

@ -1,14 +0,0 @@
cd ./pandemonium_engine
if not defined DevEnvDir (
rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
)
call scons -j6 platform=uwp target=release
rem call scons -j6 platform=uwp target=release_debug
rem call scons -j6 platform=uwp target=release
cd ..

8
editor.bat
View File

@ -1,6 +1,6 @@
copy "engine\bin\godot.windows.opt.tools.64.exe" "engine\bin\run_godot.windows.opt.tools.64.exe" /y
copy "engine\bin\godot.windows.opt.tools.64.pdb" "engine\bin\run_godot.windows.opt.tools.64.pdb" /y
copy "engine\bin\godot.windows.opt.tools.64.exp" "engine\bin\run_godot.windows.opt.tools.64.exp" /y
copy "pandemonium_engine\bin\pandemonium.windows.opt.tools.64.exe" "pandemonium_engine\bin\run_pandemonium.windows.opt.tools.64.exe" /y
copy "pandemonium_engine\bin\pandemonium.windows.opt.tools.64.pdb" "pandemonium_engine\bin\run_pandemonium.windows.opt.tools.64.pdb" /y
copy "pandemonium_engine\bin\pandemonium.windows.opt.tools.64.exp" "pandemonium_engine\bin\run_pandemonium.windows.opt.tools.64.exp" /y
cmd /c engine\bin\run_godot.windows.opt.tools.64.exe
cmd /c pandemonium_engine\bin\run_pandemonium.windows.opt.tools.64.exe

94
game/project.pandemonium
View File

@ -290,62 +290,62 @@ _global_script_classes=[ {
"path": "res://addons/world_generator/resources/zone.gd"
} ]
_global_script_class_icons={
@"GEBrighten": "",
@"BrushPrefabs": "",
@"WorldGeneratorSettings": "",
@"PlayerGD": "",
@"MMNode": "",
@"GameModule": "",
@"GECut": "",
@"GECanvas": "",
@"GEBrush": "",
@"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png",
@"CharacterSkeketonAttachPoint": "",
@"GEBrighten": "",
@"CharacterAtlas2D": "",
@"WorldGenRaycast": "",
@"SpeedResource": "",
@"PlayerMaster": "",
@"PaletteImporter": "",
@"MobGD": "",
@"ItemVisual2D": "",
@"GELayer": "",
@"CharacterSkeketonAttachPoint": "",
@"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png",
@"GEBrush": "",
@"GECanvas": "",
@"GECut": "",
@"GameModule": "",
@"MMNode": "",
@"PlayerGD": "",
@"WorldGeneratorSettings": "",
@"GEDarken": "",
@"WorldGenWorld": "",
@"GERect": "",
@"GEBucket": "",
@"GEAction": "",
@"EntityDataGD": "",
@"EntityAIGD": "",
@"Continent": "",
@"GELayer": "",
@"ItemVisual2D": "",
@"MobGD": "",
@"PaletteImporter": "",
@"PlayerMaster": "",
@"SpeedResource": "",
@"WorldGenRaycast": "",
@"CharacterAtlasEntry2D": "",
@"SpellGD": "",
@"SpellEffectVisualBasic": "",
@"NetworkedPlayerGD": "",
@"ItemVisualEntry2D": "",
@"Continent": "",
@"EntityAIGD": "",
@"EntityDataGD": "",
@"GEAction": "",
@"GEBucket": "",
@"GERect": "",
@"WorldGenWorld": "",
@"CharacterSkeleton2DGD": "",
@"Zone": "",
@"UIWindowModule": "",
@"ItemVisualEntry2D": "",
@"NetworkedPlayerGD": "",
@"SpellEffectVisualBasic": "",
@"SpellGD": "",
@"GELine": "",
@"WorldGenBaseResource": "",
@"UIGuiChildModule": "",
@"Menu": "",
@"ManaResource": "",
@"Main": "",
@"GEUtils": "",
@"GEPasteCut": "",
@"UIWindowModule": "",
@"Zone": "",
@"ColorTile": "",
@"SubZone": "",
@"MMNodeUniversalProperty": "",
@"ItemTemplateGD": "",
@"HealthResource": "",
@"GERainbow": "",
@"GEPasteCut": "",
@"GEUtils": "",
@"Main": "",
@"ManaResource": "",
@"Menu": "",
@"UIGuiChildModule": "",
@"WorldGenBaseResource": "",
@"DisplayPlayerGD": "",
@"Palette": "",
@"MMMateial": "",
@"LayeredTextureMaker": "",
@"HumanoidCharacterBones2D": "",
@"GERainbow": "",
@"HealthResource": "",
@"ItemTemplateGD": "",
@"MMNodeUniversalProperty": "",
@"SubZone": "",
@"GEMultiLine": "",
@"GEPencil": "",
@"GEMultiLine": ""
@"HumanoidCharacterBones2D": "",
@"LayeredTextureMaker": "",
@"MMMateial": "",
@"Palette": ""
}
Node="input/actionbar_5_11"

6
lged.sh Executable file
View File

@ -0,0 +1,6 @@
#!/bin/bash
cp -u ./pandemonium_engine/bin/pandemonium.x11.opt.tools.64.llvm ./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64.llvm
export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/
./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64.llvm -e --path ./game/

2
tools/copy_repos.py
View File

@ -58,7 +58,7 @@ def copytree(src, dst, warn = 0):
dp = os.path.join(dst, item)
if os.path.isdir(sp):
if item == ".git" or item == "bin" or item == "__pycache__" or item == ".import" or item == "logs" or item == "release" or item == "export" or item == "build" or item == "libs":
if item == ".git" or item == ".gradle" or item == "bin" or item == "__pycache__" or item == ".import" or item == "logs" or item == "release" or item == "export" or item == "build" or item == "libs":
continue
#print(item)

68
tools/export_presets.cfg.example
View File

@ -13,14 +13,14 @@ script_encryption_key=""
[preset.0.options]
custom_template/debug="../engine/bin/android_debug.apk"
custom_template/release="../engine/bin/android_release.apk"
custom_template/debug="../pandemonium_engine/bin/android_debug.apk"
custom_template/release="../pandemonium_engine/bin/android_release.apk"
custom_template/use_custom_build=false
custom_template/export_format=0
architectures/armeabi-v7a=true
architectures/arm64-v8a=true
architectures/x86=false
architectures/x86_64=false
architectures/x86=true
architectures/x86_64=true
keystore/debug=""
keystore/debug_user=""
keystore/debug_password=""
@ -28,8 +28,8 @@ keystore/release=""
keystore/release_user=""
keystore/release_password=""
one_click_deploy/clear_previous_install=false
version/code=2
version/name="0.3.2"
version/code=7
version/name="0.3.10"
package/unique_name="net.relintai.$genname"
package/name="Broken Seals"
package/signed=true
@ -38,10 +38,6 @@ launcher_icons/adaptive_foreground_432x432="res://icon.png"
launcher_icons/adaptive_background_432x432="res://icon.png"
graphics/32_bits_framebuffer=true
graphics/opengl_debug=false
xr_features/xr_mode=0
xr_features/degrees_of_freedom=0
xr_features/hand_tracking=0
xr_features/focus_awareness=false
screen/immersive_mode=true
screen/support_small=true
screen/support_normal=true
@ -213,8 +209,8 @@ script_encryption_key=""
[preset.1.options]
custom_template/debug="../engine/bin/godot.x11.opt.debug.64"
custom_template/release="../engine/bin/godot.x11.opt.64"
custom_template/debug="../pandemonium_engine/bin/pandemonium.x11.opt.debug.64"
custom_template/release="../pandemonium_engine/bin/pandemonium.x11.opt.64"
binary_format/64_bits=true
binary_format/embed_pck=false
texture_format/bptc=false
@ -238,8 +234,8 @@ script_encryption_key=""
[preset.2.options]
custom_template/debug="../engine/bin/godot.javascript.opt.zip"
custom_template/release="../engine/bin/godot.javascript.opt.debug.zip"
custom_template/debug="../pandemonium_engine/bin/pandemonium.javascript.opt.zip"
custom_template/release="../pandemonium_engine/bin/pandemonium.javascript.opt.debug.zip"
variant/export_type=0
vram_texture_compression/for_desktop=true
vram_texture_compression/for_mobile=true
@ -263,8 +259,8 @@ script_encryption_key=""
[preset.3.options]
custom_template/debug="../engine/bin/godot.windows.opt.debug.64.exe"
custom_template/release="../engine/bin/godot.windows.opt.64.exe"
custom_template/debug="../pandemonium_engine/bin/pandemonium.windows.opt.debug.64.exe"
custom_template/release="../pandemonium_engine/bin/pandemonium.windows.opt.64.exe"
binary_format/64_bits=true
binary_format/embed_pck=false
texture_format/bptc=false
@ -281,12 +277,12 @@ codesign/digest_algorithm=1
codesign/description=""
codesign/custom_options=PoolStringArray( )
application/icon=""
application/file_version=""
application/product_version=""
application/file_version="0.3.10"
application/product_version="0.3.10"
application/company_name=""
application/product_name=""
application/product_name="Broken Seals"
application/file_description=""
application/copyright=""
application/copyright="Péter Magyar"
application/trademarks=""
[preset.4]
@ -304,14 +300,14 @@ script_encryption_key=""
[preset.4.options]
custom_template/debug="../engine/bin/android_release.apk"
custom_template/release="../engine/bin/android_release.apk"
custom_template/debug="../pandemonium_engine/bin/android_release.apk"
custom_template/release="../pandemonium_engine/bin/android_release.apk"
custom_template/use_custom_build=false
custom_template/export_format=0
architectures/armeabi-v7a=true
architectures/arm64-v8a=true
architectures/x86=false
architectures/x86_64=false
architectures/x86=true
architectures/x86_64=true
keystore/debug=""
keystore/debug_user=""
keystore/debug_password=""
@ -319,8 +315,8 @@ keystore/release=""
keystore/release_user=""
keystore/release_password=""
one_click_deploy/clear_previous_install=false
version/code=2
version/name="0.3.2"
version/code=7
version/name="0.3.10"
package/unique_name="net.relintai.$genname"
package/name="Broken Seals"
package/signed=true
@ -329,10 +325,6 @@ launcher_icons/adaptive_foreground_432x432="res://icon.png"
launcher_icons/adaptive_background_432x432="res://icon.png"
graphics/32_bits_framebuffer=true
graphics/opengl_debug=false
xr_features/xr_mode=0
xr_features/degrees_of_freedom=0
xr_features/hand_tracking=0
xr_features/focus_awareness=false
screen/immersive_mode=true
screen/support_small=true
screen/support_normal=true
@ -504,8 +496,8 @@ script_encryption_key=""
[preset.5.options]
custom_template/debug="../engine/bin/godot.x11.pi4.opt.debug.32"
custom_template/release="../engine/bin/godot.x11.pi4.opt.32"
custom_template/debug="../pandemonium_engine/bin/pandemonium.x11.pi4.opt.debug.32"
custom_template/release="../pandemonium_engine/bin/pandemonium.x11.pi4.opt.32"
binary_format/64_bits=false
binary_format/embed_pck=false
texture_format/bptc=false
@ -530,17 +522,17 @@ script_encryption_key=""
[preset.6.options]
custom_template/debug="../engine/bin/osx.zip"
custom_template/release="../engine/bin/osx.zip"
custom_template/debug="../pandemonium_engine/bin/osx.zip"
custom_template/release="../pandemonium_engine/bin/osx.zip"
application/name="Broken Seals"
application/info="Made with Godot Engine"
application/info="Made with Pandemonium Engine"
application/icon=""
application/identifier="net.relintai.brokenseals"
application/signature=""
application/app_category="Role-playing-games"
application/short_version="1.0"
application/version="1.0"
application/copyright=""
application/short_version="0.3.10"
application/version="0.3.10"
application/copyright="Péter Magyar"
display/high_res=false
privacy/microphone_usage_description=""
privacy/camera_usage_description=""

26
tools/release/pre_release_check_files_present.sh
View File

@ -1,34 +1,34 @@
cd ../../engine/bin/
cd ../../pandemonium_engine/bin/
files=(
# Windows
"godot.windows.opt.64.exe"
"godot.windows.opt.debug.64.exe"
"godot.windows.opt.tools.64.exe"
"pandemonium.windows.opt.64.exe"
"pandemonium.windows.opt.debug.64.exe"
"pandemonium.windows.opt.tools.64.exe"
# Linux
"godot.x11.opt.64"
"godot.x11.opt.debug.64"
"godot.x11.opt.tools.64"
"pandemonium.x11.opt.64"
"pandemonium.x11.opt.debug.64"
"pandemonium.x11.opt.tools.64"
# JS
"godot.javascript.opt.tools.threads.zip"
"godot.javascript.opt.zip"
"pandemonium.javascript.opt.tools.threads.zip"
"pandemonium.javascript.opt.zip"
# Android
"android_debug.apk"
"android_release.apk"
# OSX - Editor
"Godot.app.zip"
"Pandemonium.app.zip"
# OSX - export templates
"osx.zip"
# Pi4
"godot.x11.pi4.opt.32"
"godot.x11.pi4.opt.debug.32"
"godot.x11.pi4.opt.tools.32"
"pandemonium.x11.pi4.opt.32"
"pandemonium.x11.pi4.opt.debug.32"
"pandemonium.x11.pi4.opt.tools.32"
)
error=0