sandvich
/
SupaLidlGame
mirror of https://github.com/humanoidsandvichdispenser/SupaLidlgame
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: sandvich:f7a2abc949f2e2b319344288cac9043c8a2729ff
Branches Tags
sandvich:master
sandvich:fix-worldenv
sandvich:impl-save-inventory
sandvich:wip
sandvich:origin/master
sandvich:phantom-camera
sandvich:refactor
sandvich:issue-templates
sandvich:godot-4.3
sandvich:wip-inventory
sandvich:godot-4.2
sandvich:controller-support
sandvich:godot-4.1.1
sandvich:item-info
sandvich:2023-09-09
..
compare: sandvich:fb80aa5c12818b7f669857326e34c329604fc50a
Branches Tags
sandvich:master
sandvich:fix-worldenv
sandvich:impl-save-inventory
sandvich:wip
sandvich:origin/master
sandvich:phantom-camera
sandvich:refactor
sandvich:issue-templates
sandvich:godot-4.3
sandvich:wip-inventory
sandvich:godot-4.2
sandvich:controller-support
sandvich:godot-4.1.1
sandvich:item-info
sandvich:2023-09-09

No commits in common. "f7a2abc949f2e2b319344288cac9043c8a2729ff" and "fb80aa5c12818b7f669857326e34c329604fc50a" have entirely different histories.
f7a2abc949 ... fb80aa5c12

3 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
UI/Base.tscn
View File

@ -81,7 +81,7 @@ layout_mode = 2
theme_override_constants/margin_top = 16 theme_override_constants/margin_top = 16
theme_override_constants/margin_right = 16 theme_override_constants/margin_right = 16
[node name="Hotbar" parent="SubViewportContainer/UIViewport/MainUILayer/Main/Top/Right" node_paths=PackedStringArray("_slots") instance=ExtResource("5_mmp18")] [node name="GridContainer" parent="SubViewportContainer/UIViewport/MainUILayer/Main/Top/Right" node_paths=PackedStringArray("_slots") instance=ExtResource("5_mmp18")]
layout_mode = 2 layout_mode = 2
_slots = [NodePath("InventorySlot"), NodePath("InventorySlot2"), NodePath("InventorySlot3")] _slots = [NodePath("InventorySlot"), NodePath("InventorySlot2"), NodePath("InventorySlot3")]

2
UI/Hotbar.tscn
View File

@ -3,7 +3,7 @@
[ext_resource type="Script" path="res://UI/Hotbar.cs" id="1_2sak2"] [ext_resource type="Script" path="res://UI/Hotbar.cs" id="1_2sak2"]
[ext_resource type="PackedScene" uid="uid://ctad0dkoyw8ad" path="res://UI/InventorySlot.tscn" id="1_ct3cn"] [ext_resource type="PackedScene" uid="uid://ctad0dkoyw8ad" path="res://UI/InventorySlot.tscn" id="1_ct3cn"]
[node name="Hotbar" type="GridContainer" node_paths=PackedStringArray("_slots")] [node name="GridContainer" type="GridContainer" node_paths=PackedStringArray("_slots")]
anchors_preset = 1 anchors_preset = 1
anchor_left = 1.0 anchor_left = 1.0
anchor_right = 1.0 anchor_right = 1.0

1
UI/PostProcessing/Vignette.cs
View File

@ -8,6 +8,7 @@ public partial class Vignette : TextureRect
{ {
Events.EventBus.Instance.PlayerHurt += (Events.HurtArgs args) => Events.EventBus.Instance.PlayerHurt += (Events.HurtArgs args) =>
{ {
GD.Print("TIGHTEN!!!");
GetNode<AnimationPlayer>("AnimationPlayer").Play("tighten"); GetNode<AnimationPlayer>("AnimationPlayer").Play("tighten");
}; };
} }