From b891058708e057b52faa501e4e389541fd1afc4e Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 24 Mar 2022 12:52:59 +0100 Subject: [PATCH] Updated the engine. Smaller fixes, and backports. --- HEADS | 2 +- SConstruct | 8 ++-- game/project.pandemonium | 84 ++++++++++++++++++++-------------------- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/HEADS b/HEADS index 3e4f8e0c..1f344a91 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "a04b1f23bf7761712bf3245858f09c4e6e2cef30"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "d0c0a67f5f72154d7add50e702ad699d5a18dd49"}} \ No newline at end of file diff --git a/SConstruct b/SConstruct index 179a03aa..4abba6bf 100644 --- a/SConstruct +++ b/SConstruct @@ -500,11 +500,11 @@ if len(sys.argv) > 1: os.chdir(full_path + 'platform/android/java/') if 'e' in arg: #editor - print('Running command: ' + get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generateGodotEditor') - subprocess.call(get_exports_for('global') + get_additional_commands_for('global') + get_exports_for('android') + get_additional_commands_for('android') + './gradlew generateGodotEditor', 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 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) + 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: build_string += 'platform=javascript' diff --git a/game/project.pandemonium b/game/project.pandemonium index 57e348a9..4c56f652 100644 --- a/game/project.pandemonium +++ b/game/project.pandemonium @@ -266,57 +266,57 @@ _global_script_classes=[ { "path": "res://addons/world_generator/resources/zone.gd" } ] _global_script_class_icons={ -@"GEBrighten": "", @"BrushPrefabs": "", -@"GameModule": "", -@"PlayerGD": "", -@"CharacterSkeketonAttachPoint": "", -@"WorldGeneratorSettings": "", -@"MMNode": "", -@"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png", -@"GECut": "", -@"GEBrush": "", +@"GEBrighten": "", @"GECanvas": "", -@"SpeedResource": "", -@"PlayerMaster": "", -@"MobGD": "", -@"WorldGenRaycast": "", -@"PaletteImporter": "", -@"GEDarken": "", +@"GEBrush": "", +@"GECut": "", +@"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png", +@"MMNode": "", +@"WorldGeneratorSettings": "", +@"CharacterSkeketonAttachPoint": "", +@"PlayerGD": "", +@"GameModule": "", @"GELayer": "", -@"EntityDataGD": "", -@"EntityAIGD": "", -@"WorldGenWorld": "", -@"Continent": "", -@"GERect": "", -@"GEBucket": "", +@"GEDarken": "", +@"PaletteImporter": "", +@"WorldGenRaycast": "", +@"MobGD": "", +@"PlayerMaster": "", +@"SpeedResource": "", @"GEAction": "", -@"SpellGD": "", -@"SpellEffectVisualBasic": "", +@"GEBucket": "", +@"GERect": "", +@"Continent": "", +@"WorldGenWorld": "", +@"EntityAIGD": "", +@"EntityDataGD": "", @"NetworkedPlayerGD": "", -@"TerrainWorldGenerator": "", -@"UIWindowModule": "", -@"Zone": "", +@"SpellEffectVisualBasic": "", +@"SpellGD": "", @"GELine": "", -@"ManaResource": "", -@"UIGuiChildModule": "", -@"Menu": "", -@"Main": "", -@"WorldGenBaseResource": "", -@"ColorTile": "", -@"GEPasteCut": "", +@"Zone": "", +@"UIWindowModule": "", +@"TerrainWorldGenerator": "", @"GEUtils": "", -@"HealthResource": "", -@"ItemTemplateGD": "", -@"DisplayPlayerGD": "", -@"SubZone": "", -@"MMNodeUniversalProperty": "", +@"GEPasteCut": "", +@"ColorTile": "", +@"WorldGenBaseResource": "", +@"Main": "", +@"Menu": "", +@"UIGuiChildModule": "", +@"ManaResource": "", @"GERainbow": "", -@"LayeredTextureMaker": "", -@"MMMateial": "", -@"Palette": "", +@"MMNodeUniversalProperty": "", +@"SubZone": "", +@"DisplayPlayerGD": "", +@"ItemTemplateGD": "", +@"HealthResource": "", +@"GEMultiLine": "", @"GEPencil": "", -@"GEMultiLine": "" +@"Palette": "", +@"MMMateial": "", +@"LayeredTextureMaker": "" } [application]