diff --git a/CREDITS.md b/CREDITS.md index ee1152c..8c939cc 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,3 +1,4 @@ +- [Crosshair](godot/raw_assets/crosshair/) by [Lucian Pavel](https://opengameart.org/content/3-fps-crosshairs) - [Sound effects](godot/raw_assets/sfx/) from [zapsplat.com](https://www.zapsplat.com/) - [LaserFast and LaserWithRecovery](godot/raw_assets/sfx/) - [Hit](godot/raw_assets/sfx/Hit.mp3) diff --git a/godot/raw_assets/crosshair/Crosshair 1.png b/godot/raw_assets/crosshair/Crosshair 1.png new file mode 100644 index 0000000..c1bc317 Binary files /dev/null and b/godot/raw_assets/crosshair/Crosshair 1.png differ diff --git a/godot/raw_assets/crosshair/Crosshair 1.png.import b/godot/raw_assets/crosshair/Crosshair 1.png.import new file mode 100644 index 0000000..bee0062 --- /dev/null +++ b/godot/raw_assets/crosshair/Crosshair 1.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bdfqu6p74pfwe" +path="res://.godot/imported/Crosshair 1.png-517132c9af3a0a3e56eeaea3dfba2f8a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://raw_assets/crosshair/Crosshair 1.png" +dest_files=["res://.godot/imported/Crosshair 1.png-517132c9af3a0a3e56eeaea3dfba2f8a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/godot/raw_assets/crosshair/Crosshair 2.png b/godot/raw_assets/crosshair/Crosshair 2.png new file mode 100644 index 0000000..6ba9780 Binary files /dev/null and b/godot/raw_assets/crosshair/Crosshair 2.png differ diff --git a/godot/raw_assets/crosshair/Crosshair 2.png.import b/godot/raw_assets/crosshair/Crosshair 2.png.import new file mode 100644 index 0000000..3919827 --- /dev/null +++ b/godot/raw_assets/crosshair/Crosshair 2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://4rqm75hl2snl" +path="res://.godot/imported/Crosshair 2.png-c696bfb6246581ffd3bf5ad2a6bd9f38.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://raw_assets/crosshair/Crosshair 2.png" +dest_files=["res://.godot/imported/Crosshair 2.png-c696bfb6246581ffd3bf5ad2a6bd9f38.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/godot/raw_assets/crosshair/Crosshair 3.png b/godot/raw_assets/crosshair/Crosshair 3.png new file mode 100644 index 0000000..6631f04 Binary files /dev/null and b/godot/raw_assets/crosshair/Crosshair 3.png differ diff --git a/godot/raw_assets/crosshair/Crosshair 3.png.import b/godot/raw_assets/crosshair/Crosshair 3.png.import new file mode 100644 index 0000000..b52a524 --- /dev/null +++ b/godot/raw_assets/crosshair/Crosshair 3.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bfod6bifi6r0q" +path="res://.godot/imported/Crosshair 3.png-00a822bd145273ba4c31f94e60d6c0f2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://raw_assets/crosshair/Crosshair 3.png" +dest_files=["res://.godot/imported/Crosshair 3.png-00a822bd145273ba4c31f94e60d6c0f2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/godot/scenes/player/local_player.tscn b/godot/scenes/player/local_player.tscn index 0f90d0f..8fa053d 100644 --- a/godot/scenes/player/local_player.tscn +++ b/godot/scenes/player/local_player.tscn @@ -5,6 +5,7 @@ [ext_resource type="PackedScene" uid="uid://n3u0jr4wiib1" path="res://scenes/ui/settings.tscn" id="3_beej8"] [ext_resource type="PackedScene" uid="uid://2sfy0vq0fqt3" path="res://scenes/ui/player_listing.tscn" id="4_okac2"] [ext_resource type="PackedScene" uid="uid://ffh5txda3j1" path="res://scenes/ui/chat_box.tscn" id="5_cv68x"] +[ext_resource type="Texture2D" uid="uid://bdfqu6p74pfwe" path="res://raw_assets/crosshair/Crosshair 1.png" id="6_7awel"] [sub_resource type="Environment" id="Environment_3nx84"] glow_enabled = true @@ -148,6 +149,21 @@ offset_top = -300.0 offset_bottom = 0.0 grow_vertical = 0 +[node name="texture_rect" type="TextureRect" parent="." unique_id=1329977849] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -14.0 +offset_top = -14.25 +offset_right = 14.0 +offset_bottom = 14.25 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("6_7awel") +expand_mode = 3 + [connection signal="pressed" from="pause_menu/v_box_container/settings" to="settings" method="open"] [connection signal="pressed" from="pause_menu/v_box_container/exit_to_lobby" to="." method="exit_to_lobby"] [connection signal="pressed" from="pause_menu/v_box_container/exit" to="." method="exit"]