major rework on pickups, hud now shows the number and icon of pickup
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 41 KiB |
BIN
assets/Textures/ObjectTextures/health.png
Normal file
|
After Width: | Height: | Size: 9.3 KiB |
34
assets/Textures/ObjectTextures/health.png.import
Normal file
@@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://sejtwkyo0gud"
|
||||
path="res://.godot/imported/health.png-575c2a7a539cccc3e9e8faf465448f98.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://assets/Textures/ObjectTextures/health.png"
|
||||
dest_files=["res://.godot/imported/health.png-575c2a7a539cccc3e9e8faf465448f98.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
|
||||
BIN
assets/Textures/ObjectTextures/light_ammo.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
34
assets/Textures/ObjectTextures/light_ammo.png.import
Normal file
@@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://b78u3lgx12beh"
|
||||
path="res://.godot/imported/light_ammo.png-ecedb7822d9b26f07643f77fa25aeaea.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://assets/Textures/ObjectTextures/light_ammo.png"
|
||||
dest_files=["res://.godot/imported/light_ammo.png-ecedb7822d9b26f07643f77fa25aeaea.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
|
||||
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 26 KiB |
BIN
assets/Textures/ObjectTextures/money.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
34
assets/Textures/ObjectTextures/money.png.import
Normal file
@@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bt6utik8unkxa"
|
||||
path="res://.godot/imported/money.png-0c7bd269242ca0e7919fce1578029628.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://assets/Textures/ObjectTextures/money.png"
|
||||
dest_files=["res://.godot/imported/money.png-0c7bd269242ca0e7919fce1578029628.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
|
||||
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 12 KiB |
BIN
assets/Textures/ObjectTextures/rocket.png
Normal file
|
After Width: | Height: | Size: 9.8 KiB |
34
assets/Textures/ObjectTextures/rocket.png.import
Normal file
@@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://cmnhd40dvn3l3"
|
||||
path="res://.godot/imported/rocket.png-f48667c8e74138b1121c9aaa249e2648.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://assets/Textures/ObjectTextures/rocket.png"
|
||||
dest_files=["res://.godot/imported/rocket.png-f48667c8e74138b1121c9aaa249e2648.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
|
||||
BIN
assets/Textures/ObjectTextures/stamina.png
Normal file
|
After Width: | Height: | Size: 6.0 KiB |
34
assets/Textures/ObjectTextures/stamina.png.import
Normal file
@@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dcyt3k3jl6ick"
|
||||
path="res://.godot/imported/stamina.png-abaab6a291d46ce1aecf01bde6dd6d30.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://assets/Textures/ObjectTextures/stamina.png"
|
||||
dest_files=["res://.godot/imported/stamina.png-abaab6a291d46ce1aecf01bde6dd6d30.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
|
||||
329
assets/item_pickup.tscn
Normal file
@@ -235,7 +235,7 @@ points = PackedVector3Array(-0.899645, -0.235985, -0.176739, 0.797351, 0.356305,
|
||||
[sub_resource type="SphereShape3D" id="SphereShape3D_87tum"]
|
||||
radius = 1.26183
|
||||
|
||||
[node name="mac10_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["pickup"]]
|
||||
[node name="mac10_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["pickup", "weapon_pickup"]]
|
||||
collision_layer = 17
|
||||
collision_mask = 17
|
||||
script = ExtResource("1_46utd")
|
||||
|
||||
@@ -702,7 +702,7 @@ audio_empty = NodePath("Audio/Empty")
|
||||
audio_reload = NodePath("Audio/Reload")
|
||||
|
||||
[node name="mac10" parent="." index="0"]
|
||||
transform = Transform3D(-1.08301e-06, -8.05106e-08, -0.3, -0.0225093, 0.299154, 9.75562e-10, 0.299154, 0.0225093, -1.086e-06, -0.00876398, 0.0748287, -0.0557729)
|
||||
transform = Transform3D(-1.08301e-06, -8.05104e-08, -0.3, -0.0225093, 0.299154, 9.75766e-10, 0.299154, 0.0225093, -1.086e-06, -0.00876398, 0.0748287, -0.0557729)
|
||||
cast_shadow = 0
|
||||
lod_bias = 10.0
|
||||
mesh = SubResource("ArrayMesh_pcg38")
|
||||
|
||||
46
assets/pickup_item_indicator.tscn
Normal file
@@ -0,0 +1,46 @@
|
||||
[gd_scene load_steps=4 format=3 uid="uid://x3uwmwbobkoy"]
|
||||
|
||||
[ext_resource type="Script" path="res://scripts/pickup_item_indicator.gd" id="1_3ji4d"]
|
||||
[ext_resource type="Texture2D" uid="uid://cmnhd40dvn3l3" path="res://assets/Textures/ObjectTextures/rocket.png" id="1_xksdo"]
|
||||
[ext_resource type="Theme" uid="uid://buma708jpxqrn" path="res://Clean_theme.tres" id="3_etc64"]
|
||||
|
||||
[node name="PickupItemIndicator" type="Control"]
|
||||
z_index = -1
|
||||
layout_mode = 3
|
||||
anchors_preset = 0
|
||||
offset_right = 250.0
|
||||
offset_bottom = 250.0
|
||||
script = ExtResource("1_3ji4d")
|
||||
|
||||
[node name="image" type="TextureRect" parent="."]
|
||||
layout_mode = 2
|
||||
offset_left = -226.0
|
||||
offset_top = -131.0
|
||||
offset_right = 286.0
|
||||
offset_bottom = 381.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
size_flags_horizontal = 4
|
||||
size_flags_vertical = 4
|
||||
texture = ExtResource("1_xksdo")
|
||||
|
||||
[node name="Label" type="Label" parent="image"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 8
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
offset_left = -100.0
|
||||
offset_top = -42.0
|
||||
offset_right = 86.0
|
||||
offset_bottom = 63.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
size_flags_horizontal = 4
|
||||
theme = ExtResource("3_etc64")
|
||||
theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
|
||||
theme_override_constants/outline_size = 19
|
||||
theme_override_font_sizes/font_size = 100
|
||||
text = "999"
|
||||
horizontal_alignment = 1
|
||||
@@ -1460,10 +1460,12 @@ transform = Transform3D(4.17223e-07, 5.99699e-19, 2.10229, -2.98023e-07, -2.1022
|
||||
transform = Transform3D(4.17223e-07, 7.04731e-19, 2.10229, -2.98023e-07, -2.10229, -5.96046e-08, 2.1023, -2.38418e-07, -2.98033e-07, 0.126097, 0.1392, -0.0677698)
|
||||
|
||||
[node name="hammer" parent="revolver1" index="1"]
|
||||
cast_shadow = 0
|
||||
mesh = SubResource("ArrayMesh_0w43n")
|
||||
|
||||
[node name="Trigger" parent="revolver1" index="2"]
|
||||
transform = Transform3D(0.207537, -0.978227, 4.27597e-08, 0, -4.37114e-08, -1, 0.978227, 0.207537, -9.07173e-09, 0.226752, 0, -0.00209358)
|
||||
cast_shadow = 0
|
||||
mesh = SubResource("ArrayMesh_ahftj")
|
||||
|
||||
[node name="flare" type="MeshInstance3D" parent="revolver1" index="3"]
|
||||
|
||||