Siwtched the engine to the Pandemonium Engine (my new fork of godot).

This commit is contained in:
Relintai 2022-03-15 14:34:19 +01:00
parent 118bdd71af
commit 4b3c3efb30
21 changed files with 117 additions and 116 deletions

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
engine engine
pandemonium_engine
modules/* modules/*
logs/* logs/*

2
HEADS
View File

@ -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"}} {"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"}}

View File

@ -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. 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 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/). You can also try a live version running in the browser [here](https://relintai.github.io/broken_seals/).

View File

@ -236,13 +236,13 @@ def remove_repository(data, target_folder):
shutil.rmtree(folder) shutil.rmtree(folder)
def update_engine(): 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) update_repository(module_config.engine_repository, '/', module_config.godot_branch)
def update_modules(): def update_modules():
for rep in module_config.module_repositories: for rep in module_config.module_repositories:
update_repository(rep, module_clone_path) 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(): def update_addons():
for rep in module_config.addon_repositories: for rep in module_config.addon_repositories:
@ -264,16 +264,16 @@ def update_all():
def setup_engine(): 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) setup_repository(module_config.engine_repository, '/', module_config.godot_branch)
def setup_modules(): def setup_modules():
for rep in module_config.module_repositories: for rep in module_config.module_repositories:
setup_repository(rep, module_clone_path) 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: for rep in module_config.removed_modules:
remove_repository(rep, './engine/modules/') remove_repository(rep, './pandemonium_engine/modules/')
def setup_addons(): def setup_addons():
@ -461,10 +461,10 @@ if len(sys.argv) > 1:
target += 'bin/libprocedural_animations.x11.opt.tools.64.so' target += 'bin/libprocedural_animations.x11.opt.tools.64.so'
cwd = os.getcwd() cwd = os.getcwd()
full_path = cwd + '/engine/' full_path = cwd + '/pandemonium_engine/'
if not os.path.isdir(full_path): if not os.path.isdir(full_path):
print('engine directory doesnt exists.') print('engine (pandemonium_engine) directory doesnt exists.')
exit() exit()
os.chdir(full_path) os.chdir(full_path)
@ -548,10 +548,10 @@ if len(sys.argv) > 1:
# exit() # exit()
# #
# cwd = os.getcwd() # cwd = os.getcwd()
# full_path = cwd + '/engine/' # full_path = cwd + '/pandemonium_engine/'
# #
# if not os.path.isdir(full_path): # if not os.path.isdir(full_path):
# print('engine directory does not exists.') # print('engine (pandemonium_engine) directory does not exists.')
# exit() # exit()
# #
# os.chdir(full_path) # os.chdir(full_path)
@ -564,7 +564,7 @@ if len(sys.argv) > 1:
# #unstage all files # #unstage all files
# subprocess.call('git reset', shell=True) # 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 # #also patch voxelman as the plugin changes forward_spatial_gui_input's definition
# if os.path.isdir(vman_full_path): # if os.path.isdir(vman_full_path):

View File

@ -2,7 +2,7 @@
export SCONS_CACHE=~/.scons_cache export SCONS_CACHE=~/.scons_cache
export SCONS_CACHE_LIMIT=5000 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=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 scons -j6 p=iphone tools=no target=release_debug arch=arm64 module_arkit_enabled=no game_center=no

View File

@ -2,7 +2,7 @@
export SCONS_CACHE=~/.scons_cache export SCONS_CACHE=~/.scons_cache
export SCONS_CACHE_LIMIT=5000 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=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 scons -j6 p=iphone tools=no target=release arch=arm64 module_arkit_enabled=no game_center=no

View File

@ -2,7 +2,7 @@
export SCONS_CACHE=~/.scons_cache export SCONS_CACHE=~/.scons_cache
export SCONS_CACHE_LIMIT=5000 export SCONS_CACHE_LIMIT=5000
cd ./engine cd ./pandemonium_engine
scons -j6 platform=osx target=release_debug scons -j6 platform=osx target=release_debug

View File

@ -3,10 +3,10 @@ scons bel_latomic_strip_slim -j4
scons bl_latomic_strip_slim -j4 scons bl_latomic_strip_slim -j4
scons blr_latomic_strip_slim -j4 scons blr_latomic_strip_slim -j4
rm -f ./engine/bin/godot.x11.pi4.opt.32 rm -f ./pandemonium_engine/bin/godot.x11.pi4.opt.32
rm -f ./engine/bin/godot.x11.pi4.opt.debug.32 rm -f ./pandemonium_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.tools.32
mv ./engine/bin/godot.x11.opt.32 ./engine/bin/godot.x11.pi4.opt.32 mv ./pandemonium_engine/bin/godot.x11.opt.32 ./pandemonium_engine/bin/godot.x11.pi4.opt.32
mv ./engine/bin/godot.x11.opt.debug.32 ./engine/bin/godot.x11.pi4.opt.debug.32 mv ./pandemonium_engine/bin/godot.x11.opt.debug.32 ./pandemonium_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.tools.32 ./pandemonium_engine/bin/godot.x11.pi4.opt.tools.32

View File

@ -1,5 +1,5 @@
cd ./engine cd ./pandemonium_engine
if not defined DevEnvDir ( if not defined DevEnvDir (
rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86

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 "pandemonium_engine\bin\godot.windows.opt.tools.64.exe" "pandemonium_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 "pandemonium_engine\bin\godot.windows.opt.tools.64.pdb" "pandemonium_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.exp" "pandemonium_engine\bin\run_godot.windows.opt.tools.64.exp" /y
cmd /c engine\bin\run_godot.windows.opt.tools.64.exe cmd /c pandemonium_engine\bin\run_godot.windows.opt.tools.64.exe

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/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/ export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/
./engine/bin/run.godot.x11.opt.tools.64 -v ./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -v

View File

@ -25,28 +25,28 @@ mkdir export/broken_seals${version_snake_cased}_pi4
mkdir export/broken_seals${version_snake_cased}_osx mkdir export/broken_seals${version_snake_cased}_osx
mkdir export/export_templates_bs${version_snake_cased} 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 ./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
./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-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 ./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
./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 "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 ./pandemonium_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 ./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
./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 "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 ./pandemonium_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 ./pandemonium_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 ./pandemonium_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 ./pandemonium_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.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 ./pandemonium_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 ./pandemonium_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 ./pandemonium_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 ./pandemonium_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 ./pandemonium_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 ./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 ./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.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 ./pandemonium_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 ./pandemonium_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 ./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 ./engine/bin/osx.zip ${project_root}/export/export_templates_bs${version_snake_cased}/osx.zip cp ./pandemonium_engine/bin/osx.zip ${project_root}/export/export_templates_bs${version_snake_cased}/osx.zip

6
ged.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/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/ export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/
./engine/bin/run.godot.x11.opt.tools.64 -e --path ./game/ ./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -e --path ./game/

View File

@ -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 = [ 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/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/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/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/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/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/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/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/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/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/terraman.git', 'git@github.com:Relintai/terraman.git'], 'terraman', '' ],
] ]
removed_modules = [ removed_modules = [
[ ['https://github.com/Relintai/voxelman.git', 'git@github.com:Relintai/voxelman.git'], 'voxelman', '' ], #[ ['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/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/world_generator.git', 'git@github.com:Relintai/world_generator.git'], 'world_generator', '' ],
] ]
addon_repositories = [ addon_repositories = [

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/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/ export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/
./engine/bin/run.godot.x11.opt.tools.64 -v --path ./game/ ./pandemonium_engine/bin/run.godot.x11.opt.tools.64 -v --path ./game/

View File

@ -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 -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 #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 $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 #$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 $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 $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 $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 #$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 $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 $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 $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 $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 $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 $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 $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 #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 $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 $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 $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 $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 $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 $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 #lipo
$podman run -v ${project_root}:/root/project -w /root/project/tools/osx godot-osx:${img_version} bash -c ./lipo.sh $podman run -v ${project_root}:/root/project -w /root/project/tools/osx godot-osx:${img_version} bash -c ./lipo.sh
#ios #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 #$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 # $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 # Check files
cd ./engine/bin/ cd ./pandemonium_engine/bin/
files=( files=(
# Windows # Windows

View File

@ -13,8 +13,8 @@ script_encryption_key=""
[preset.0.options] [preset.0.options]
custom_template/debug="../engine/bin/android_debug.apk" custom_template/debug="../pandemonium_engine/bin/android_debug.apk"
custom_template/release="../engine/bin/android_release.apk" custom_template/release="../pandemonium_engine/bin/android_release.apk"
custom_template/use_custom_build=false custom_template/use_custom_build=false
custom_template/export_format=0 custom_template/export_format=0
architectures/armeabi-v7a=true architectures/armeabi-v7a=true
@ -213,8 +213,8 @@ script_encryption_key=""
[preset.1.options] [preset.1.options]
custom_template/debug="../engine/bin/godot.x11.opt.debug.64" custom_template/debug="../pandemonium_engine/bin/godot.x11.opt.debug.64"
custom_template/release="../engine/bin/godot.x11.opt.64" custom_template/release="../pandemonium_engine/bin/godot.x11.opt.64"
binary_format/64_bits=true binary_format/64_bits=true
binary_format/embed_pck=false binary_format/embed_pck=false
texture_format/bptc=false texture_format/bptc=false
@ -238,8 +238,8 @@ script_encryption_key=""
[preset.2.options] [preset.2.options]
custom_template/debug="../engine/bin/godot.javascript.opt.zip" custom_template/debug="../pandemonium_engine/bin/godot.javascript.opt.zip"
custom_template/release="../engine/bin/godot.javascript.opt.debug.zip" custom_template/release="../pandemonium_engine/bin/godot.javascript.opt.debug.zip"
variant/export_type=0 variant/export_type=0
vram_texture_compression/for_desktop=true vram_texture_compression/for_desktop=true
vram_texture_compression/for_mobile=true vram_texture_compression/for_mobile=true
@ -263,8 +263,8 @@ script_encryption_key=""
[preset.3.options] [preset.3.options]
custom_template/debug="../engine/bin/godot.windows.opt.debug.64.exe" custom_template/debug="../pandemonium_engine/bin/godot.windows.opt.debug.64.exe"
custom_template/release="../engine/bin/godot.windows.opt.64.exe" custom_template/release="../pandemonium_engine/bin/godot.windows.opt.64.exe"
binary_format/64_bits=true binary_format/64_bits=true
binary_format/embed_pck=false binary_format/embed_pck=false
texture_format/bptc=false texture_format/bptc=false
@ -304,8 +304,8 @@ script_encryption_key=""
[preset.4.options] [preset.4.options]
custom_template/debug="../engine/bin/android_release.apk" custom_template/debug="../pandemonium_engine/bin/android_release.apk"
custom_template/release="../engine/bin/android_release.apk" custom_template/release="../pandemonium_engine/bin/android_release.apk"
custom_template/use_custom_build=false custom_template/use_custom_build=false
custom_template/export_format=0 custom_template/export_format=0
architectures/armeabi-v7a=true architectures/armeabi-v7a=true
@ -504,8 +504,8 @@ script_encryption_key=""
[preset.5.options] [preset.5.options]
custom_template/debug="../engine/bin/godot.x11.pi4.opt.debug.32" custom_template/debug="../pandemonium_engine/bin/godot.x11.pi4.opt.debug.32"
custom_template/release="../engine/bin/godot.x11.pi4.opt.32" custom_template/release="../pandemonium_engine/bin/godot.x11.pi4.opt.32"
binary_format/64_bits=false binary_format/64_bits=false
binary_format/embed_pck=false binary_format/embed_pck=false
texture_format/bptc=false texture_format/bptc=false
@ -530,8 +530,8 @@ script_encryption_key=""
[preset.6.options] [preset.6.options]
custom_template/debug="../engine/bin/osx.zip" custom_template/debug="../pandemonium_engine/bin/osx.zip"
custom_template/release="../engine/bin/osx.zip" custom_template/release="../pandemonium_engine/bin/osx.zip"
application/name="Broken Seals" application/name="Broken Seals"
application/info="Made with Godot Engine" application/info="Made with Godot Engine"
application/icon="" application/icon=""

View File

@ -1,4 +1,4 @@
cd ../../engine/bin/ cd ../../pandemonium_engine/bin/
rm -Rf Godot.app rm -Rf Godot.app
rm -f Godot.app.zip rm -f Godot.app.zip

View File

@ -1,6 +1,6 @@
#templates #templates
cd ../../engine/bin cd ../../pandemonium_engine/bin
cp -r ../misc/dist/osx_template.app . cp -r ../misc/dist/osx_template.app .
mkdir -p osx_template.app/Contents/MacOS mkdir -p osx_template.app/Contents/MacOS

View File

@ -1,6 +1,6 @@
# Tools # 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 # 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 ../../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 ../../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.debug.x86_64 ../../pandemonium_engine/bin/godot.osx.opt.debug.arm64 -output ../../pandemonium_engine/bin/godot.osx.opt.debug.universal

View File

@ -1,4 +1,4 @@
cd ../../engine/bin/ cd ../../pandemonium_engine/bin/
files=( files=(
# Windows # Windows