Now the project uses the pandemonium engine. (My heavily modified fork of godot.)

This commit is contained in:
Relintai 2022-03-26 13:47:30 +01:00
parent f9428f05ad
commit 405a8f307b
18 changed files with 278 additions and 397 deletions

1
.gitignore vendored
View File

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

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

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.pandemonium_branch)
update_repository(module_config.engine_repository, '/', module_config.godot_branch) update_repository(module_config.engine_repository, '/', module_config.pandemonium_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.pandemonium_branch)
setup_repository(module_config.engine_repository, '/', module_config.godot_branch) setup_repository(module_config.engine_repository, '/', module_config.pandemonium_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)
@ -499,8 +499,12 @@ if len(sys.argv) > 1:
os.chdir(full_path + 'platform/android/java/') os.chdir(full_path + 'platform/android/java/')
print('Running command: ' + get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generateGodotTemplates') if 'e' in arg: #editor
subprocess.call(get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generateGodotTemplates', shell=True) print('Running command: ' + get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generatePandemoniumEditor')
subprocess.call(get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generatePandemoniumEditor', shell=True)
else: #normal templates
print('Running command: ' + get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generatePandemoniumTemplates')
subprocess.call(get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generatePandemoniumTemplates', shell=True)
elif 'j' in arg: elif 'j' in arg:
build_string += 'platform=javascript' build_string += 'platform=javascript'
@ -548,10 +552,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 +568,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):
@ -610,7 +614,7 @@ if not os.path.isdir('./modules'):
os.mkdir('./modules') os.mkdir('./modules')
if 'm' in action: if 'm' in action:
godot_branch = 'master' pandemonium_branch = 'master'
if 'setup' in action or action[0] == 's': if 'setup' in action or action[0] == 's':
if target == 'all': if target == 'all':

View File

@ -2,13 +2,13 @@
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
lipo -create bin/libgodot.iphone.opt.debug.arm.a bin/libgodot.iphone.opt.debug.arm64.a -output bin/libgodot.iphone.debug.fat.a 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/libgodot.iphone.debug.fat.a rm bin/ios_xcode/libpandemonium.iphone.debug.fat.a
cp bin/libgodot.iphone.debug.fat.a bin/ios_xcode/libgodot.iphone.debug.fat.a cp bin/libpandemonium.iphone.debug.fat.a bin/ios_xcode/libpandemonium.iphone.debug.fat.a
rm bin/iphone.zip rm bin/iphone.zip
cd bin/ios_xcode cd bin/ios_xcode

View File

@ -2,13 +2,13 @@
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
lipo -create bin/libgodot.iphone.opt.arm.a bin/libgodot.iphone.opt.arm64.a -output bin/libgodot.iphone.release.fat.a 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/libgodot.iphone.release.fat.a rm bin/ios_xcode/libpandemonium.iphone.release.fat.a
cp bin/libgodot.iphone.release.fat.a bin/ios_xcode/libgodot.iphone.release.fat.a cp bin/libpandemonium.iphone.release.fat.a bin/ios_xcode/libpandemonium.iphone.release.fat.a
rm bin/iphone.zip rm bin/iphone.zip
cd bin/ios_xcode cd bin/ios_xcode

View File

@ -2,14 +2,14 @@
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
rm -Rf bin/Godot.app rm -Rf bin/Godot.app
cp -r misc/dist/osx_tools.app ./bin/Godot.app cp -r misc/dist/osx_tools.app ./bin/Godot.app
mkdir -p ./bin/Godot.app/Contents/MacOS mkdir -p ./bin/Godot.app/Contents/MacOS
cp bin/godot.osx.opt.tools.64 bin/Godot.app/Contents/MacOS/Godot cp bin/pandemonium.osx.opt.tools.64 bin/Godot.app/Contents/MacOS/Godot
chmod +x bin/Godot.app/Contents/MacOS/Godot chmod +x bin/Godot.app/Contents/MacOS/Godot
cd .. cd ..

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/pandemonium.x11.pi4.opt.32
rm -f ./engine/bin/godot.x11.pi4.opt.debug.32 rm -f ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.debug.32
rm -f ./engine/bin/godot.x11.pi4.opt.tools.32 rm -f ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.tools.32
mv ./engine/bin/godot.x11.opt.32 ./engine/bin/godot.x11.pi4.opt.32 mv ./pandemonium_engine/bin/pandemonium.x11.opt.32 ./pandemonium_engine/bin/pandemonium.x11.pi4.opt.32
mv ./engine/bin/godot.x11.opt.debug.32 ./engine/bin/godot.x11.pi4.opt.debug.32 mv ./pandemonium_engine/bin/pandemonium.x11.opt.debug.32 ./pandemonium_engine/bin/pandemonium.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/pandemonium.x11.opt.tools.32 ./pandemonium_engine/bin/pandemonium.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 @@
#!/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/pandemonium.x11.opt.tools.64 ./pandemonium_engine/bin/run.pandemonium.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.pandemonium.x11.opt.tools.64 -v

View File

@ -25,28 +25,29 @@ 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/pandemonium.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/pandemonium.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/pandemonium.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/pandemonium.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/pandemonium.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/pandemonium.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/pandemonium.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/pandemonium.windows.opt.tools.64.exe ${project_root}/export/pandemonium.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/pandemonium.x11.opt.tools.64 ${project_root}/export/pandemonium.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/pandemonium.x11.pi4.opt.tools.32 ${project_root}/export/pandemonium.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/pandemonium.javascript.opt.tools.threads.zip ${project_root}/export/pandemonium.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/android_editor.apk ${project_root}/export/pandemonium.bs${version}.android_editor.apk
cp ./pandemonium_engine/bin/Pandemonium.app.zip ${project_root}/export/pandemonium.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/pandemonium.javascript.opt.debug.zip ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.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/pandemonium.javascript.opt.zip ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.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/pandemonium.windows.opt.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.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/pandemonium.windows.opt.debug.64.exe ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.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/pandemonium.x11.opt.64 ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.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/pandemonium.x11.opt.debug.64 ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.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/pandemonium.x11.pi4.opt.32 ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.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/pandemonium.x11.pi4.opt.debug.32 ${project_root}/export/export_templates_bs${version_snake_cased}/pandemonium.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

View File

@ -27,12 +27,14 @@ func folder_get_name(index : int) -> String:
func folder_get_type(index : int) -> String: func folder_get_type(index : int) -> String:
return folders[index].type return folders[index].type
func _get(property): func _get(property : StringName):
if property == "folder_count": var sprop : String = property
if sprop == "folder_count":
return folders.size() return folders.size()
if property.begins_with("folders/"): if sprop.begins_with("folders/"):
var sindex : String = property.get_slice("/", 1) var sindex : String = sprop.get_slice("/", 1)
if sindex == "": if sindex == "":
return null return null
@ -42,7 +44,7 @@ func _get(property):
if index < 0 || index >= folders.size(): if index < 0 || index >= folders.size():
return null return null
var p : String = property.get_slice("/", 2) var p : String = sprop.get_slice("/", 2)
if p == "folder": if p == "folder":
return folders[index].folder return folders[index].folder
@ -57,16 +59,18 @@ func _get(property):
return null return null
func _set(property, val): func _set(property : StringName, val) -> bool:
var sprop : String = property
if property == "folder_count": if property == "folder_count":
set_folder_count(val) set_folder_count(val)
return true return true
if property.begins_with("folders/"): if sprop.begins_with("folders/"):
var sindex : String = property.get_slice("/", 1) var sindex : String = sprop.get_slice("/", 1)
if sindex == "": if sindex == "":
return null return false
var index : int = sindex.to_int() var index : int = sindex.to_int()
@ -76,7 +80,7 @@ func _set(property, val):
if index >= folders.size(): if index >= folders.size():
return false return false
var p : String = property.get_slice("/", 2) var p : String = sprop.get_slice("/", 2)
if p == "folder": if p == "folder":
folders[index].folder = val folders[index].folder = val

View File

@ -10,342 +10,342 @@ config_version=4
_global_script_classes=[ { _global_script_classes=[ {
"base": "Reference", "base": "Reference",
"class": "BrushPrefabs", "class": @"BrushPrefabs",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/BrushPrefabs.gd" "path": "res://addons/Godoxel/BrushPrefabs.gd"
}, { }, {
"base": "CharacterAtlas", "base": "CharacterAtlas",
"class": "CharacterAtlas2D", "class": @"CharacterAtlas2D",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/item_visuals/CharacterAtlas2D.gd" "path": "res://scripts/item_visuals/CharacterAtlas2D.gd"
}, { }, {
"base": "CharacterAtlasEntry", "base": "CharacterAtlasEntry",
"class": "CharacterAtlasEntry2D", "class": @"CharacterAtlasEntry2D",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/item_visuals/CharacterAtlasEntry2D.gd" "path": "res://scripts/item_visuals/CharacterAtlasEntry2D.gd"
}, { }, {
"base": "Spatial", "base": "Spatial",
"class": "CharacterSkeketonAttachPoint", "class": @"CharacterSkeketonAttachPoint",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/CharacterSkeletonAttachPoint.gd" "path": "res://player/CharacterSkeletonAttachPoint.gd"
}, { }, {
"base": "CharacterSkeleton2D", "base": "CharacterSkeleton2D",
"class": "CharacterSkeleton2DGD", "class": @"CharacterSkeleton2DGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/CharacterSkeleton2DGD.gd" "path": "res://player/CharacterSkeleton2DGD.gd"
}, { }, {
"base": "ColorRect", "base": "ColorRect",
"class": "ColorTile", "class": @"ColorTile",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/color-palette/ColorTile.gd" "path": "res://addons/color-palette/ColorTile.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "Continent", "class": @"Continent",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/continent.gd" "path": "res://addons/world_generator/resources/continent.gd"
}, { }, {
"base": "Entity", "base": "Entity",
"class": "DisplayPlayerGD", "class": @"DisplayPlayerGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/DisplayPlayer.gd" "path": "res://player/DisplayPlayer.gd"
}, { }, {
"base": "EntityAI", "base": "EntityAI",
"class": "EntityAIGD", "class": @"EntityAIGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/ai/EntityAIGD.gd" "path": "res://scripts/ai/EntityAIGD.gd"
}, { }, {
"base": "EntityData", "base": "EntityData",
"class": "EntityDataGD", "class": @"EntityDataGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/entities/EntityDataGD.gd" "path": "res://scripts/entities/EntityDataGD.gd"
}, { }, {
"base": "Container", "base": "Container",
"class": "FlexGridContainer", "class": @"FlexGridContainer",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/color-palette/utilities/FlexGridContainer.gd" "path": "res://addons/color-palette/utilities/FlexGridContainer.gd"
}, { }, {
"base": "Node", "base": "Node",
"class": "GEAction", "class": @"GEAction",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Action.gd" "path": "res://addons/Godoxel/actions/Action.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEBrighten", "class": @"GEBrighten",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Brighten.gd" "path": "res://addons/Godoxel/actions/Brighten.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEBrush", "class": @"GEBrush",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Brush.gd" "path": "res://addons/Godoxel/actions/Brush.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEBucket", "class": @"GEBucket",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Bucket.gd" "path": "res://addons/Godoxel/actions/Bucket.gd"
}, { }, {
"base": "Control", "base": "Control",
"class": "GECanvas", "class": @"GECanvas",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/Canvas.gd" "path": "res://addons/Godoxel/Canvas.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GECut", "class": @"GECut",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Cut.gd" "path": "res://addons/Godoxel/actions/Cut.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEDarken", "class": @"GEDarken",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Darken.gd" "path": "res://addons/Godoxel/actions/Darken.gd"
}, { }, {
"base": "Reference", "base": "Reference",
"class": "GELayer", "class": @"GELayer",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/Layer.gd" "path": "res://addons/Godoxel/Layer.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GELine", "class": @"GELine",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Line.gd" "path": "res://addons/Godoxel/actions/Line.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEMultiLine", "class": @"GEMultiLine",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/MultiLine.gd" "path": "res://addons/Godoxel/actions/MultiLine.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEPasteCut", "class": @"GEPasteCut",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/PasteCut.gd" "path": "res://addons/Godoxel/actions/PasteCut.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEPencil", "class": @"GEPencil",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Pencil.gd" "path": "res://addons/Godoxel/actions/Pencil.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GERainbow", "class": @"GERainbow",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Rainbow.gd" "path": "res://addons/Godoxel/actions/Rainbow.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GERect", "class": @"GERect",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Rect.gd" "path": "res://addons/Godoxel/actions/Rect.gd"
}, { }, {
"base": "Node", "base": "Node",
"class": "GEUtils", "class": @"GEUtils",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/Util.gd" "path": "res://addons/Godoxel/Util.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "GameModule", "class": @"GameModule",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/game_modules/GameModule.gd" "path": "res://scripts/game_modules/GameModule.gd"
}, { }, {
"base": "EntityResource", "base": "EntityResource",
"class": "HealthResource", "class": @"HealthResource",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/resources/HealthResource.gd" "path": "res://scripts/resources/HealthResource.gd"
}, { }, {
"base": "CharacterBones", "base": "CharacterBones",
"class": "HumanoidCharacterBones2D", "class": @"HumanoidCharacterBones2D",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/HumanoidCharacterBones2D.gd" "path": "res://player/HumanoidCharacterBones2D.gd"
}, { }, {
"base": "ItemTemplate", "base": "ItemTemplate",
"class": "ItemTemplateGD", "class": @"ItemTemplateGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/items/ItemTemplateGD.gd" "path": "res://scripts/items/ItemTemplateGD.gd"
}, { }, {
"base": "SkeletonModelEntry", "base": "SkeletonModelEntry",
"class": "ItemVisual2D", "class": @"ItemVisual2D",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/item_visuals/ItemVisual2D.gd" "path": "res://scripts/item_visuals/ItemVisual2D.gd"
}, { }, {
"base": "SkeletonModelEntry", "base": "SkeletonModelEntry",
"class": "ItemVisualEntry2D", "class": @"ItemVisualEntry2D",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/item_visuals/ItemVisualEntry2D.gd" "path": "res://scripts/item_visuals/ItemVisualEntry2D.gd"
}, { }, {
"base": "Node2D", "base": "Node2D",
"class": "LayeredTextureMaker", "class": @"LayeredTextureMaker",
"language": "GDScript", "language": @"GDScript",
"path": "res://tools/texture_tools/LayeredTextureMaker.gd" "path": "res://tools/texture_tools/LayeredTextureMaker.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "MMMateial", "class": @"MMMateial",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/mat_maker_gd/nodes/mm_material.gd" "path": "res://addons/mat_maker_gd/nodes/mm_material.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "MMNode", "class": @"MMNode",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/mat_maker_gd/nodes/mm_node.gd" "path": "res://addons/mat_maker_gd/nodes/mm_node.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "MMNodeUniversalProperty", "class": @"MMNodeUniversalProperty",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/mat_maker_gd/nodes/mm_node_universal_property.gd" "path": "res://addons/mat_maker_gd/nodes/mm_node_universal_property.gd"
}, { }, {
"base": "Node", "base": "Node",
"class": "Main", "class": @"Main",
"language": "GDScript", "language": @"GDScript",
"path": "res://scenes/MainScene.gd" "path": "res://scenes/MainScene.gd"
}, { }, {
"base": "EntityResource", "base": "EntityResource",
"class": "ManaResource", "class": @"ManaResource",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/resources/ManaResource.gd" "path": "res://scripts/resources/ManaResource.gd"
}, { }, {
"base": "Control", "base": "Control",
"class": "Menu", "class": @"Menu",
"language": "GDScript", "language": @"GDScript",
"path": "res://scenes/menu/Menu.gd" "path": "res://scenes/menu/Menu.gd"
}, { }, {
"base": "Entity", "base": "Entity",
"class": "MobGD", "class": @"MobGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/Mob.gd" "path": "res://player/Mob.gd"
}, { }, {
"base": "", "base": "",
"class": "NetworkedPlayerGD", "class": @"NetworkedPlayerGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/NetworkedPlayer.gd" "path": "res://player/NetworkedPlayer.gd"
}, { }, {
"base": "Reference", "base": "Reference",
"class": "Palette", "class": @"Palette",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/color-palette/Palette.gd" "path": "res://addons/color-palette/Palette.gd"
}, { }, {
"base": "Reference", "base": "Reference",
"class": "PaletteImporter", "class": @"PaletteImporter",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/color-palette/PaletteImporter.gd" "path": "res://addons/color-palette/PaletteImporter.gd"
}, { }, {
"base": "", "base": "",
"class": "PlayerGD", "class": @"PlayerGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/Player.gd" "path": "res://player/Player.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "PlayerMaster", "class": @"PlayerMaster",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/networking/PlayerMaster.gd" "path": "res://scripts/networking/PlayerMaster.gd"
}, { }, {
"base": "EntityResource", "base": "EntityResource",
"class": "SpeedResource", "class": @"SpeedResource",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/resources/SpeedResource.gd" "path": "res://scripts/resources/SpeedResource.gd"
}, { }, {
"base": "SpellEffectVisual", "base": "SpellEffectVisual",
"class": "SpellEffectVisualBasic", "class": @"SpellEffectVisualBasic",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/resources/spell_effect_visual_basic.gd" "path": "res://scripts/resources/spell_effect_visual_basic.gd"
}, { }, {
"base": "Spell", "base": "Spell",
"class": "SpellGD", "class": @"SpellGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/spells/gd_spell_script.gd" "path": "res://scripts/spells/gd_spell_script.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "SubZone", "class": @"SubZone",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/subzone.gd" "path": "res://addons/world_generator/resources/subzone.gd"
}, { }, {
"base": "GameModule", "base": "GameModule",
"class": "UIGuiChildModule", "class": @"UIGuiChildModule",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/game_modules/ui_gui_child_module.gd" "path": "res://scripts/game_modules/ui_gui_child_module.gd"
}, { }, {
"base": "GameModule", "base": "GameModule",
"class": "UIWindowModule", "class": @"UIWindowModule",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/game_modules/ui_window_module.gd" "path": "res://scripts/game_modules/ui_window_module.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "WorldGenBaseResource", "class": @"WorldGenBaseResource",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/world_gen_base_resource.gd" "path": "res://addons/world_generator/resources/world_gen_base_resource.gd"
}, { }, {
"base": "Reference", "base": "Reference",
"class": "WorldGenRaycast", "class": @"WorldGenRaycast",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/raycast/world_gen_raycast.gd" "path": "res://addons/world_generator/raycast/world_gen_raycast.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "WorldGenWorld", "class": @"WorldGenWorld",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/world_gen_world.gd" "path": "res://addons/world_generator/resources/world_gen_world.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "WorldGeneratorSettings", "class": @"WorldGeneratorSettings",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/world_generator_settings.gd" "path": "res://addons/world_generator/resources/world_generator_settings.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "Zone", "class": @"Zone",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/zone.gd" "path": "res://addons/world_generator/resources/zone.gd"
} ] } ]
_global_script_class_icons={ _global_script_class_icons={
"BrushPrefabs": "", @"GEBrighten": "",
"CharacterAtlas2D": "", @"BrushPrefabs": "",
"CharacterAtlasEntry2D": "", @"WorldGeneratorSettings": "",
"CharacterSkeketonAttachPoint": "", @"PlayerGD": "",
"CharacterSkeleton2DGD": "", @"MMNode": "",
"ColorTile": "", @"GameModule": "",
"Continent": "", @"GECut": "",
"DisplayPlayerGD": "", @"GECanvas": "",
"EntityAIGD": "", @"GEBrush": "",
"EntityDataGD": "", @"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png",
"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png", @"CharacterSkeketonAttachPoint": "",
"GEAction": "", @"CharacterAtlas2D": "",
"GEBrighten": "", @"WorldGenRaycast": "",
"GEBrush": "", @"SpeedResource": "",
"GEBucket": "", @"PlayerMaster": "",
"GECanvas": "", @"PaletteImporter": "",
"GECut": "", @"MobGD": "",
"GEDarken": "", @"ItemVisual2D": "",
"GELayer": "", @"GELayer": "",
"GELine": "", @"GEDarken": "",
"GEMultiLine": "", @"WorldGenWorld": "",
"GEPasteCut": "", @"GERect": "",
"GEPencil": "", @"GEBucket": "",
"GERainbow": "", @"GEAction": "",
"GERect": "", @"EntityDataGD": "",
"GEUtils": "", @"EntityAIGD": "",
"GameModule": "", @"Continent": "",
"HealthResource": "", @"CharacterAtlasEntry2D": "",
"HumanoidCharacterBones2D": "", @"SpellGD": "",
"ItemTemplateGD": "", @"SpellEffectVisualBasic": "",
"ItemVisual2D": "", @"NetworkedPlayerGD": "",
"ItemVisualEntry2D": "", @"ItemVisualEntry2D": "",
"LayeredTextureMaker": "", @"CharacterSkeleton2DGD": "",
"MMMateial": "", @"Zone": "",
"MMNode": "", @"UIWindowModule": "",
"MMNodeUniversalProperty": "", @"GELine": "",
"Main": "", @"WorldGenBaseResource": "",
"ManaResource": "", @"UIGuiChildModule": "",
"Menu": "", @"Menu": "",
"MobGD": "", @"ManaResource": "",
"NetworkedPlayerGD": "", @"Main": "",
"Palette": "", @"GEUtils": "",
"PaletteImporter": "", @"GEPasteCut": "",
"PlayerGD": "", @"ColorTile": "",
"PlayerMaster": "", @"SubZone": "",
"SpeedResource": "", @"MMNodeUniversalProperty": "",
"SpellEffectVisualBasic": "", @"ItemTemplateGD": "",
"SpellGD": "", @"HealthResource": "",
"SubZone": "", @"GERainbow": "",
"UIGuiChildModule": "", @"DisplayPlayerGD": "",
"UIWindowModule": "", @"Palette": "",
"WorldGenBaseResource": "", @"MMMateial": "",
"WorldGenRaycast": "", @"LayeredTextureMaker": "",
"WorldGenWorld": "", @"HumanoidCharacterBones2D": "",
"WorldGeneratorSettings": "", @"GEPencil": "",
"Zone": "" @"GEMultiLine": ""
} }
Node="input/actionbar_5_11" Node="input/actionbar_5_11"
@ -836,13 +836,8 @@ limits/message_queue/max_size_kb=2048
2d/default_gravity=0 2d/default_gravity=0
[props]
default_prop_material_cache_class="PropMaterialCachePCM"
[rendering] [rendering]
quality/driver/driver_name="GLES2"
quality/driver/fallback_to_gles2=true quality/driver/fallback_to_gles2=true
quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation=0
quality/intended_usage/framebuffer_allocation.mobile=0 quality/intended_usage/framebuffer_allocation.mobile=0

View File

@ -24,7 +24,7 @@ class_name PlayerMaster
# Player info, associate ID to data # Player info, associate ID to data
var player_info = {} var player_info = {}
# Info we send to other players # Info we send to other players
var my_info = { name = "Testname", selected_class = 1 } var my_info = { "name": "Testname", "selected_class": 1 }
var sid : int var sid : int
var player : Entity var player : Entity

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/pandemonium.x11.opt.tools.64 ./pandemonium_engine/bin/run.pandemonium.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.pandemonium.x11.opt.tools.64 -e --path ./game/

View File

@ -38,13 +38,15 @@ zip -q ../release/broken_seals${version_snake_cased}_pi4.zip ./broken_seals${ve
zip -r -q ../release/broken_seals${version_snake_cased}_osx.zip ./broken_seals${version_snake_cased}_osx/* zip -r -q ../release/broken_seals${version_snake_cased}_osx.zip ./broken_seals${version_snake_cased}_osx/*
# Editor # Editor
zip -q ../release/editor_windows_bs${version_snake_cased}.zip ./godot.bs${version}.windows.opt.tools.64.exe zip -q ../release/editor_windows_bs${version_snake_cased}.zip ./pandemonium.bs${version}.windows.opt.tools.64.exe
zip -q ../release/editor_linux_bs${version_snake_cased}.zip ./godot.bs${version}.x11.opt.tools.64 zip -q ../release/editor_linux_bs${version_snake_cased}.zip ./pandemonium.bs${version}.x11.opt.tools.64
zip -q ../release/editor_pi4_bs${version_snake_cased}.zip ./godot.bs${version}.x11.pi4.opt.tools.32 zip -q ../release/editor_pi4_bs${version_snake_cased}.zip ./pandemonium.bs${version}.x11.pi4.opt.tools.32
cp ./godot.bs${version}.javascript.opt.tools.zip ../release/editor_javascript_bs${version_snake_cased}.zip cp ./pandemonium.bs${version}.javascript.opt.tools.zip ../release/editor_javascript_bs${version_snake_cased}.zip
zip -q ../release/editor_osx_bs${version_snake_cased}.zip ./godot.bs${version}.osx.opt.tools.zip zip -q ../release/editor_osx_bs${version_snake_cased}.zip ./pandemonium.bs${version}.osx.opt.tools.zip
zip -q ../release/pandemonium.bs${version}.android_editor.zip ./pandemonium.bs${version}.android_editor.apk
zip -q ../release/export_templates_bs${version_snake_cased}.zip ./export_templates_bs${version_snake_cased}/* zip -q ../release/export_templates_bs${version_snake_cased}.zip ./export_templates_bs${version_snake_cased}/*
#mv ../release/export_templates_bs${version_snake_cased}.zip ../release/export_templates_bs${version_snake_cased}.tpz
zip -q -r ../release/broken_seals${version_snake_cased}_full_source.zip ./broken_seals${version_snake_cased}_full_source/* zip -q -r ../release/broken_seals${version_snake_cased}_full_source.zip ./broken_seals${version_snake_cased}_full_source/*
zip -q -r ../release/broken_seals${version_snake_cased}_game_source.zip ./broken_seals${version_snake_cased}_game_source/* zip -q -r ../release/broken_seals${version_snake_cased}_game_source.zip ./broken_seals${version_snake_cased}_game_source/*

View File

@ -1,23 +1,25 @@
engine_repository = [ ['https://github.com/Relintai/godot.git', 'git@github.com:Relintai/godot.git'], 'engine', '' ]
pandemonium_branch = 'master'
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/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/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/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/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/props_2d.git', 'git@github.com:Relintai/props_2d.git'], 'props_2d', '' ],
[ ['https://github.com/Relintai/props_2d.git', 'git@github.com:Relintai/props_2d.git'], 'props_2d', '' ], #[ ['https://github.com/Relintai/terraman_2d.git', 'git@github.com:Relintai/terraman_2d.git'], 'terraman_2d', '' ],
[ ['https://github.com/Relintai/terraman_2d.git', 'git@github.com:Relintai/terraman_2d.git'], 'terraman_2d', '' ],
] ]
removed_modules = [ removed_modules = [
[ ['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', '' ],
[ ['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/rtile_map.git', 'git@github.com:Relintai/rtile_map.git'], 'rtile_map', '' ], #[ ['https://github.com/Relintai/rtile_map.git', 'git@github.com:Relintai/rtile_map.git'], 'rtile_map', '' ],
] ]
addon_repositories = [ addon_repositories = [
@ -26,6 +28,4 @@ addon_repositories = [
third_party_addon_repositories = [ third_party_addon_repositories = [
] ]
godot_branch = '3.x'
slim_args = 'module_webm_enabled=no module_arkit_enabled=no module_visual_script_enabled=no module_gdnative_enabled=no module_mobile_vr_enabled=no module_theora_enabled=no module_xatlas_unwrap_enabled=no no_editor_splash=yes module_bullet_enabled=no module_camera_enabled=no module_csg_enabled=no module_denoise_enabled=no module_fbx_enabled=no module_gridmap_enabled=no module_hdr_enabled=no module_lightmapper_cpu_enabled=no module_raycast_enabled=no module_recast_enabled=no module_vhacd_enabled=no module_webxr_enabled=no' slim_args = 'module_webm_enabled=no module_arkit_enabled=no module_visual_script_enabled=no module_gdnative_enabled=no module_mobile_vr_enabled=no module_theora_enabled=no module_xatlas_unwrap_enabled=no no_editor_splash=yes module_bullet_enabled=no module_camera_enabled=no module_csg_enabled=no module_denoise_enabled=no module_fbx_enabled=no module_gridmap_enabled=no module_hdr_enabled=no module_lightmapper_cpu_enabled=no module_raycast_enabled=no module_recast_enabled=no module_vhacd_enabled=no module_webxr_enabled=no'

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/pandemonium.x11.opt.tools.64 ./pandemonium_engine/bin/run.pandemonium.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.pandemonium.x11.opt.tools.64 -v --path ./game/

View File

@ -1,126 +0,0 @@
#!/bin/bash
set -e
podman=`which podman || true`
if [ -z $podman ]; then
echo "podman needs to be in PATH for this script to work."
exit 1
fi
project_root=$(pwd)/
img_version=bs
mkdir -p logs
#sudo podman run -i -t -v $(pwd)/files:/root/files godot-osx:bs /bin/bash
#sudo podman run -i -t -v $(pwd)/:/root/project -w /root/project godot-osx:bs /bin/bash
#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
$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
#$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
$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
$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
$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
#$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
$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
$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
$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
$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
$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
$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
$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
#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
$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
$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
$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
$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
$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
#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
# $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
# Check files
cd ./engine/bin/
files=(
# Windows
"godot.windows.opt.64.exe"
"godot.windows.opt.debug.64.exe"
"godot.windows.opt.tools.64.exe"
# Linux
"godot.x11.opt.64"
"godot.x11.opt.debug.64"
"godot.x11.opt.tools.64"
# JS
"godot.javascript.opt.tools.threads.zip"
"godot.javascript.opt.zip"
# Android
"android_debug.apk"
"android_release.apk"
# OSX
"godot.osx.opt.arm64"
"godot.osx.opt.debug.arm64"
"godot.osx.opt.debug.universal"
"godot.osx.opt.debug.x86_64"
"godot.osx.opt.tools.arm64"
"godot.osx.opt.tools.universal"
"godot.osx.opt.tools.x86_64"
"godot.osx.opt.universal"
"godot.osx.opt.x86_64"
)
error=0
for f in ${files[*]}
do
if [ ! -e $f ]; then
error=1
echo "$f is not present!"
fi
done
if [ $error -eq 0 ]; then
echo "All files are present!"
fi
cd ../..