-
-
Notifications
You must be signed in to change notification settings - Fork 507
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* More Ice Chunks * Update translations * Cleanup and fixes * Update shaders and models * Icon error fix * Increase transparency of some chunks * Fully revert iron.png.import --------- Co-authored-by: Henri Hyyryläinen <henri.hyyrylainen@gmail.com>
- Loading branch information
1 parent
0758adc
commit 19a42b1
Showing
103 changed files
with
1,017 additions
and
156 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Git LFS file not shown
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
[gd_scene load_steps=5 format=3 uid="uid://cf7m6tvdm1618"] | ||
|
||
[ext_resource type="Texture2D" uid="uid://c4lakneio0v00" path="res://assets/textures/IronChunk_normal.png" id="2_2cqno"] | ||
[ext_resource type="Texture2D" uid="uid://dfw401vxsi10p" path="res://assets/textures/IceChunk.png" id="2_kxdxj"] | ||
[ext_resource type="ArrayMesh" uid="uid://yj10yvbmr7y5" path="res://assets/models/IceChunkLarge1.mesh" id="5_6qvee"] | ||
|
||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_kjn86"] | ||
render_priority = 18 | ||
transparency = 4 | ||
blend_mode = 1 | ||
cull_mode = 2 | ||
albedo_color = Color(0.917647, 1, 1, 0.772549) | ||
albedo_texture = ExtResource("2_kxdxj") | ||
metallic = 0.6 | ||
metallic_specular = 0.78 | ||
roughness = 0.6 | ||
emission_enabled = true | ||
emission = Color(0.321569, 0.321569, 0.435294, 1) | ||
emission_energy_multiplier = 0.4 | ||
normal_enabled = true | ||
normal_texture = ExtResource("2_2cqno") | ||
|
||
[node name="IceChunk" type="MeshInstance3D"] | ||
material_override = SubResource("StandardMaterial3D_kjn86") | ||
mesh = ExtResource("5_6qvee") |
Git LFS file not shown
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
[gd_scene load_steps=5 format=3 uid="uid://0mbxlwabmmgp"] | ||
|
||
[ext_resource type="Texture2D" uid="uid://dfw401vxsi10p" path="res://assets/textures/IceChunk.png" id="2_qawph"] | ||
[ext_resource type="Texture2D" uid="uid://c4lakneio0v00" path="res://assets/textures/IronChunk_normal.png" id="2_rupjp"] | ||
[ext_resource type="ArrayMesh" uid="uid://dwku0n7qribgu" path="res://assets/models/IceChunkLarge2.mesh" id="5_p5w0v"] | ||
|
||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pawmm"] | ||
render_priority = 18 | ||
transparency = 4 | ||
blend_mode = 1 | ||
cull_mode = 2 | ||
albedo_color = Color(0.839216, 1, 1, 0.882353) | ||
albedo_texture = ExtResource("2_qawph") | ||
metallic = 0.6 | ||
metallic_specular = 0.78 | ||
roughness = 0.6 | ||
emission_enabled = true | ||
emission = Color(0.321569, 0.321569, 0.435294, 1) | ||
emission_energy_multiplier = 1.5 | ||
normal_enabled = true | ||
normal_texture = ExtResource("2_rupjp") | ||
|
||
[node name="IceChunk" type="MeshInstance3D"] | ||
material_override = SubResource("StandardMaterial3D_pawmm") | ||
mesh = ExtResource("5_p5w0v") |
Git LFS file not shown
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
[gd_scene load_steps=5 format=3 uid="uid://dntmcvk7uibgs"] | ||
|
||
[ext_resource type="Texture2D" uid="uid://dfw401vxsi10p" path="res://assets/textures/IceChunk.png" id="2_7fory"] | ||
[ext_resource type="Texture2D" uid="uid://c4lakneio0v00" path="res://assets/textures/IronChunk_normal.png" id="2_7vrdy"] | ||
[ext_resource type="ArrayMesh" uid="uid://dev5lpvehe254" path="res://assets/models/IceChunkLarge3.mesh" id="4_vi8ht"] | ||
|
||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5xlso"] | ||
render_priority = 18 | ||
transparency = 4 | ||
blend_mode = 1 | ||
cull_mode = 2 | ||
albedo_color = Color(0.87451, 1, 1, 0.921569) | ||
albedo_texture = ExtResource("2_7fory") | ||
metallic = 0.6 | ||
metallic_specular = 0.78 | ||
roughness = 0.6 | ||
emission_enabled = true | ||
emission = Color(0.321569, 0.321569, 0.435294, 1) | ||
emission_energy_multiplier = 1.5 | ||
normal_enabled = true | ||
normal_texture = ExtResource("2_7vrdy") | ||
|
||
[node name="IceChunk" type="MeshInstance3D"] | ||
transform = Transform3D(1.00374, 0, 0, 0, 1.00374, 0, 0, 0, 1.00374, 0, 0, 0) | ||
material_override = SubResource("StandardMaterial3D_5xlso") | ||
mesh = ExtResource("4_vi8ht") |
Git LFS file not shown
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
[gd_scene load_steps=5 format=3 uid="uid://b468e0b04dot"] | ||
|
||
[ext_resource type="ArrayMesh" uid="uid://d2jrhrxmkd7dw" path="res://assets/models/IceChunkSmall1.mesh" id="2_3v8mk"] | ||
[ext_resource type="Texture2D" uid="uid://dfw401vxsi10p" path="res://assets/textures/IceChunk.png" id="2_ayeji"] | ||
[ext_resource type="Texture2D" uid="uid://c4lakneio0v00" path="res://assets/textures/IronChunk_normal.png" id="2_ruhxd"] | ||
|
||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5iyqp"] | ||
render_priority = 18 | ||
transparency = 4 | ||
blend_mode = 1 | ||
cull_mode = 2 | ||
albedo_color = Color(0.862745, 1, 1, 0.92549) | ||
albedo_texture = ExtResource("2_ayeji") | ||
metallic = 0.6 | ||
metallic_specular = 0.78 | ||
roughness = 0.6 | ||
emission_enabled = true | ||
emission = Color(0.321569, 0.321569, 0.435294, 1) | ||
emission_energy_multiplier = 0.5 | ||
normal_enabled = true | ||
normal_texture = ExtResource("2_ruhxd") | ||
|
||
[node name="IceChunkSmall" type="MeshInstance3D"] | ||
material_override = SubResource("StandardMaterial3D_5iyqp") | ||
mesh = ExtResource("2_3v8mk") |
Git LFS file not shown
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
[gd_scene load_steps=5 format=3 uid="uid://bsida34nrjiis"] | ||
|
||
[ext_resource type="Texture2D" uid="uid://dfw401vxsi10p" path="res://assets/textures/IceChunk.png" id="2_2cj74"] | ||
[ext_resource type="Texture2D" uid="uid://c4lakneio0v00" path="res://assets/textures/IronChunk_normal.png" id="2_uf5cd"] | ||
[ext_resource type="ArrayMesh" uid="uid://diixv1g5ao2sm" path="res://assets/models/IceChunkSmall2.mesh" id="5_6q7e3"] | ||
|
||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_rktnq"] | ||
render_priority = 18 | ||
transparency = 4 | ||
blend_mode = 1 | ||
cull_mode = 2 | ||
albedo_color = Color(1, 1, 1, 0.772549) | ||
albedo_texture = ExtResource("2_2cj74") | ||
metallic = 0.8 | ||
metallic_specular = 0.78 | ||
roughness = 0.6 | ||
emission_enabled = true | ||
emission = Color(0.321569, 0.321569, 0.435294, 1) | ||
emission_energy_multiplier = 0.1 | ||
normal_enabled = true | ||
normal_texture = ExtResource("2_uf5cd") | ||
|
||
[node name="IceChunkSmall" type="MeshInstance3D"] | ||
material_override = SubResource("StandardMaterial3D_rktnq") | ||
mesh = ExtResource("5_6q7e3") |
Git LFS file not shown
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
[gd_scene load_steps=7 format=3 uid="uid://dtmtjvcktr5c2"] | ||
|
||
[ext_resource type="Shader" path="res://shaders/Crystal.gdshader" id="1_ah4jf"] | ||
[ext_resource type="Texture2D" uid="uid://dfw401vxsi10p" path="res://assets/textures/IceChunk.png" id="2_vhfcg"] | ||
[ext_resource type="Texture2D" uid="uid://baxuoyeo83r2u" path="res://assets/textures/dissolve_noise.tres" id="3_fe0k2"] | ||
[ext_resource type="Texture2D" uid="uid://c4lakneio0v00" path="res://assets/textures/IronChunk_normal.png" id="4_mcoj5"] | ||
[ext_resource type="ArrayMesh" uid="uid://bf3qbqdatru24" path="res://assets/models/IceChunkSnowflake.mesh" id="4_tpouo"] | ||
|
||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_5yag2"] | ||
resource_local_to_scene = true | ||
render_priority = 18 | ||
shader = ExtResource("1_ah4jf") | ||
shader_parameter/albedo = Color(0.878431, 1, 1, 0.988235) | ||
shader_parameter/useNormal = true | ||
shader_parameter/roughness = 0.6 | ||
shader_parameter/roughnessTextureChannel = Vector4(1, 0, 0, 0) | ||
shader_parameter/specular = 0.783 | ||
shader_parameter/metallic = 0.6 | ||
shader_parameter/metallicTextureChannel = Vector4(1, 0, 0, 0) | ||
shader_parameter/emission = Color(0.301341, 0.301345, 0.32086, 0.933333) | ||
shader_parameter/emissionEnergy = 1.5 | ||
shader_parameter/clearcoat = 0.21 | ||
shader_parameter/clearcoatRoughness = 0.1 | ||
shader_parameter/dissolveValue = null | ||
shader_parameter/outlineWidth = null | ||
shader_parameter/growColor = null | ||
shader_parameter/albedoTexture = ExtResource("2_vhfcg") | ||
shader_parameter/normalTexture = ExtResource("4_mcoj5") | ||
shader_parameter/roughnessTexture = ExtResource("2_vhfcg") | ||
shader_parameter/dissolveTexture = ExtResource("3_fe0k2") | ||
|
||
[node name="IceChunkSnowflake" type="MeshInstance3D"] | ||
material_override = SubResource("ShaderMaterial_5yag2") | ||
mesh = ExtResource("4_tpouo") |
Git LFS file not shown
This file was deleted.
Oops, something went wrong.
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,35 @@ | ||
[gd_scene load_steps=3 format=3 uid="uid://bkkpsrifquemw"] | ||
[gd_scene load_steps=8 format=3 uid="uid://bkkpsrifquemw"] | ||
|
||
[ext_resource type="ArrayMesh" uid="uid://11xed06uehhu" path="res://assets/models/Iceshard1.mesh" id="1"] | ||
[ext_resource type="Material" uid="uid://cgkier4sxqw0f" path="res://assets/models/iceshard.material" id="1_fj7f3"] | ||
[ext_resource type="Shader" path="res://shaders/Crystal.gdshader" id="1_l2xop"] | ||
[ext_resource type="Texture2D" uid="uid://dfw401vxsi10p" path="res://assets/textures/IceChunk.png" id="2_bunih"] | ||
[ext_resource type="Texture2D" uid="uid://baxuoyeo83r2u" path="res://assets/textures/dissolve_noise.tres" id="3_1c02q"] | ||
[ext_resource type="Texture2D" uid="uid://c4lakneio0v00" path="res://assets/textures/IronChunk_normal.png" id="4_ej15h"] | ||
[ext_resource type="Texture2D" uid="uid://dvp0yex8rwygn" path="res://assets/textures/Crystal_rough_emit.png" id="5_mie8v"] | ||
[ext_resource type="ArrayMesh" uid="uid://ct6x5q7py2637" path="res://assets/models/IceShard1.mesh" id="5_uu00j"] | ||
|
||
[node name="iceshard1" type="MeshInstance3D"] | ||
material_override = ExtResource("1_fj7f3") | ||
mesh = ExtResource("1") | ||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_wdpla"] | ||
resource_local_to_scene = true | ||
render_priority = 17 | ||
shader = ExtResource("1_l2xop") | ||
shader_parameter/albedo = Color(1, 1, 1, 1) | ||
shader_parameter/useNormal = true | ||
shader_parameter/roughness = 0.6 | ||
shader_parameter/roughnessTextureChannel = Vector4(1, 0, 0, 0) | ||
shader_parameter/specular = 0.784 | ||
shader_parameter/metallic = 0.45 | ||
shader_parameter/metallicTextureChannel = Vector4(1, 0, 0, 0) | ||
shader_parameter/emission = Color(0.223529, 0.223529, 0.235294, 0.933333) | ||
shader_parameter/emissionEnergy = 1.5 | ||
shader_parameter/clearcoat = 0.713 | ||
shader_parameter/clearcoatRoughness = 0.269 | ||
shader_parameter/dissolveValue = 0.0 | ||
shader_parameter/outlineWidth = null | ||
shader_parameter/growColor = Color(0.756863, 0.878431, 0.890196, 0.847059) | ||
shader_parameter/albedoTexture = ExtResource("2_bunih") | ||
shader_parameter/normalTexture = ExtResource("4_ej15h") | ||
shader_parameter/roughnessTexture = ExtResource("5_mie8v") | ||
shader_parameter/dissolveTexture = ExtResource("3_1c02q") | ||
|
||
[node name="IceShardTiny" type="MeshInstance3D"] | ||
material_override = SubResource("ShaderMaterial_wdpla") | ||
mesh = ExtResource("5_uu00j") |
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Git LFS file not shown
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.