Skip to content

Commit

Permalink
Inv and Icons
Browse files Browse the repository at this point in the history
  • Loading branch information
EclipsedMango committed Jul 3, 2024
1 parent 3c77e7f commit 16b47d1
Show file tree
Hide file tree
Showing 28 changed files with 2,881 additions and 85 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Godot 4+ specific ignores
.godot/
Build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dwu0xfgmv4vrk"
path.s3tc="res://.godot/imported/Tree3FIXED_Leaves Texture - Imgur.png-6223ebc14335e4778eac302f82ee6fbe.s3tc.ctex"
path.s3tc="res://.godot/imported/Tree3FIXED_Leaves Texture - Imgur.png-b37d97fb659ac6f8a4be9cb90b83947d.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
Expand All @@ -14,8 +14,8 @@ generator_parameters={

[deps]

source_file="res://Assets/Models/Tree3FIXED_Leaves Texture - Imgur.png"
dest_files=["res://.godot/imported/Tree3FIXED_Leaves Texture - Imgur.png-6223ebc14335e4778eac302f82ee6fbe.s3tc.ctex"]
source_file="res://Assets/Art/Textures/Tree3FIXED_Leaves Texture - Imgur.png"
dest_files=["res://.godot/imported/Tree3FIXED_Leaves Texture - Imgur.png-b37d97fb659ac6f8a4be9cb90b83947d.s3tc.ctex"]

[params]

Expand Down
Binary file added Assets/Art/Textures/logICON.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Art/Textures/logICON.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://c73xy8s24y5xs"
path="res://.godot/imported/logICON.png-827a3b6cdbbcaeb7efcdb21ddc6d3a4e.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Art/Textures/logICON.png"
dest_files=["res://.godot/imported/logICON.png-827a3b6cdbbcaeb7efcdb21ddc6d3a4e.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/Art/Textures/pickaxeICON.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Art/Textures/pickaxeICON.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://ci5qjs41ygyny"
path="res://.godot/imported/pickaxeICON.png-f031558177f2af7228a36863a312e7a1.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Art/Textures/pickaxeICON.png"
dest_files=["res://.godot/imported/pickaxeICON.png-f031558177f2af7228a36863a312e7a1.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/Art/Textures/pickaxeICONdownSIZED.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Art/Textures/pickaxeICONdownSIZED.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bid6nydu00cd1"
path="res://.godot/imported/pickaxeICONdownSIZED.png-09d33c9258b396e137039493b1c3ebc3.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Art/Textures/pickaxeICONdownSIZED.png"
dest_files=["res://.godot/imported/pickaxeICONdownSIZED.png-09d33c9258b396e137039493b1c3ebc3.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/Art/Textures/rockICON.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Art/Textures/rockICON.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://0pmoq8mt5gkd"
path="res://.godot/imported/rockICON.png-e62aa2b28b247ed2f2be299595aaf578.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Art/Textures/rockICON.png"
dest_files=["res://.godot/imported/rockICON.png-e62aa2b28b247ed2f2be299595aaf578.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file modified Assets/Models/Rock1.res
Binary file not shown.
42 changes: 25 additions & 17 deletions Scenes/inventory.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,23 @@ anchor_bottom = 1.0
offset_left = 1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2
script = ExtResource("1_hpfk4")

[node name="CenterContainer" type="CenterContainer" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -960.5
offset_top = -540.0
offset_right = 516.5
offset_bottom = 290.0
grow_horizontal = 2
grow_vertical = 2
scale = Vector2(1.3, 1.3)

[node name="Control" type="Control" parent="CenterContainer"]
custom_minimum_size = Vector2(900, 600)
Expand Down Expand Up @@ -189,17 +197,16 @@ anchors_preset = 12
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = -139.74
offset_bottom = -34.7397
offset_top = -160.855
offset_bottom = -32.8541
grow_horizontal = 2
grow_vertical = 0
alignment = 1
metadata/_edit_group_ = true

[node name="Hotbar" type="Control" parent="HBoxContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(1919, 105.5)
layout_mode = 2
size_flags_horizontal = 3

[node name="TextureRect" type="TextureRect" parent="HBoxContainer/Hotbar"]
layout_mode = 1
Expand All @@ -219,10 +226,10 @@ anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -386.5
offset_top = -94.5005
offset_right = -304.5
offset_bottom = -11.5005
offset_left = -469.5
offset_top = -115.0
offset_right = -369.5
offset_bottom = -13.0
grow_horizontal = 2
grow_vertical = 0

Expand All @@ -239,14 +246,15 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_anabp")
[node name="HotbarGrid" type="GridContainer" parent="HBoxContainer/Hotbar"]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = 14
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 1.0
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = 573.0
offset_top = -42.7502
offset_right = -573.0
offset_bottom = 41.2498
offset_left = -469.5
offset_top = -51.0
offset_right = 469.5
offset_bottom = 51.0
grow_horizontal = 2
grow_vertical = 2
columns = 9
Expand Down
18 changes: 17 additions & 1 deletion Scenes/player.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ theme_override_font_sizes/font_size = 50
text = "Epic Survival Game"

[node name="RespawnMenu" type="Control" parent="."]
visible = false
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
Expand Down Expand Up @@ -184,6 +183,23 @@ theme_override_font_sizes/font_size = 50
text = "You Died!"

[node name="Inventory" parent="." instance=ExtResource("5_ejf2h")]
visible = false

[node name="OptionsMenu" type="Control" parent="."]
layout_mode = 3
anchors_preset = 0
offset_right = 40.0
offset_bottom = 40.0

[node name="Crosshair" type="Label" parent="."]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
text = "hallo"
horizontal_alignment = 1
vertical_alignment = 1

[connection signal="pressed" from="PauseMenu/ButtonMenu/PanelContainer/MarginContainer/VBoxContainer/Resume" to="PauseMenu" method="_on_resume_pressed"]
[connection signal="pressed" from="PauseMenu/ButtonMenu/PanelContainer/MarginContainer/VBoxContainer/Exit to Menu" to="PauseMenu" method="_on_exit_to_menu_pressed"]
Expand Down
6 changes: 4 additions & 2 deletions Scenes/terrain_test.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ data = PackedVector3Array(0.9922, 0.0719, -0.9922, 1, -0.0761, -1, 1, -0.0347, -
noise_type = 2
frequency = 0.0536
fractal_type = 0
cellular_distance_function = 3
domain_warp_type = 1

[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_pcmc0"]
width = 3212
Expand Down Expand Up @@ -51,9 +53,9 @@ noise = SubResource("FastNoiseLite_shldw")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_y675p"]
render_priority = 0
shader = ExtResource("3_kne2j")
shader_parameter/ColorParameter = Color(0, 0.264767, 0, 1)
shader_parameter/ColorParameter = Color(0, 0.260467, 0, 1)
shader_parameter/ColorParameter2 = Color(0.243011, 0.47826, 0.182992, 1)
shader_parameter/ColorParameter3 = Color(0.586681, 0.821732, 0.505518, 1)
shader_parameter/ColorParameter3 = Color(0.456494, 0.67444, 0.379945, 1)
shader_parameter/WindNoise = SubResource("NoiseTexture2D_iyhp4")
shader_parameter/Texture2DParameter2 = SubResource("NoiseTexture2D_pcmc0")

Expand Down
8 changes: 4 additions & 4 deletions Scenes/tree.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=5 format=3 uid="uid://c68hil71myykb"]

[ext_resource type="Script" path="res://Scripts/Tree.gd" id="1_f01y6"]
[ext_resource type="PackedScene" uid="uid://d0qxdri01t7lv" path="res://Assets/Models/Tree3FIXED.glb" id="1_tv3c4"]
[ext_resource type="Texture2D" uid="uid://bhnh2gvvbwqrm" path="res://Assets/Art/Textures/TreeLOD.png" id="3_2fwkn"]
[ext_resource type="PackedScene" uid="uid://c6biyj2l0eewt" path="res://Scenes/treeModel.tscn" id="3_6tgwb"]

[sub_resource type="CylinderShape3D" id="CylinderShape3D_exoyx"]
height = 3.1597
Expand All @@ -11,9 +11,6 @@ radius = 0.0617532
[node name="Tree" type="StaticBody3D"]
script = ExtResource("1_f01y6")

[node name="Model" parent="." instance=ExtResource("1_tv3c4")]
transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0, 0, 0)

[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.54599, 0)
shape = SubResource("CylinderShape3D_exoyx")
Expand All @@ -26,3 +23,6 @@ visibility_range_fade_mode = 1
billboard = 2
double_sided = false
texture = ExtResource("3_2fwkn")

[node name="Model" parent="." instance=ExtResource("3_6tgwb")]
transform = Transform3D(0.29, 0, 0, 0, 0.29, 0, 0, 0, 0.29, 0, 0, 0)
Loading

0 comments on commit 16b47d1

Please sign in to comment.