From 4b3c3efb304cb9451dbd180dd45d6e4e7a6136dd Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 15 Mar 2022 14:34:19 +0100 Subject: [PATCH] Siwtched the engine to the Pandemonium Engine (my new fork of godot). --- .gitignore | 1 + HEADS | 2 +- README.md | 2 +- SConstruct | 20 ++++---- build_ios.sh | 2 +- build_ios_release.sh | 2 +- build_osx.sh | 2 +- build_pi.sh | 12 ++--- build_uwp.bat | 2 +- editor.bat | 8 ++-- editor.sh | 6 +-- export_all.sh | 46 +++++++++---------- ged.sh | 6 +-- module_config.py | 30 ++++++------ play.sh | 6 +-- podman_build_all.sh | 46 +++++++++---------- tools/export_presets.cfg.example | 28 +++++------ tools/osx/create_editor_app.sh | 2 +- tools/osx/create_export_templates.sh | 2 +- tools/osx/lipo.sh | 6 +-- .../pre_release_check_files_present.sh | 2 +- 21 files changed, 117 insertions(+), 116 deletions(-) diff --git a/.gitignore b/.gitignore index 0b2a9128..e9ffb839 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ engine +pandemonium_engine modules/* logs/* diff --git a/HEADS b/HEADS index 48f490cb..545bc732 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "85f907a253affb91fda062e5e44ba708f27a254d"}} \ No newline at end of file diff --git a/README.md b/README.md index 0ed62b2a..6b9cc86a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The main gameplay-loop goal is to create an experience with enough complexity an I want the game to run on every platform, but the game design is PC first. From the testing I've done this is not going to be an issue. -This project uses a custom version of ![godot (3.x branch)](https://github.com/godotengine/godot/tree/3.x) as it's engine. +This project now uses the ![Pandemonium Engine](https://github.com/Relintai/pandemonium_engine), which is my custom version of godot. You can get binaries under the releases tab [here](https://github.com/Relintai/broken_seals/releases).\ You can also try a live version running in the browser [here](https://relintai.github.io/broken_seals/). diff --git a/SConstruct b/SConstruct index 720dac47..64185d04 100644 --- a/SConstruct +++ b/SConstruct @@ -236,13 +236,13 @@ def remove_repository(data, target_folder): shutil.rmtree(folder) def update_engine(): - validate_repository_origin(module_config.engine_repository, './engine/', module_config.godot_branch) + validate_repository_origin(module_config.engine_repository, './pandemonium_engine/', module_config.godot_branch) update_repository(module_config.engine_repository, '/', module_config.godot_branch) def update_modules(): for rep in module_config.module_repositories: update_repository(rep, module_clone_path) - copy_repository(rep, './engine/modules/', '.' + module_clone_path) + copy_repository(rep, './pandemonium_engine/modules/', '.' + module_clone_path) def update_addons(): for rep in module_config.addon_repositories: @@ -264,16 +264,16 @@ def update_all(): def setup_engine(): - validate_repository_origin(module_config.engine_repository, './engine/', module_config.godot_branch) + validate_repository_origin(module_config.engine_repository, './pandemonium_engine/', module_config.godot_branch) setup_repository(module_config.engine_repository, '/', module_config.godot_branch) def setup_modules(): for rep in module_config.module_repositories: setup_repository(rep, module_clone_path) - copy_repository(rep, './engine/modules/', '.' + module_clone_path) + copy_repository(rep, './pandemonium_engine/modules/', '.' + module_clone_path) for rep in module_config.removed_modules: - remove_repository(rep, './engine/modules/') + remove_repository(rep, './pandemonium_engine/modules/') def setup_addons(): @@ -461,10 +461,10 @@ if len(sys.argv) > 1: target += 'bin/libprocedural_animations.x11.opt.tools.64.so' cwd = os.getcwd() - full_path = cwd + '/engine/' + full_path = cwd + '/pandemonium_engine/' if not os.path.isdir(full_path): - print('engine directory doesnt exists.') + print('engine (pandemonium_engine) directory doesnt exists.') exit() os.chdir(full_path) @@ -548,10 +548,10 @@ if len(sys.argv) > 1: # exit() # # cwd = os.getcwd() -# full_path = cwd + '/engine/' +# full_path = cwd + '/pandemonium_engine/' # # if not os.path.isdir(full_path): -# print('engine directory does not exists.') +# print('engine (pandemonium_engine) directory does not exists.') # exit() # # os.chdir(full_path) @@ -564,7 +564,7 @@ if len(sys.argv) > 1: # #unstage all files # subprocess.call('git reset', shell=True) # -# vman_full_path = cwd + '/engine/modules/voxelman/' +# vman_full_path = cwd + '/pandemonium_engine/modules/voxelman/' # # #also patch voxelman as the plugin changes forward_spatial_gui_input's definition # if os.path.isdir(vman_full_path): diff --git a/build_ios.sh b/build_ios.sh index 6d287a44..2404abb2 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -2,7 +2,7 @@ export SCONS_CACHE=~/.scons_cache export SCONS_CACHE_LIMIT=5000 -cd ./engine +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 diff --git a/build_ios_release.sh b/build_ios_release.sh index f5d83035..c59edd4a 100755 --- a/build_ios_release.sh +++ b/build_ios_release.sh @@ -2,7 +2,7 @@ export SCONS_CACHE=~/.scons_cache export SCONS_CACHE_LIMIT=5000 -cd ./engine +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 diff --git a/build_osx.sh b/build_osx.sh index fab5d0d5..e834b60c 100755 --- a/build_osx.sh +++ b/build_osx.sh @@ -2,7 +2,7 @@ export SCONS_CACHE=~/.scons_cache export SCONS_CACHE_LIMIT=5000 -cd ./engine +cd ./pandemonium_engine scons -j6 platform=osx target=release_debug diff --git a/build_pi.sh b/build_pi.sh index f7c52c2d..a69b5e6e 100755 --- a/build_pi.sh +++ b/build_pi.sh @@ -3,10 +3,10 @@ scons bel_latomic_strip_slim -j4 scons bl_latomic_strip_slim -j4 scons blr_latomic_strip_slim -j4 -rm -f ./engine/bin/godot.x11.pi4.opt.32 -rm -f ./engine/bin/godot.x11.pi4.opt.debug.32 -rm -f ./engine/bin/godot.x11.pi4.opt.tools.32 +rm -f ./pandemonium_engine/bin/godot.x11.pi4.opt.32 +rm -f ./pandemonium_engine/bin/godot.x11.pi4.opt.debug.32 +rm -f ./pandemonium_engine/bin/godot.x11.pi4.opt.tools.32 -mv ./engine/bin/godot.x11.opt.32 ./engine/bin/godot.x11.pi4.opt.32 -mv ./engine/bin/godot.x11.opt.debug.32 ./engine/bin/godot.x11.pi4.opt.debug.32 -mv ./engine/bin/godot.x11.opt.tools.32 ./engine/bin/godot.x11.pi4.opt.tools.32 +mv ./pandemonium_engine/bin/godot.x11.opt.32 ./pandemonium_engine/bin/godot.x11.pi4.opt.32 +mv ./pandemonium_engine/bin/godot.x11.opt.debug.32 ./pandemonium_engine/bin/godot.x11.pi4.opt.debug.32 +mv ./pandemonium_engine/bin/godot.x11.opt.tools.32 ./pandemonium_engine/bin/godot.x11.pi4.opt.tools.32 diff --git a/build_uwp.bat b/build_uwp.bat index fde96588..d27e52a8 100644 --- a/build_uwp.bat +++ b/build_uwp.bat @@ -1,5 +1,5 @@ -cd ./engine +cd ./pandemonium_engine if not defined DevEnvDir ( rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 diff --git a/editor.bat b/editor.bat index 0170b95d..cbb1fb9f 100644 --- a/editor.bat +++ b/editor.bat @@ -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\godot.windows.opt.tools.64.exe" "pandemonium_engine\bin\run_godot.windows.opt.tools.64.exe" /y +copy "pandemonium_engine\bin\godot.windows.opt.tools.64.pdb" "pandemonium_engine\bin\run_godot.windows.opt.tools.64.pdb" /y +copy "pandemonium_engine\bin\godot.windows.opt.tools.64.exp" "pandemonium_engine\bin\run_godot.windows.opt.tools.64.exp" /y -cmd /c engine\bin\run_godot.windows.opt.tools.64.exe \ No newline at end of file +cmd /c pandemonium_engine\bin\run_godot.windows.opt.tools.64.exe \ No newline at end of file diff --git a/editor.sh b/editor.sh index 502fad63..5d23fd06 100755 --- a/editor.sh +++ b/editor.sh @@ -1,6 +1,6 @@ #!/bin/bash -cp -u ./engine/bin/godot.x11.opt.tools.64 ./engine/bin/run.godot.x11.opt.tools.64 +cp -u ./pandemonium_engine/bin/godot.x11.opt.tools.64 ./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -export LD_LIBRARY_PATH=`pwd`/engine/bin/ -./engine/bin/run.godot.x11.opt.tools.64 -v +export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/ +./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -v diff --git a/export_all.sh b/export_all.sh index 621c6c94..4cfa5dc6 100755 --- a/export_all.sh +++ b/export_all.sh @@ -25,28 +25,28 @@ mkdir export/broken_seals${version_snake_cased}_pi4 mkdir export/broken_seals${version_snake_cased}_osx mkdir export/export_templates_bs${version_snake_cased} -./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export-debug Android-Release ${project_root}/export/broken_seals${version_snake_cased}_android_release/broken_seals${version_snake_cased}.apk -./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export-debug Android ${project_root}/export/broken_seals${version_snake_cased}_android_debug/broken_seals_debug${version_snake_cased}.apk -./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export Linux/X11 ${project_root}/export/broken_seals${version_snake_cased}_linux/broken_seals${version_snake_cased}_x11 -./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export "Windows Desktop" ${project_root}/export/broken_seals${version_snake_cased}_windows/broken_seals${version_snake_cased}.exe -./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export HTML5 ${project_root}/export/broken_seals${version_snake_cased}_javascript/broken_seals.html -./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export PI4/X11 ${project_root}/export/broken_seals${version_snake_cased}_pi4/broken_seals${version_snake_cased}_pi4 -./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export "Mac OSX" ${project_root}/export/broken_seals${version_snake_cased}_osx/broken_seals${version_snake_cased}.app +./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export-debug Android-Release ${project_root}/export/broken_seals${version_snake_cased}_android_release/broken_seals${version_snake_cased}.apk +./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export-debug Android ${project_root}/export/broken_seals${version_snake_cased}_android_debug/broken_seals_debug${version_snake_cased}.apk +./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export Linux/X11 ${project_root}/export/broken_seals${version_snake_cased}_linux/broken_seals${version_snake_cased}_x11 +./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export "Windows Desktop" ${project_root}/export/broken_seals${version_snake_cased}_windows/broken_seals${version_snake_cased}.exe +./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export HTML5 ${project_root}/export/broken_seals${version_snake_cased}_javascript/broken_seals.html +./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export PI4/X11 ${project_root}/export/broken_seals${version_snake_cased}_pi4/broken_seals${version_snake_cased}_pi4 +./pandemonium_engine/bin/godot.x11.opt.tools.64 --path ./game/ --export "Mac OSX" ${project_root}/export/broken_seals${version_snake_cased}_osx/broken_seals${version_snake_cased}.app -cp ./engine/bin/godot.windows.opt.tools.64.exe ${project_root}/export/godot.bs${version}.windows.opt.tools.64.exe -cp ./engine/bin/godot.x11.opt.tools.64 ${project_root}/export/godot.bs${version}.x11.opt.tools.64 -cp ./engine/bin/godot.x11.pi4.opt.tools.32 ${project_root}/export/godot.bs${version}.x11.pi4.opt.tools.32 -cp ./engine/bin/godot.javascript.opt.tools.threads.zip ${project_root}/export/godot.bs${version}.javascript.opt.tools.zip -cp ./engine/bin/Godot.app.zip ${project_root}/export/godot.bs${version}.osx.opt.tools.zip +cp ./pandemonium_engine/bin/godot.windows.opt.tools.64.exe ${project_root}/export/godot.bs${version}.windows.opt.tools.64.exe +cp ./pandemonium_engine/bin/godot.x11.opt.tools.64 ${project_root}/export/godot.bs${version}.x11.opt.tools.64 +cp ./pandemonium_engine/bin/godot.x11.pi4.opt.tools.32 ${project_root}/export/godot.bs${version}.x11.pi4.opt.tools.32 +cp ./pandemonium_engine/bin/godot.javascript.opt.tools.threads.zip ${project_root}/export/godot.bs${version}.javascript.opt.tools.zip +cp ./pandemonium_engine/bin/Godot.app.zip ${project_root}/export/godot.bs${version}.osx.opt.tools.zip -cp ./engine/bin/android_debug.apk ${project_root}/export/export_templates_bs${version_snake_cased}/android_debug.apk -cp ./engine/bin/android_release.apk ${project_root}/export/export_templates_bs${version_snake_cased}/android_release.apk -cp ./engine/bin/godot.javascript.opt.debug.zip ${project_root}/export/export_templates_bs${version_snake_cased}/godot.javascript.opt.debug.zip -cp ./engine/bin/godot.javascript.opt.zip ${project_root}/export/export_templates_bs${version_snake_cased}/godot.javascript.opt.zip -cp ./engine/bin/godot.windows.opt.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/godot.windows.opt.64.exe -cp ./engine/bin/godot.windows.opt.debug.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/godot.windows.opt.debug.64.exe -cp ./engine/bin/godot.x11.opt.64 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.opt.64 -cp ./engine/bin/godot.x11.opt.debug.64 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.opt.debug.64 -cp ./engine/bin/godot.x11.pi4.opt.32 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.pi4.opt.32 -cp ./engine/bin/godot.x11.pi4.opt.debug.32 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.pi4.opt.debug.32 -cp ./engine/bin/osx.zip ${project_root}/export/export_templates_bs${version_snake_cased}/osx.zip +cp ./pandemonium_engine/bin/android_debug.apk ${project_root}/export/export_templates_bs${version_snake_cased}/android_debug.apk +cp ./pandemonium_engine/bin/android_release.apk ${project_root}/export/export_templates_bs${version_snake_cased}/android_release.apk +cp ./pandemonium_engine/bin/godot.javascript.opt.debug.zip ${project_root}/export/export_templates_bs${version_snake_cased}/godot.javascript.opt.debug.zip +cp ./pandemonium_engine/bin/godot.javascript.opt.zip ${project_root}/export/export_templates_bs${version_snake_cased}/godot.javascript.opt.zip +cp ./pandemonium_engine/bin/godot.windows.opt.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/godot.windows.opt.64.exe +cp ./pandemonium_engine/bin/godot.windows.opt.debug.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/godot.windows.opt.debug.64.exe +cp ./pandemonium_engine/bin/godot.x11.opt.64 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.opt.64 +cp ./pandemonium_engine/bin/godot.x11.opt.debug.64 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.opt.debug.64 +cp ./pandemonium_engine/bin/godot.x11.pi4.opt.32 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.pi4.opt.32 +cp ./pandemonium_engine/bin/godot.x11.pi4.opt.debug.32 ${project_root}/export/export_templates_bs${version_snake_cased}/godot.x11.pi4.opt.debug.32 +cp ./pandemonium_engine/bin/osx.zip ${project_root}/export/export_templates_bs${version_snake_cased}/osx.zip diff --git a/ged.sh b/ged.sh index cb71cb67..6a72676e 100755 --- a/ged.sh +++ b/ged.sh @@ -1,6 +1,6 @@ #!/bin/bash -cp -u ./engine/bin/godot.x11.opt.tools.64 ./engine/bin/run.godot.x11.opt.tools.64 +cp -u ./pandemonium_engine/bin/godot.x11.opt.tools.64 ./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -export LD_LIBRARY_PATH=`pwd`/engine/bin/ -./engine/bin/run.godot.x11.opt.tools.64 -e --path ./game/ +export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/ +./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -e --path ./game/ diff --git a/module_config.py b/module_config.py index fede05cc..35ed905a 100644 --- a/module_config.py +++ b/module_config.py @@ -1,25 +1,25 @@ -godot_branch = '3.x' +godot_branch = 'master' -engine_repository = [ ['https://github.com/Relintai/godot.git', 'git@github.com:Relintai/godot.git'], 'engine', '' ] +engine_repository = [ ['https://github.com/Relintai/pandemonium_engine.git', 'git@github.com:Relintai/pandemonium_engine.git'], 'pandemonium_engine', '' ] module_repositories = [ - [ ['https://github.com/Relintai/entity_spell_system.git', 'git@github.com:Relintai/entity_spell_system.git'], 'entity_spell_system', '' ], - [ ['https://github.com/Relintai/ui_extensions.git', 'git@github.com:Relintai/ui_extensions.git'], 'ui_extensions', '' ], - [ ['https://github.com/Relintai/texture_packer.git', 'git@github.com:Relintai/texture_packer.git'], 'texture_packer', '' ], - [ ['https://github.com/Relintai/godot_fastnoise.git', 'git@github.com:Relintai/godot_fastnoise.git'], 'fastnoise', '' ], - [ ['https://github.com/Relintai/mesh_data_resource.git', 'git@github.com:Relintai/mesh_data_resource.git'], 'mesh_data_resource', '' ], - [ ['https://github.com/Relintai/props.git', 'git@github.com:Relintai/props.git'], 'props', '' ], - [ ['https://github.com/Relintai/mesh_utils.git', 'git@github.com:Relintai/mesh_utils.git'], 'mesh_utils', '' ], - [ ['https://github.com/Relintai/broken_seals_module.git', 'git@github.com:Relintai/broken_seals_module.git'], 'broken_seals_module', '' ], - [ ['https://github.com/Relintai/thread_pool.git', 'git@github.com:Relintai/thread_pool.git'], 'thread_pool', '' ], - [ ['https://github.com/Relintai/terraman.git', 'git@github.com:Relintai/terraman.git'], 'terraman', '' ], + #[ ['https://github.com/Relintai/entity_spell_system.git', 'git@github.com:Relintai/entity_spell_system.git'], 'entity_spell_system', '' ], + #[ ['https://github.com/Relintai/ui_extensions.git', 'git@github.com:Relintai/ui_extensions.git'], 'ui_extensions', '' ], + #[ ['https://github.com/Relintai/texture_packer.git', 'git@github.com:Relintai/texture_packer.git'], 'texture_packer', '' ], + #[ ['https://github.com/Relintai/godot_fastnoise.git', 'git@github.com:Relintai/godot_fastnoise.git'], 'fastnoise', '' ], + #[ ['https://github.com/Relintai/mesh_data_resource.git', 'git@github.com:Relintai/mesh_data_resource.git'], 'mesh_data_resource', '' ], + #[ ['https://github.com/Relintai/props.git', 'git@github.com:Relintai/props.git'], 'props', '' ], + #[ ['https://github.com/Relintai/mesh_utils.git', 'git@github.com:Relintai/mesh_utils.git'], 'mesh_utils', '' ], + #[ ['https://github.com/Relintai/broken_seals_module.git', 'git@github.com:Relintai/broken_seals_module.git'], 'broken_seals_module', '' ], + #[ ['https://github.com/Relintai/thread_pool.git', 'git@github.com:Relintai/thread_pool.git'], 'thread_pool', '' ], + #[ ['https://github.com/Relintai/terraman.git', 'git@github.com:Relintai/terraman.git'], 'terraman', '' ], ] removed_modules = [ - [ ['https://github.com/Relintai/voxelman.git', 'git@github.com:Relintai/voxelman.git'], 'voxelman', '' ], - [ ['https://github.com/Relintai/procedural_animations.git', 'git@github.com:Relintai/procedural_animations.git'], 'procedural_animations', '' ], - [ ['https://github.com/Relintai/world_generator.git', 'git@github.com:Relintai/world_generator.git'], 'world_generator', '' ], + #[ ['https://github.com/Relintai/voxelman.git', 'git@github.com:Relintai/voxelman.git'], 'voxelman', '' ], + #[ ['https://github.com/Relintai/procedural_animations.git', 'git@github.com:Relintai/procedural_animations.git'], 'procedural_animations', '' ], + #[ ['https://github.com/Relintai/world_generator.git', 'git@github.com:Relintai/world_generator.git'], 'world_generator', '' ], ] addon_repositories = [ diff --git a/play.sh b/play.sh index 6f916f0c..dad8e966 100755 --- a/play.sh +++ b/play.sh @@ -1,6 +1,6 @@ #!/bin/bash -cp -u ./engine/bin/godot.x11.opt.tools.64 ./engine/bin/run.godot.x11.opt.tools.64 +cp -u ./pandemonium_engine/bin/godot.x11.opt.tools.64 ./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -export LD_LIBRARY_PATH=`pwd`/engine/bin/ -./engine/bin/run.godot.x11.opt.tools.64 -v --path ./game/ +export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/ +./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -v --path ./game/ diff --git a/podman_build_all.sh b/podman_build_all.sh index 20ef29a6..5f86dc34 100755 --- a/podman_build_all.sh +++ b/podman_build_all.sh @@ -18,69 +18,69 @@ mkdir -p logs #sudo podman run -v $(pwd)/:/root/project -w /root/project godot-osx:bs scons bex_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 #sudo podman run -i -t -v $(pwd)/:/root/project -w /root/project/tools/osx godot-osx:bs bash -c ./lipo.sh -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bew_strip -j4 . 2>&1 | tee logs/bew.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h #$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bewd_strip -j4 . 2>&1 | tee logs/bewd.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bw_strip -j4 . 2>&1 | tee logs/bw.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bwr_strip -j4 . 2>&1 | tee logs/bwr.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons bel_strip -j4 . 2>&1 | tee logs/bel.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h #$podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons beld_strip -j4 . 2>&1 | tee logs/beld.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons bl_strip -j4 . 2>&1 | tee logs/bl.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons blr_strip -j4 . 2>&1 | tee logs/blr.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons bj_strip -j4' . 2>&1 | tee logs/bj.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons bjr_strip -j4' . 2>&1 | tee logs/bjr.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons bej_strip_threads -j4' . 2>&1 | tee logs/bej.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-android:${img_version} scons ba_strip -j4 . 2>&1 | tee logs/ba.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-android:${img_version} scons bar_strip -j4 . 2>&1 | tee logs/bar.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h #osx $podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bex_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bex_x86_64.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bex_strip arch=arm64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bex_arm64.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bx_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bx_x86_64.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bx_strip arch=arm64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bx_arm64.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bxr_strip arch=x86_64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bxr_x86_64.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h $podman run -v ${project_root}:/root/project -w /root/project godot-osx:${img_version} scons bxr_strip arch=arm64 -j4 osxcross_sdk=darwin20.4 . 2>&1 | tee logs/bxr_arm64.log -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h #lipo $podman run -v ${project_root}:/root/project -w /root/project/tools/osx godot-osx:${img_version} bash -c ./lipo.sh #ios #$podman run -v ${project_root}:/root/project -w /root/project godot-ios:${img_version} scons bir_strip -j4 . 2>&1 | tee logs/bir.log -#rm -f engine/modules/modules_enabled.gen.h +#rm -f pandemonium_engine/modules/modules_enabled.gen.h # $podman run -v ${project_root}:/root/project -i -w /root/project -t godot-windows:${img_version} scons bew -j4 -rm -f engine/modules/modules_enabled.gen.h +rm -f pandemonium_engine/modules/modules_enabled.gen.h # Check files -cd ./engine/bin/ +cd ./pandemonium_engine/bin/ files=( # Windows diff --git a/tools/export_presets.cfg.example b/tools/export_presets.cfg.example index c4837067..c9790df7 100644 --- a/tools/export_presets.cfg.example +++ b/tools/export_presets.cfg.example @@ -13,8 +13,8 @@ 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 @@ -213,8 +213,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/godot.x11.opt.debug.64" +custom_template/release="../pandemonium_engine/bin/godot.x11.opt.64" binary_format/64_bits=true binary_format/embed_pck=false texture_format/bptc=false @@ -238,8 +238,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/godot.javascript.opt.zip" +custom_template/release="../pandemonium_engine/bin/godot.javascript.opt.debug.zip" variant/export_type=0 vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=true @@ -263,8 +263,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/godot.windows.opt.debug.64.exe" +custom_template/release="../pandemonium_engine/bin/godot.windows.opt.64.exe" binary_format/64_bits=true binary_format/embed_pck=false texture_format/bptc=false @@ -304,8 +304,8 @@ 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 @@ -504,8 +504,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/godot.x11.pi4.opt.debug.32" +custom_template/release="../pandemonium_engine/bin/godot.x11.pi4.opt.32" binary_format/64_bits=false binary_format/embed_pck=false texture_format/bptc=false @@ -530,8 +530,8 @@ 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/icon="" diff --git a/tools/osx/create_editor_app.sh b/tools/osx/create_editor_app.sh index a727578e..b72b6d74 100755 --- a/tools/osx/create_editor_app.sh +++ b/tools/osx/create_editor_app.sh @@ -1,4 +1,4 @@ -cd ../../engine/bin/ +cd ../../pandemonium_engine/bin/ rm -Rf Godot.app rm -f Godot.app.zip diff --git a/tools/osx/create_export_templates.sh b/tools/osx/create_export_templates.sh index 07b72996..e7a8963e 100755 --- a/tools/osx/create_export_templates.sh +++ b/tools/osx/create_export_templates.sh @@ -1,6 +1,6 @@ #templates -cd ../../engine/bin +cd ../../pandemonium_engine/bin cp -r ../misc/dist/osx_template.app . mkdir -p osx_template.app/Contents/MacOS diff --git a/tools/osx/lipo.sh b/tools/osx/lipo.sh index b9d04c7d..b85d14fa 100755 --- a/tools/osx/lipo.sh +++ b/tools/osx/lipo.sh @@ -1,6 +1,6 @@ # Tools -lipo -create ../../engine/bin/godot.osx.opt.tools.x86_64 ../../engine/bin/godot.osx.opt.tools.arm64 -output ../../engine/bin/godot.osx.opt.tools.universal +lipo -create ../../pandemonium_engine/bin/godot.osx.opt.tools.x86_64 ../../pandemonium_engine/bin/godot.osx.opt.tools.arm64 -output ../../pandemonium_engine/bin/godot.osx.opt.tools.universal # Export Templates -lipo -create ../../engine/bin/godot.osx.opt.x86_64 ../../engine/bin/godot.osx.opt.arm64 -output ../../engine/bin/godot.osx.opt.universal -lipo -create ../../engine/bin/godot.osx.opt.debug.x86_64 ../../engine/bin/godot.osx.opt.debug.arm64 -output ../../engine/bin/godot.osx.opt.debug.universal +lipo -create ../../pandemonium_engine/bin/godot.osx.opt.x86_64 ../../pandemonium_engine/bin/godot.osx.opt.arm64 -output ../../pandemonium_engine/bin/godot.osx.opt.universal +lipo -create ../../pandemonium_engine/bin/godot.osx.opt.debug.x86_64 ../../pandemonium_engine/bin/godot.osx.opt.debug.arm64 -output ../../pandemonium_engine/bin/godot.osx.opt.debug.universal diff --git a/tools/release/pre_release_check_files_present.sh b/tools/release/pre_release_check_files_present.sh index e5e6eea6..97e0fd63 100755 --- a/tools/release/pre_release_check_files_present.sh +++ b/tools/release/pre_release_check_files_present.sh @@ -1,4 +1,4 @@ -cd ../../engine/bin/ +cd ../../pandemonium_engine/bin/ files=( # Windows