mirror of
https://github.com/Relintai/broken_seals_2ds.git
synced 2024-11-22 03:07:17 +01:00
Switched to the pandemonium engine, and added the new project setup script.
This commit is contained in:
parent
16fb1849d7
commit
26f8ba1cc7
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,4 +1,5 @@
|
|||||||
engine
|
engine
|
||||||
|
pandemonium_engine
|
||||||
modules/*
|
modules/*
|
||||||
ignore/*
|
ignore/*
|
||||||
|
|
||||||
|
2
HEADS
2
HEADS
@ -1 +1 @@
|
|||||||
{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "cdd4f2722a7c16d9e36521d7180cc80715591554"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3c334566ff05a74e913cd5c5ff38ae45aba5f5d2"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "c401b7a027248158dae3fbce20d637d34eaaedb9"}, "mesh_data_resource": {"master": "2bf76b8d07c2821161886ea4ea6edc788ec2ee51"}, "mesh_utils": {"master": "902dae29797789d406faf256a22aa73b7f6d5261"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "b547515ae3817b0088e2cf499af59c8f1dee7189"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}}
|
{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "cdd4f2722a7c16d9e36521d7180cc80715591554"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3c334566ff05a74e913cd5c5ff38ae45aba5f5d2"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "c401b7a027248158dae3fbce20d637d34eaaedb9"}, "mesh_data_resource": {"master": "2bf76b8d07c2821161886ea4ea6edc788ec2ee51"}, "mesh_utils": {"master": "902dae29797789d406faf256a22aa73b7f6d5261"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "b547515ae3817b0088e2cf499af59c8f1dee7189"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "f659bfe561d7177cd5baaf264893fe5f10539c13"}}
|
539
SConstruct
539
SConstruct
@ -21,78 +21,49 @@
|
|||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
# SOFTWARE.
|
# SOFTWARE.
|
||||||
|
|
||||||
EnsureSConsVersion(0, 98, 1)
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import json
|
import json
|
||||||
import shutil
|
import sys
|
||||||
import traceback
|
|
||||||
|
|
||||||
import module_config
|
import module_config
|
||||||
|
|
||||||
repository_index = 0
|
repository_index = 0
|
||||||
module_clone_path = '/modules/'
|
|
||||||
clone_command = 'git clone {0} {1}'
|
clone_command = 'git clone {0} {1}'
|
||||||
|
|
||||||
visual_studio_call_vcvarsall = False
|
|
||||||
visual_studio_vcvarsall_path = 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat'
|
|
||||||
visual_studio_arch = 'amd64'
|
|
||||||
|
|
||||||
exports = {
|
|
||||||
'global': [],
|
|
||||||
'linux': [],
|
|
||||||
'windows': [],
|
|
||||||
'android': [],
|
|
||||||
'javascript': [],
|
|
||||||
}
|
|
||||||
|
|
||||||
additional_commands = {
|
|
||||||
'global': [],
|
|
||||||
'linux': [],
|
|
||||||
'windows': [],
|
|
||||||
'android': [],
|
|
||||||
'javascript': [],
|
|
||||||
}
|
|
||||||
|
|
||||||
target_commits = {}
|
target_commits = {}
|
||||||
|
|
||||||
def onerror(func, path, exc_info):
|
def setup_repository(data, clone_path, branch = 'master'):
|
||||||
"""
|
cwd = os.getcwd()
|
||||||
https://stackoverflow.com/questions/2656322/shutil-rmtree-fails-on-windows-with-access-is-denied
|
|
||||||
|
|
||||||
Because Windows.
|
full_path = cwd + clone_path + data[1] + '/'
|
||||||
|
|
||||||
Error handler for ``shutil.rmtree``.
|
if not os.path.isdir(full_path):
|
||||||
|
os.chdir(cwd + clone_path)
|
||||||
|
|
||||||
If the error is due to an access error (read only file)
|
subprocess.call(clone_command.format(data[0][repository_index], data[1]), shell=True)
|
||||||
it attempts to add write permission and then retries.
|
|
||||||
|
|
||||||
If the error is for another reason it re-raises the error.
|
os.chdir(full_path)
|
||||||
|
|
||||||
Usage : ``shutil.rmtree(path, onerror=onerror)``
|
subprocess.call('git reset', shell=True)
|
||||||
"""
|
subprocess.call('git reset --hard', shell=True)
|
||||||
import stat
|
subprocess.call('git clean -f -d', shell=True)
|
||||||
if not os.access(path, os.W_OK):
|
subprocess.call('git checkout -B ' + branch + ' origin/' + branch, shell=True)
|
||||||
# Is the error an access error ?
|
subprocess.call('git pull origin ' + branch, shell=True)
|
||||||
os.chmod(path, stat.S_IWUSR)
|
subprocess.call('git reset', shell=True)
|
||||||
func(path)
|
subprocess.call('git reset --hard', shell=True)
|
||||||
else:
|
|
||||||
raise
|
|
||||||
|
|
||||||
def load_target_commits_array():
|
target = ""
|
||||||
global target_commits
|
|
||||||
|
|
||||||
if os.path.isfile('./HEADS'):
|
if data[1] in target_commits:
|
||||||
with open('./HEADS', 'r') as infile:
|
target = target_commits[data[1]][branch]
|
||||||
target_commits = json.load(infile)
|
|
||||||
else:
|
subprocess.call('git checkout -B ' + branch + ' ' + target, shell=True)
|
||||||
target_commits = {}
|
subprocess.call('git clean -f -d', shell=True)
|
||||||
|
subprocess.call('git reset', shell=True)
|
||||||
|
subprocess.call('git reset --hard', shell=True)
|
||||||
|
|
||||||
|
os.chdir(cwd)
|
||||||
|
|
||||||
def save_target_commits_array():
|
|
||||||
with open('./HEADS', 'w') as outfile:
|
|
||||||
json.dump(target_commits, outfile)
|
|
||||||
|
|
||||||
def update_repository(data, clone_path, branch = 'master'):
|
def update_repository(data, clone_path, branch = 'master'):
|
||||||
cwd = os.getcwd()
|
cwd = os.getcwd()
|
||||||
@ -125,55 +96,6 @@ def update_repository(data, clone_path, branch = 'master'):
|
|||||||
|
|
||||||
os.chdir(cwd)
|
os.chdir(cwd)
|
||||||
|
|
||||||
def setup_repository(data, clone_path, branch = 'master'):
|
|
||||||
cwd = os.getcwd()
|
|
||||||
|
|
||||||
full_path = cwd + clone_path + data[1] + '/'
|
|
||||||
|
|
||||||
if not os.path.isdir(full_path):
|
|
||||||
os.chdir(cwd + clone_path)
|
|
||||||
|
|
||||||
subprocess.call(clone_command.format(data[0][repository_index], data[1]), shell=True)
|
|
||||||
|
|
||||||
os.chdir(full_path)
|
|
||||||
|
|
||||||
subprocess.call('git reset', shell=True)
|
|
||||||
subprocess.call('git reset --hard', shell=True)
|
|
||||||
subprocess.call('git clean -f -d', shell=True)
|
|
||||||
subprocess.call('git checkout -B ' + branch + ' origin/' + branch, shell=True)
|
|
||||||
subprocess.call('git pull origin ' + branch, shell=True)
|
|
||||||
subprocess.call('git reset', shell=True)
|
|
||||||
subprocess.call('git reset --hard', shell=True)
|
|
||||||
|
|
||||||
if data[1] in target_commits:
|
|
||||||
target = target_commits[data[1]][branch]
|
|
||||||
|
|
||||||
subprocess.call('git checkout -B ' + branch + ' ' + target, shell=True)
|
|
||||||
subprocess.call('git clean -f -d', shell=True)
|
|
||||||
subprocess.call('git reset', shell=True)
|
|
||||||
subprocess.call('git reset --hard', shell=True)
|
|
||||||
|
|
||||||
os.chdir(cwd)
|
|
||||||
|
|
||||||
def copy_repository(data, target_folder, clone_path):
|
|
||||||
copytree(os.path.abspath(clone_path + data[1] + '/' + data[2]), os.path.abspath(target_folder + data[1]))
|
|
||||||
|
|
||||||
def copytree(src, dst):
|
|
||||||
for item in os.listdir(src):
|
|
||||||
sp = os.path.join(src, item)
|
|
||||||
dp = os.path.join(dst, item)
|
|
||||||
|
|
||||||
if os.path.isdir(sp):
|
|
||||||
if os.path.isdir(dp):
|
|
||||||
shutil.rmtree(dp, onerror=onerror)
|
|
||||||
|
|
||||||
shutil.copytree(sp, dp)
|
|
||||||
else:
|
|
||||||
if not os.path.isdir(dst):
|
|
||||||
os.makedirs(dst)
|
|
||||||
|
|
||||||
shutil.copy2(sp, dp)
|
|
||||||
|
|
||||||
def validate_repository_origin(data, clone_path, branch = 'master'):
|
def validate_repository_origin(data, clone_path, branch = 'master'):
|
||||||
full_path = os.path.abspath(clone_path)
|
full_path = os.path.abspath(clone_path)
|
||||||
|
|
||||||
@ -223,406 +145,29 @@ def validate_repository_origin(data, clone_path, branch = 'master'):
|
|||||||
|
|
||||||
os.chdir(cwd)
|
os.chdir(cwd)
|
||||||
|
|
||||||
def remove_repository(data, target_folder):
|
|
||||||
folder = os.path.abspath(target_folder + data[1])
|
|
||||||
|
|
||||||
if os.path.isdir(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():
|
|
||||||
for rep in module_config.module_repositories:
|
|
||||||
update_repository(rep, module_clone_path)
|
|
||||||
copy_repository(rep, './engine/modules/', '.' + module_clone_path)
|
|
||||||
|
|
||||||
def update_addons():
|
|
||||||
for rep in module_config.addon_repositories:
|
|
||||||
update_repository(rep, module_clone_path)
|
|
||||||
copy_repository(rep, './game/addons/', '.' + module_clone_path)
|
|
||||||
|
|
||||||
def update_addons_third_party_addons():
|
|
||||||
for rep in module_config.third_party_addon_repositories:
|
|
||||||
update_repository(rep, module_clone_path)
|
|
||||||
copy_repository(rep, './game/addons/', '.' + module_clone_path)
|
|
||||||
|
|
||||||
def update_all():
|
|
||||||
update_engine()
|
|
||||||
update_modules()
|
|
||||||
update_addons()
|
|
||||||
update_addons_third_party_addons()
|
|
||||||
|
|
||||||
save_target_commits_array()
|
|
||||||
|
|
||||||
|
|
||||||
def setup_engine():
|
|
||||||
validate_repository_origin(module_config.engine_repository, './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)
|
|
||||||
|
|
||||||
for rep in module_config.removed_modules:
|
|
||||||
remove_repository(rep, './engine/modules/')
|
|
||||||
|
|
||||||
|
|
||||||
def setup_addons():
|
|
||||||
for rep in module_config.addon_repositories:
|
|
||||||
setup_repository(rep, module_clone_path)
|
|
||||||
copy_repository(rep, './game/addons/', '.' + module_clone_path)
|
|
||||||
|
|
||||||
def setup_addons_third_party_addons():
|
|
||||||
for rep in module_config.third_party_addon_repositories:
|
|
||||||
setup_repository(rep, module_clone_path)
|
|
||||||
copy_repository(rep, './game/addons/', '.' + module_clone_path)
|
|
||||||
|
|
||||||
def setup_all():
|
|
||||||
setup_engine()
|
|
||||||
setup_modules()
|
|
||||||
setup_addons()
|
|
||||||
setup_addons_third_party_addons()
|
|
||||||
|
|
||||||
def format_path(path):
|
|
||||||
if 'win' in sys.platform:
|
|
||||||
path = path.replace('/', '\\')
|
|
||||||
path = path.replace('~', '%userprofile%')
|
|
||||||
|
|
||||||
return path
|
|
||||||
|
|
||||||
def get_exports_for(platform):
|
|
||||||
export_command = 'export '
|
|
||||||
command_separator = ';'
|
|
||||||
|
|
||||||
if 'win' in sys.platform:
|
|
||||||
command_separator = '&'
|
|
||||||
export_command = 'set '
|
|
||||||
|
|
||||||
command = ''
|
|
||||||
|
|
||||||
for p in exports[platform]:
|
|
||||||
command += export_command + p + command_separator
|
|
||||||
|
|
||||||
return command
|
|
||||||
|
|
||||||
def get_additional_commands_for(platform):
|
|
||||||
command_separator = ';'
|
|
||||||
|
|
||||||
if 'win' in sys.platform:
|
|
||||||
command_separator = '&'
|
|
||||||
|
|
||||||
command = ''
|
|
||||||
|
|
||||||
for p in additional_commands[platform]:
|
|
||||||
command += p + command_separator
|
|
||||||
|
|
||||||
return command
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def parse_config():
|
|
||||||
global visual_studio_vcvarsall_path
|
|
||||||
global visual_studio_arch
|
|
||||||
global visual_studio_call_vcvarsall
|
|
||||||
global exports
|
|
||||||
|
|
||||||
if not os.path.isfile('build.config'):
|
|
||||||
return
|
|
||||||
|
|
||||||
with open('build.config', 'r') as f:
|
|
||||||
|
|
||||||
for line in f:
|
|
||||||
ls = line.strip()
|
|
||||||
if ls == '' or ls.startswith('#'):
|
|
||||||
continue
|
|
||||||
|
|
||||||
words = line.split()
|
|
||||||
|
|
||||||
if (len(words) < 2):
|
|
||||||
print('This build.config line is malformed, and got ignored: ' + ls)
|
|
||||||
continue
|
|
||||||
|
|
||||||
if words[0] == 'visual_studio_vcvarsall_path':
|
|
||||||
visual_studio_vcvarsall_path = format_path(ls[29:])
|
|
||||||
elif words[0] == 'visual_studio_arch':
|
|
||||||
visual_studio_arch = format_path(ls[19:])
|
|
||||||
elif words[0] == 'visual_studio_call_vcvarsall':
|
|
||||||
visual_studio_call_vcvarsall = words[1].lower() in [ 'true', '1', 't', 'y', 'yes' ]
|
|
||||||
elif words[0] == 'export':
|
|
||||||
if (len(words) < 3) or not words[1] in exports:
|
|
||||||
print('This build.config line is malformed, and got ignored: ' + ls)
|
|
||||||
continue
|
|
||||||
|
|
||||||
export_path = format_path(ls[8 + len(words[1]):])
|
|
||||||
|
|
||||||
exports[words[1]].append(export_path)
|
|
||||||
elif words[0] == 'run':
|
|
||||||
if (len(words) < 3) or not words[1] in additional_commands:
|
|
||||||
print('This build.config line is malformed, and got ignored: ' + ls)
|
|
||||||
continue
|
|
||||||
|
|
||||||
final_cmd = format_path(ls[5 + len(words[1]):])
|
|
||||||
|
|
||||||
additional_commands[words[1]].append(final_cmd)
|
|
||||||
|
|
||||||
parse_config()
|
|
||||||
|
|
||||||
env = Environment()
|
|
||||||
|
|
||||||
if len(sys.argv) > 1:
|
|
||||||
|
|
||||||
arg = sys.argv[1]
|
|
||||||
|
|
||||||
arg_split = arg.split('_')
|
|
||||||
arg = arg_split[0]
|
|
||||||
arg_split = arg_split[1:]
|
|
||||||
|
|
||||||
if arg[0] == 'b':
|
|
||||||
build_string = get_exports_for('global') + get_additional_commands_for('global') + 'scons '
|
|
||||||
|
|
||||||
build_string += 'tools='
|
|
||||||
if 'e' in arg:
|
|
||||||
build_string += 'yes'
|
|
||||||
else:
|
|
||||||
build_string += 'no'
|
|
||||||
build_string += ' '
|
|
||||||
|
|
||||||
build_string += 'target='
|
|
||||||
if 'r' in arg:
|
|
||||||
build_string += 'release'
|
|
||||||
elif 'd' in arg:
|
|
||||||
build_string += 'debug'
|
|
||||||
else:
|
|
||||||
build_string += 'release_debug'
|
|
||||||
build_string += ' '
|
|
||||||
|
|
||||||
build_string += 'custom_modules_shared='
|
|
||||||
if 's' in arg:
|
|
||||||
build_string += 'yes'
|
|
||||||
else:
|
|
||||||
build_string += 'no'
|
|
||||||
build_string += ' '
|
|
||||||
|
|
||||||
if 'm' in arg:
|
|
||||||
build_string += 'use_mingw=yes'
|
|
||||||
else:
|
|
||||||
if 'win' in sys.platform and visual_studio_call_vcvarsall:
|
|
||||||
build_string = 'call "{0}" {1}&'.format(visual_studio_vcvarsall_path, visual_studio_arch) + build_string
|
|
||||||
|
|
||||||
if 'o' in arg:
|
|
||||||
build_string += 'use_llvm=yes'
|
|
||||||
|
|
||||||
if 'v' in arg:
|
|
||||||
build_string += 'vsproj=yes'
|
|
||||||
|
|
||||||
for i in range(2, len(sys.argv)):
|
|
||||||
build_string += ' ' + sys.argv[i] + ' '
|
|
||||||
|
|
||||||
if 'slim' in arg_split:
|
|
||||||
build_string += module_config.slim_args
|
|
||||||
build_string += ' '
|
|
||||||
|
|
||||||
if 'latomic' in arg_split:
|
|
||||||
build_string += 'LINKFLAGS="-latomic"'
|
|
||||||
build_string += ' '
|
|
||||||
|
|
||||||
if 'strip' in arg_split:
|
|
||||||
build_string += 'debug_symbols=no'
|
|
||||||
build_string += ' '
|
|
||||||
|
|
||||||
target = ' '
|
|
||||||
|
|
||||||
if 'E' in arg:
|
|
||||||
target += 'bin/libess.x11.opt.tools.64.so'
|
|
||||||
elif 'T' in arg:
|
|
||||||
target += 'bin/libtexture_packer.x11.opt.tools.64.so'
|
|
||||||
elif 'V' in arg:
|
|
||||||
target += 'bin/libvoxelman.x11.opt.tools.64.so'
|
|
||||||
elif 'W' in arg:
|
|
||||||
target += 'bin/libworld_generator.x11.opt.tools.64.so'
|
|
||||||
elif 'P' in arg:
|
|
||||||
target += 'bin/libprocedural_animations.x11.opt.tools.64.so'
|
|
||||||
|
|
||||||
cwd = os.getcwd()
|
|
||||||
full_path = cwd + '/engine/'
|
|
||||||
|
|
||||||
if not os.path.isdir(full_path):
|
|
||||||
print('engine directory doesnt exists.')
|
|
||||||
exit()
|
|
||||||
|
|
||||||
os.chdir(full_path)
|
|
||||||
|
|
||||||
if 'l' in arg:
|
|
||||||
build_string += 'platform=x11'
|
|
||||||
|
|
||||||
build_string = get_exports_for('linux') + get_additional_commands_for('linux') + build_string + target
|
|
||||||
|
|
||||||
print('Running command: ' + build_string)
|
|
||||||
|
|
||||||
subprocess.call(build_string, shell=True)
|
|
||||||
elif 'w' in arg:
|
|
||||||
build_string += 'platform=windows'
|
|
||||||
|
|
||||||
build_string = get_exports_for('windows') + get_additional_commands_for('windows') + build_string
|
|
||||||
|
|
||||||
print('Running command: ' + build_string)
|
|
||||||
|
|
||||||
subprocess.call(build_string, shell=True)
|
|
||||||
elif 'a' in arg:
|
|
||||||
build_string += 'platform=android'
|
|
||||||
|
|
||||||
build_string = get_exports_for('android') + get_additional_commands_for('android') + build_string
|
|
||||||
|
|
||||||
print('Running command: ' + build_string + ' android_arch=armv7')
|
|
||||||
subprocess.call(build_string + ' android_arch=armv7', shell=True)
|
|
||||||
print('Running command: ' + build_string + ' android_arch=arm64v8')
|
|
||||||
subprocess.call(build_string + ' android_arch=arm64v8', shell=True)
|
|
||||||
print('Running command: ' + build_string + ' android_arch=x86')
|
|
||||||
subprocess.call(build_string + ' android_arch=x86', shell=True)
|
|
||||||
|
|
||||||
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')
|
|
||||||
subprocess.call(get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generateGodotTemplates', shell=True)
|
|
||||||
elif 'j' in arg:
|
|
||||||
build_string += 'platform=javascript'
|
|
||||||
|
|
||||||
build_string = get_exports_for('javascript') + get_additional_commands_for('javascript') + build_string
|
|
||||||
|
|
||||||
print('Running command: ' + build_string)
|
|
||||||
subprocess.call(build_string, shell=True)
|
|
||||||
elif 'i' in arg:
|
|
||||||
build_string += 'platform=iphone'
|
|
||||||
|
|
||||||
subprocess.call(build_string + ' arch=arm', shell=True)
|
|
||||||
subprocess.call(build_string + ' arch=arm64', shell=True)
|
|
||||||
|
|
||||||
#subprocess.call('lipo -create bin/libgodot.iphone.{0}.arm.a bin/libgodot.iphone.{0}.arm64.a -output bin/libgodot.iphone.{1}.fat.a'.fomat(), shell=True)
|
|
||||||
|
|
||||||
#lipo -create bin/libgodot.iphone.opt.debug.arm.a bin/libgodot.iphone.opt.debug.arm64.a -output bin/libgodot.iphone.debug.fat.a
|
|
||||||
#rm bin/ios_xcode/libgodot.iphone.debug.fat.a
|
|
||||||
#cp bin/libgodot.iphone.debug.fat.a bin/ios_xcode/libgodot.iphone.debug.fat.a
|
|
||||||
|
|
||||||
#lipo -create bin/libgodot.iphone.opt.arm.a bin/libgodot.iphone.opt.arm64.a -output bin/libgodot.iphone.release.fat.a
|
|
||||||
#rm bin/ios_xcode/libgodot.iphone.release.fat.a
|
|
||||||
#cp bin/libgodot.iphone.release.fat.a bin/ios_xcode/libgodot.iphone.release.fat.a
|
|
||||||
|
|
||||||
subprocess.call('rm bin/iphone.zip', shell=True)
|
|
||||||
#cd bin/ios_xcode
|
|
||||||
subprocess.call(build_string + ' arch=arm64', shell=True)
|
|
||||||
subprocess.call('zip -r -X ../iphone.zip .', shell=True)
|
|
||||||
|
|
||||||
else:
|
|
||||||
print('No platform specified')
|
|
||||||
exit()
|
|
||||||
|
|
||||||
exit()
|
|
||||||
elif arg[0] == 'p':
|
|
||||||
if arg == 'p':
|
|
||||||
print("Applies a patch. No Patches right now.Append s for the skeleton editor patch. For example: ps ")
|
|
||||||
exit()
|
|
||||||
|
|
||||||
cwd = os.getcwd()
|
|
||||||
full_path = cwd + '/engine/'
|
|
||||||
|
|
||||||
if not os.path.isdir(full_path):
|
|
||||||
print('engine directory does not exists.')
|
|
||||||
exit()
|
|
||||||
|
|
||||||
os.chdir(full_path)
|
|
||||||
|
|
||||||
#apply the patch to just the working directory, without creating a commit
|
|
||||||
|
|
||||||
if 's' in arg:
|
|
||||||
subprocess.call('git apply --index ../patches/custom_skeleton_3d_editor_plugin.patch', shell=True)
|
|
||||||
|
|
||||||
#unstage all files
|
|
||||||
subprocess.call('git reset', shell=True)
|
|
||||||
|
|
||||||
vman_full_path = cwd + '/engine/modules/voxelman/'
|
|
||||||
|
|
||||||
#also patch voxelman as the plugin changes forward_spatial_gui_input's definition
|
|
||||||
if os.path.isdir(vman_full_path):
|
|
||||||
os.chdir(vman_full_path)
|
|
||||||
|
|
||||||
subprocess.call('git apply --index ../../../patches/fix-voxel-editor-after-the-skeleton-editor-patch.patch', shell=True)
|
|
||||||
|
|
||||||
#unstage all files
|
|
||||||
subprocess.call('git reset', shell=True)
|
|
||||||
else:
|
|
||||||
print('Voxelman directory does not exists, skipping patch.')
|
|
||||||
|
|
||||||
|
|
||||||
|
engine_abspath = os.path.abspath(module_config.engine_repository[1])
|
||||||
|
|
||||||
|
if not os.path.isdir(engine_abspath):
|
||||||
|
if not os.path.isfile('./HEADS'):
|
||||||
|
print("Error! HEADS file doesn't exists! Exiting.")
|
||||||
exit()
|
exit()
|
||||||
|
|
||||||
opts = Variables(args=ARGUMENTS)
|
with open('./HEADS', 'r') as infile:
|
||||||
|
target_commits = json.load(infile)
|
||||||
|
|
||||||
opts.Add('a', 'What to do', '')
|
if 'repository_type=ssh' in sys.argv:
|
||||||
opts.Add(EnumVariable('action', 'What to do', 'setup', ('setup', 'update')))
|
repository_index = 1
|
||||||
opts.Add('t', 'Action target', '')
|
|
||||||
opts.Add(EnumVariable('target', 'Action target', 'all', ('all', 'engine', 'modules', 'all_addons', 'addons', 'third_party_addons')))
|
|
||||||
opts.Add(EnumVariable('repository_type', 'Type of repositories to clone from first', 'http', ('http', 'ssh')))
|
|
||||||
|
|
||||||
opts.Update(env)
|
setup_repository(module_config.engine_repository, '/', module_config.pandemonium_branch)
|
||||||
Help(opts.GenerateHelpText(env))
|
else:
|
||||||
|
if not os.path.isfile('pandemonium_engine/misc/scripts_app/SConstruct'):
|
||||||
load_target_commits_array()
|
|
||||||
|
|
||||||
rt = env['repository_type']
|
|
||||||
|
|
||||||
if rt == 'ssh':
|
|
||||||
repository_index = 1
|
|
||||||
|
|
||||||
action = env['action']
|
|
||||||
target = env['target']
|
|
||||||
|
|
||||||
if env['a']:
|
|
||||||
action = env['a']
|
|
||||||
|
|
||||||
if env['t']:
|
|
||||||
target = env['t']
|
|
||||||
|
|
||||||
if not os.path.isdir('./modules'):
|
|
||||||
os.mkdir('./modules')
|
|
||||||
|
|
||||||
if 'm' in action:
|
|
||||||
godot_branch = 'master'
|
|
||||||
|
|
||||||
if 'setup' in action or action[0] == 's':
|
|
||||||
if target == 'all':
|
|
||||||
setup_all()
|
|
||||||
elif target == 'engine':
|
|
||||||
setup_engine()
|
|
||||||
elif target == 'modules':
|
|
||||||
setup_modules()
|
|
||||||
elif target == 'all_addons':
|
|
||||||
setup_addons()
|
|
||||||
setup_addons_third_party_addons()
|
|
||||||
elif target == 'addons':
|
|
||||||
setup_addons()
|
|
||||||
elif target == 'third_party_addons':
|
|
||||||
setup_addons_third_party_addons()
|
|
||||||
elif 'update' in action or action[0] == 'u':
|
|
||||||
if target == 'all':
|
|
||||||
update_all()
|
|
||||||
elif target == 'engine':
|
|
||||||
update_engine()
|
update_engine()
|
||||||
save_target_commits_array()
|
|
||||||
elif target == 'modules':
|
|
||||||
update_modules()
|
SConscript("pandemonium_engine/misc/scripts_app/SConstruct")
|
||||||
save_target_commits_array()
|
|
||||||
elif target == 'all_addons':
|
|
||||||
update_addons()
|
|
||||||
update_addons_third_party_addons()
|
|
||||||
save_target_commits_array()
|
|
||||||
elif target == 'addons':
|
|
||||||
update_addons()
|
|
||||||
save_target_commits_array()
|
|
||||||
elif target == 'third_party_addons':
|
|
||||||
update_addons_third_party_addons()
|
|
||||||
save_target_commits_array()
|
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -1,39 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
project_root=$(pwd)
|
|
||||||
|
|
||||||
rm -Rf ./export
|
|
||||||
|
|
||||||
mkdir export
|
|
||||||
mkdir export/broken_seals_android_release
|
|
||||||
mkdir export/broken_seals_android_debug
|
|
||||||
mkdir export/broken_seals_linux
|
|
||||||
mkdir export/broken_seals_windows
|
|
||||||
mkdir export/broken_seals_javascript
|
|
||||||
mkdir export/broken_seals_pi4
|
|
||||||
mkdir export/export_templates
|
|
||||||
|
|
||||||
./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export-debug Android-Release ${project_root}/export/broken_seals_android_release/broken_seals.apk
|
|
||||||
./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export-debug Android ${project_root}/export/broken_seals_android_debug/broken_seals_debug.apk
|
|
||||||
./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export Linux/X11 ${project_root}/export/broken_seals_linux/broken_seals_x11
|
|
||||||
./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export "Windows Desktop" ${project_root}/export/broken_seals_windows/broken_seals.exe
|
|
||||||
./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export HTML5 ${project_root}/export/broken_seals_javascript/broken_seals.html
|
|
||||||
./engine/bin/godot.x11.opt.tools.64 --path ./game/ --export PI4/X11 ${project_root}/export/broken_seals_pi4/broken_seals_pi4
|
|
||||||
|
|
||||||
cp ./engine/bin/godot.windows.opt.tools.64.exe ${project_root}/export/godot.bs.windows.opt.tools.64.exe
|
|
||||||
cp ./engine/bin/godot.x11.opt.tools.64 ${project_root}/export/godot.bs.x11.opt.tools.64
|
|
||||||
cp ./engine/bin/godot.x11.pi4.opt.tools.32 ${project_root}/export/godot.bs.x11.pi4.opt.tools.32
|
|
||||||
|
|
||||||
cp ./engine/bin/android_debug.apk ${project_root}/export/export_templates/android_debug.apk
|
|
||||||
cp ./engine/bin/android_release.apk ${project_root}/export/export_templates/android_release.apk
|
|
||||||
cp ./engine/bin/godot.javascript.opt.debug.zip ${project_root}/export/export_templates/godot.javascript.opt.debug.zip
|
|
||||||
cp ./engine/bin/godot.javascript.opt.zip ${project_root}/export/export_templates/godot.javascript.opt.zip
|
|
||||||
cp ./engine/bin/godot.windows.opt.64.exe ${project_root}/export/export_templates/godot.windows.opt.64.exe
|
|
||||||
cp ./engine/bin/godot.windows.opt.debug.64.exe ${project_root}/export/export_templates/godot.windows.opt.debug.64.exe
|
|
||||||
cp ./engine/bin/godot.x11.opt.64 ${project_root}/export/export_templates/godot.x11.opt.64
|
|
||||||
cp ./engine/bin/godot.x11.opt.debug.64 ${project_root}/export/export_templates/godot.x11.opt.debug.64
|
|
||||||
cp ./engine/bin/godot.x11.pi4.opt.32 ${project_root}/export/export_templates/godot.x11.pi4.opt.32
|
|
||||||
cp ./engine/bin/godot.x11.pi4.opt.debug.32 ${project_root}/export/export_templates/godot.x11.pi4.opt.debug.32
|
|
||||||
|
|
||||||
|
|
@ -9,337 +9,223 @@
|
|||||||
config_version=4
|
config_version=4
|
||||||
|
|
||||||
_global_script_classes=[ {
|
_global_script_classes=[ {
|
||||||
"base": "Reference",
|
|
||||||
"class": "BrushPrefabs",
|
|
||||||
"language": "GDScript",
|
|
||||||
"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",
|
|
||||||
"class": "GEAction",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Action.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GEBrighten",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Brighten.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GEBrush",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Brush.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GEBucket",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Bucket.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Control",
|
|
||||||
"class": "GECanvas",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/Canvas.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GECut",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Cut.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GEDarken",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Darken.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Reference",
|
|
||||||
"class": "GELayer",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/Layer.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GELine",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Line.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GEMultiLine",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/MultiLine.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GEPasteCut",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/PasteCut.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GEPencil",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Pencil.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GERainbow",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Rainbow.gd"
|
|
||||||
}, {
|
|
||||||
"base": "GEAction",
|
|
||||||
"class": "GERect",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/Godoxel/actions/Rect.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Node",
|
|
||||||
"class": "GEUtils",
|
|
||||||
"language": "GDScript",
|
|
||||||
"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://texture_tools/LayeredTextureMaker.gd"
|
"path": "res://texture_tools/LayeredTextureMaker.gd"
|
||||||
}, {
|
}, {
|
||||||
"base": "Resource",
|
|
||||||
"class": "MMMateial",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/mat_maker_gd/nodes/mm_material.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Resource",
|
|
||||||
"class": "MMNode",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://addons/mat_maker_gd/nodes/mm_node.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Resource",
|
|
||||||
"class": "MMNodeUniversalProperty",
|
|
||||||
"language": "GDScript",
|
|
||||||
"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.gd"
|
"path": "res://scenes/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": "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": "",
|
@"LayeredTextureMaker": "",
|
||||||
"CharacterAtlas2D": "",
|
@"Palette": "",
|
||||||
"CharacterAtlasEntry2D": "",
|
@"CharacterAtlas2D": "",
|
||||||
"CharacterSkeketonAttachPoint": "",
|
@"CharacterSkeketonAttachPoint": "",
|
||||||
"CharacterSkeleton2DGD": "",
|
@"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png",
|
||||||
"ColorTile": "",
|
@"GameModule": "",
|
||||||
"Continent": "",
|
@"PlayerGD": "",
|
||||||
"DisplayPlayerGD": "",
|
@"WorldGeneratorSettings": "",
|
||||||
"EntityAIGD": "",
|
@"ItemVisual2D": "",
|
||||||
"EntityDataGD": "",
|
@"MobGD": "",
|
||||||
"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png",
|
@"PaletteImporter": "",
|
||||||
"GEAction": "",
|
@"PlayerMaster": "",
|
||||||
"GEBrighten": "",
|
@"SpeedResource": "",
|
||||||
"GEBrush": "",
|
@"CharacterAtlasEntry2D": "",
|
||||||
"GEBucket": "",
|
@"Continent": "",
|
||||||
"GECanvas": "",
|
@"EntityAIGD": "",
|
||||||
"GECut": "",
|
@"EntityDataGD": "",
|
||||||
"GEDarken": "",
|
@"WorldGenWorld": "",
|
||||||
"GELayer": "",
|
@"CharacterSkeleton2DGD": "",
|
||||||
"GELine": "",
|
@"ItemVisualEntry2D": "",
|
||||||
"GEMultiLine": "",
|
@"NetworkedPlayerGD": "",
|
||||||
"GEPasteCut": "",
|
@"SpellEffectVisualBasic": "",
|
||||||
"GEPencil": "",
|
@"SpellGD": "",
|
||||||
"GERainbow": "",
|
@"UIWindowModule": "",
|
||||||
"GERect": "",
|
@"Zone": "",
|
||||||
"GEUtils": "",
|
@"ColorTile": "",
|
||||||
"GameModule": "",
|
@"Main": "",
|
||||||
"HealthResource": "",
|
@"ManaResource": "",
|
||||||
"HumanoidCharacterBones2D": "",
|
@"Menu": "",
|
||||||
"ItemTemplateGD": "",
|
@"UIGuiChildModule": "",
|
||||||
"ItemVisual2D": "",
|
@"WorldGenBaseResource": "",
|
||||||
"ItemVisualEntry2D": "",
|
@"DisplayPlayerGD": "",
|
||||||
"LayeredTextureMaker": "",
|
@"HealthResource": "",
|
||||||
"MMMateial": "",
|
@"ItemTemplateGD": "",
|
||||||
"MMNode": "",
|
@"SubZone": "",
|
||||||
"MMNodeUniversalProperty": "",
|
@"HumanoidCharacterBones2D": ""
|
||||||
"Main": "",
|
|
||||||
"ManaResource": "",
|
|
||||||
"Menu": "",
|
|
||||||
"MobGD": "",
|
|
||||||
"NetworkedPlayerGD": "",
|
|
||||||
"Palette": "",
|
|
||||||
"PaletteImporter": "",
|
|
||||||
"PlayerGD": "",
|
|
||||||
"PlayerMaster": "",
|
|
||||||
"SpeedResource": "",
|
|
||||||
"SpellEffectVisualBasic": "",
|
|
||||||
"SpellGD": "",
|
|
||||||
"SubZone": "",
|
|
||||||
"UIGuiChildModule": "",
|
|
||||||
"UIWindowModule": "",
|
|
||||||
"WorldGenBaseResource": "",
|
|
||||||
"WorldGenWorld": "",
|
|
||||||
"WorldGeneratorSettings": "",
|
|
||||||
"Zone": ""
|
|
||||||
}
|
}
|
||||||
Node="input/actionbar_5_11"
|
Node="input/actionbar_5_11"
|
||||||
|
|
||||||
@ -383,7 +269,7 @@ window/size/ui_scale_touch=1.0
|
|||||||
|
|
||||||
[editor_plugins]
|
[editor_plugins]
|
||||||
|
|
||||||
enabled=PoolStringArray( "res://addons/Godoxel/plugin.cfg", "res://addons/color-palette/plugin.cfg", "res://addons/data_manager/plugin.cfg", "res://addons/mat_maker_gd/plugin.cfg", "res://addons/tile_generator/plugin.cfg", "res://addons/world_generator/plugin.cfg" )
|
enabled=PoolStringArray( "res://addons/color-palette/plugin.cfg", "res://addons/tile_generator/plugin.cfg", "res://addons/world_generator/plugin.cfg" )
|
||||||
|
|
||||||
[ess]
|
[ess]
|
||||||
|
|
||||||
@ -525,13 +411,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
|
@ -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
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[gd_scene load_steps=3 format=2]
|
[gd_scene load_steps=3 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://tilesets/tileset.tres" type="TileSet" id=1]
|
[ext_resource path="res://tilesets/tileset.tres" type="RTileSet" id=1]
|
||||||
[ext_resource path="res://world/WorldLayer.gd" type="Script" id=2]
|
[ext_resource path="res://world/WorldLayer.gd" type="Script" id=2]
|
||||||
|
|
||||||
|
|
||||||
|
6
ged.sh
6
ged.sh
@ -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/
|
||||||
|
6
leditor.sh
Executable file
6
leditor.sh
Executable file
@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
cp -u ./pandemonium_engine/bin/pandemonium.x11.opt.tools.64.llvm ./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64.llvm
|
||||||
|
|
||||||
|
export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/
|
||||||
|
./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64.llvm
|
6
lged.sh
Executable file
6
lged.sh
Executable file
@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
cp -u ./pandemonium_engine/bin/pandemonium.x11.opt.tools.64.llvm ./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64.llvm
|
||||||
|
|
||||||
|
export LD_LIBRARY_PATH=`pwd`/pandemonium_engine/bin/
|
||||||
|
./pandemonium_engine/bin/run.pandemonium.x11.opt.tools.64.llvm -e --path ./game/
|
@ -1,38 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
project_root=$(pwd)
|
|
||||||
|
|
||||||
rm -Rf ./release
|
|
||||||
|
|
||||||
mkdir release
|
|
||||||
|
|
||||||
cd export
|
|
||||||
|
|
||||||
rm -Rf broken_seals_full_source
|
|
||||||
rm -Rf broken_seals_game_source
|
|
||||||
|
|
||||||
mkdir broken_seals_full_source
|
|
||||||
mkdir broken_seals_game_source
|
|
||||||
|
|
||||||
python ../tools/copy_repos.py ../ ./broken_seals_full_source
|
|
||||||
python ../tools/copy_repos.py ../game/ ./broken_seals_game_source
|
|
||||||
|
|
||||||
zip ../release/broken_seals_android_debug.zip ./broken_seals_android_debug/*
|
|
||||||
zip ../release/broken_seals_android_release.zip ./broken_seals_android_release/*
|
|
||||||
zip ../release/broken_seals_javascript.zip ./broken_seals_javascript/*
|
|
||||||
zip ../release/broken_seals_linux.zip ./broken_seals_linux/*
|
|
||||||
zip ../release/broken_seals_windows.zip ./broken_seals_windows/*
|
|
||||||
zip ../release/broken_seals_pi4.zip ./broken_seals_pi4/*
|
|
||||||
|
|
||||||
zip ../release/editor_windows.zip ./godot.bs.windows.opt.tools.64.exe
|
|
||||||
zip ../release/editor_linux.zip ./godot.bs.x11.opt.tools.64
|
|
||||||
zip ../release/editor_pi4.zip ./godot.bs.x11.pi4.opt.tools.32
|
|
||||||
|
|
||||||
zip ../release/export_templates.zip ./export_templates/*
|
|
||||||
|
|
||||||
zip -r ../release/broken_seals_full_source.zip ./broken_seals_full_source/*
|
|
||||||
zip -r ../release/broken_seals_game_source.zip ./broken_seals_game_source/*
|
|
||||||
|
|
||||||
cd ..
|
|
||||||
|
|
@ -1,22 +1,24 @@
|
|||||||
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/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/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/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', '' ],
|
|
||||||
]
|
]
|
||||||
|
|
||||||
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/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', '' ],
|
||||||
[ ['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', '' ],
|
||||||
]
|
]
|
||||||
|
|
||||||
addon_repositories = [
|
addon_repositories = [
|
||||||
@ -25,6 +27,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'
|
||||||
|
6
play.sh
6
play.sh
@ -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/
|
||||||
|
Loading…
Reference in New Issue
Block a user