Updated the engine. I removed bullet, backported the android editor pr, and did some additional cleanups.

This commit is contained in:
Relintai 2022-03-23 13:30:35 +01:00
parent c7900bf439
commit 57354fd52a
2 changed files with 43 additions and 43 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "14a7a209af9585cd3024c9df05a7ff3909019d42"}}
{"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": "d1587aaa6bd635fb4ce5db166ec365b8d57b9b6c"}}

View File

@ -266,57 +266,57 @@ _global_script_classes=[ {
"path": "res://addons/world_generator/resources/zone.gd"
} ]
_global_script_class_icons={
@"BrushPrefabs": "",
@"GEBrighten": "",
@"GECanvas": "",
@"GEBrush": "",
@"GECut": "",
@"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png",
@"MMNode": "",
@"WorldGeneratorSettings": "",
@"CharacterSkeketonAttachPoint": "",
@"PlayerGD": "",
@"BrushPrefabs": "",
@"GameModule": "",
@"GELayer": "",
@"GEDarken": "",
@"PaletteImporter": "",
@"WorldGenRaycast": "",
@"MobGD": "",
@"PlayerMaster": "",
@"PlayerGD": "",
@"CharacterSkeketonAttachPoint": "",
@"WorldGeneratorSettings": "",
@"MMNode": "",
@"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png",
@"GECut": "",
@"GEBrush": "",
@"GECanvas": "",
@"SpeedResource": "",
@"GEAction": "",
@"GEBucket": "",
@"GERect": "",
@"Continent": "",
@"WorldGenWorld": "",
@"EntityAIGD": "",
@"PlayerMaster": "",
@"MobGD": "",
@"WorldGenRaycast": "",
@"PaletteImporter": "",
@"GEDarken": "",
@"GELayer": "",
@"EntityDataGD": "",
@"NetworkedPlayerGD": "",
@"SpellEffectVisualBasic": "",
@"EntityAIGD": "",
@"WorldGenWorld": "",
@"Continent": "",
@"GERect": "",
@"GEBucket": "",
@"GEAction": "",
@"SpellGD": "",
@"GELine": "",
@"Zone": "",
@"UIWindowModule": "",
@"SpellEffectVisualBasic": "",
@"NetworkedPlayerGD": "",
@"TerrainWorldGenerator": "",
@"GEUtils": "",
@"GEPasteCut": "",
@"ColorTile": "",
@"WorldGenBaseResource": "",
@"Main": "",
@"Menu": "",
@"UIGuiChildModule": "",
@"UIWindowModule": "",
@"Zone": "",
@"GELine": "",
@"ManaResource": "",
@"GERainbow": "",
@"MMNodeUniversalProperty": "",
@"SubZone": "",
@"DisplayPlayerGD": "",
@"ItemTemplateGD": "",
@"UIGuiChildModule": "",
@"Menu": "",
@"Main": "",
@"WorldGenBaseResource": "",
@"ColorTile": "",
@"GEPasteCut": "",
@"GEUtils": "",
@"HealthResource": "",
@"GEMultiLine": "",
@"GEPencil": "",
@"Palette": "",
@"ItemTemplateGD": "",
@"DisplayPlayerGD": "",
@"SubZone": "",
@"MMNodeUniversalProperty": "",
@"GERainbow": "",
@"LayeredTextureMaker": "",
@"MMMateial": "",
@"LayeredTextureMaker": ""
@"Palette": "",
@"GEPencil": "",
@"GEMultiLine": ""
}
[application]