diff --git a/design/lavalamp.blend b/design/lavalamp.blend index d9c5a4f4..08a0d23d 100644 --- a/design/lavalamp.blend +++ b/design/lavalamp.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:127654339306ded643a2f5259c13016084ed5a7b192cac0c2ffe0f015c04bced -size 3337387 +oid sha256:6925fef22396c760529480364564ab52ded020d0f9e4919903d7790d3b945fea +size 2814976 diff --git a/src/base-environments/youth_room/import/lava-lamp.glb b/src/base-environments/youth_room/import/lava-lamp.glb index 86b4ccab..26347600 100644 --- a/src/base-environments/youth_room/import/lava-lamp.glb +++ b/src/base-environments/youth_room/import/lava-lamp.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06a9724b4804545fbf3501f7fb7f7d2de73589ce4e3a8587e08e9c13fe247fe9 -size 421284 +oid sha256:22711849056bdd3ce0a4dfdf0af18cecd0538532f79e28e7646165b7344bbfb0 +size 600464 diff --git a/src/base-environments/youth_room/import/lava-lamp.glb.import b/src/base-environments/youth_room/import/lava-lamp.glb.import index 5dc74929..accf1c3b 100644 --- a/src/base-environments/youth_room/import/lava-lamp.glb.import +++ b/src/base-environments/youth_room/import/lava-lamp.glb.import @@ -49,6 +49,26 @@ _subresources={ "save_to_file/enabled": true, "save_to_file/make_streamable": "", "save_to_file/path": "res://base-environments/youth_room/shaders/falling-lava.res" +}, +"lava-lamp_fairydust": { +"generate/lightmap_uv": 0, +"generate/lods": 0, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"lods/normal_split_angle": 25.0, +"save_to_file/enabled": true, +"save_to_file/make_streamable": "", +"save_to_file/path": "res://base-environments/youth_room/shaders/lava-metal.res" +}, +"lava-lamp_lava-glass": { +"generate/lightmap_uv": 0, +"generate/lods": 0, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"lods/normal_split_angle": 25.0, +"save_to_file/enabled": true, +"save_to_file/make_streamable": "", +"save_to_file/path": "res://base-environments/youth_room/shaders/lava-glass.res" } } } diff --git a/src/base-environments/youth_room/shaders/falling-lava.res b/src/base-environments/youth_room/shaders/falling-lava.res index fbae9d35..34c012a1 100644 Binary files a/src/base-environments/youth_room/shaders/falling-lava.res and b/src/base-environments/youth_room/shaders/falling-lava.res differ diff --git a/src/base-environments/youth_room/shaders/lava-glass.res b/src/base-environments/youth_room/shaders/lava-glass.res new file mode 100644 index 00000000..6fd69b35 Binary files /dev/null and b/src/base-environments/youth_room/shaders/lava-glass.res differ diff --git a/src/base-environments/youth_room/shaders/lava-metal.res b/src/base-environments/youth_room/shaders/lava-metal.res new file mode 100644 index 00000000..36563367 Binary files /dev/null and b/src/base-environments/youth_room/shaders/lava-metal.res differ diff --git a/src/base-environments/youth_room/shaders/raising-lava.res b/src/base-environments/youth_room/shaders/raising-lava.res index 38758163..ea9e561f 100644 Binary files a/src/base-environments/youth_room/shaders/raising-lava.res and b/src/base-environments/youth_room/shaders/raising-lava.res differ