Skip to content

Commit

Permalink
v0.3
Browse files Browse the repository at this point in the history 
Aggiunta la mutua esclusione dei bottoni;
Completato Inventario e meccanica armi
  • Loading branch information
@TroncoNinja
TroncoNinja committed Apr 13, 2024
1 parent 874ce19 commit debf0c4
Show file tree
Hide file tree
Showing 31 changed files with 1,455 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .godot/editor/control.tscn-editstate-e66311c87c39ec8c25379305b5ae724b.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([])
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Control/TabContainer/Statistiche/HBoxContainer/VBoxContainer/HBoxContainer3/GridContainer/SpinBox"), NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Control/TabContainer/Statistiche/HBoxContainer/VBoxContainer/HBoxContainer3/GridContainer/SpinBox2"), NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Control/TabContainer/Statistiche/HBoxContainer/VBoxContainer/HBoxContainer3/GridContainer/SpinBox3"), NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Control/TabContainer/Statistiche/HBoxContainer/VBoxContainer/HBoxContainer3/GridContainer/SpinBox4")])
4 changes: 2 additions & 2 deletions .godot/editor/control.tscn-folding-e66311c87c39ec8c25379305b5ae724b.cfg
View file

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions .godot/editor/create_recent.Node
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
HSeparator
ColorRect
OptionButton
Button
SpinBox
Label
HBoxContainer
GridContainer
VSeparator
VBoxContainer
HBoxContainer
PanelContainer
OptionButton
TextureRect
HSeparator
ColorRect
Button
MenuButton
MenuBar
TextureRect
NinePatchRect
SpinBox
VSeparator
8 changes: 4 additions & 4 deletions .godot/editor/editor_layout.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ dock_split_2=0
dock_split_3=0
dock_hsplit_1=0
dock_hsplit_2=270
dock_hsplit_3=-270
dock_hsplit_3=-331
dock_hsplit_4=0
dock_filesystem_split=0
dock_filesystem_display_mode=0
dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1
dock_filesystem_selected_paths=PackedStringArray("res://weapons/weapon_victrix.svg")
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://weapons/")
dock_filesystem_selected_paths=PackedStringArray("res://gadgets/perk_di.svg")
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://gadgets/")
dock_3="Scene,Import"
dock_4="FileSystem"
dock_5="Inspector,Node,History"
Expand All @@ -32,7 +32,7 @@ current_scene="res://control.tscn"
center_split_offset=0
selected_bottom_panel_item=0
selected_default_debugger_tab_idx=0
selected_main_editor_idx=2
selected_main_editor_idx=0

[ScriptEditor]

Expand Down
16 changes: 11 additions & 5 deletions .godot/editor/filesystem_cache8
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
fc8a56933c4b1c8d796fdb8f7a9f9475
::res://::1712753548
control.tscn::PackedScene::3967560098168932687::1712753219::0::1::::<><>::uid://b72vtrk6dlb2p::::res://icons/iconaPg.svg<>uid://dxavjiunljyv6::::res://temi/tema_bottoni.tres<>uid://wqtgjxfpupi3::::res://icons/armor.svg<>uid://dijl332ttrhwv::::res://icons/hp_base.svg<>uid://yy4yyd1ke26p::::res://icons/armor_selected.svg<>uid://do7wgix1nuvft::::res://icons/hp_hit.svg<>uid://c730rud8k6j2l::::res://weapons/weapon_ak.svg<>res://MainWeapon.gd
export_presets.cfg::TextFile::-1::1712255379::0::1::::<><>::
::res://::1713029372
control.tscn::PackedScene::3967560098168932687::1713029372::0::1::::<><>::uid://b72vtrk6dlb2p::::res://icons/iconaPg.svg<>uid://dxavjiunljyv6::::res://temi/tema_bottoni.tres<>uid://wqtgjxfpupi3::::res://icons/armor.svg<>uid://dijl332ttrhwv::::res://icons/hp_base.svg<>uid://yy4yyd1ke26p::::res://icons/armor_selected.svg<>uid://do7wgix1nuvft::::res://icons/hp_hit.svg<>uid://c730rud8k6j2l::::res://weapons/weapon_ak.svg<>res://MainWeapon.gd<>uid://3q31v11i0kde::::res://gadgets/perk_di.svg
export_presets.cfg::TextFile::-1::1712753680::0::1::::<><>::
icon.svg::CompressedTexture2D::8999567548390004678::1712083807::1712083813::1::::<><>::
MainWeapon.gd::GDScript::-1::1712751707::0::1::::<>TextureRect<>::
personaggio.png::CompressedTexture2D::3132143129065055400::1712094052::1712094092::1::::<><>::
README.md::TextFile::-1::1712254056::0::1::::<><>::
::res://gadgets/::1713029254
perk_di.svg::CompressedTexture2D::2000065316717125274::1713029254::1713029441::1::::<><>::
perk_optic.svg::CompressedTexture2D::1308075419859058488::1713027024::1713029441::1::::<><>::
perk_shield.svg::CompressedTexture2D::2290471267322563813::1713028584::1713029441::1::::<><>::
perk_thermal.svg::CompressedTexture2D::7663302914960349493::1713027024::1713029441::1::::<><>::
perk_underbarrel.svg::CompressedTexture2D::5348606168675634946::1713027024::1713029441::1::::<><>::
::res://icons/::1712236650
armor.svg::CompressedTexture2D::1578349450216339800::1712169001::1712169007::1::::<><>::
armor_selected.svg::CompressedTexture2D::1735882231643847385::1712168966::1712169007::1::::<><>::
Expand All @@ -14,8 +20,8 @@ hp_hit.svg::CompressedTexture2D::8209312895662767617::1712235722::1712236650::1:
iconaPg.svg::CompressedTexture2D::4689511776159978257::1712088924::1712090174::1::::<><>::
::res://save/::1712752161
personaggio.png::CompressedTexture2D::2578078441298005491::1712752224::1712752161::1::::<><>::
::res://temi/::1712742912
tema_bottoni.tres::Theme::8774897035435919713::1712742912::0::1::::<><>::
::res://temi/::1713022593
tema_bottoni.tres::Theme::8774897035435919713::1713022593::0::1::::<><>::
::res://weapons/::1712745831
weapon_ak.svg::CompressedTexture2D::7078236280847835197::1712745831::1712745831::1::::<><>::
weapon_ar.svg::CompressedTexture2D::7053769743073270852::1712745831::1712745831::1::::<><>::
Expand Down
1 change: 0 additions & 1 deletion .godot/editor/filesystem_update4
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
res://control.tscn
res://temi/tema_bottoni.tres
res://MainWeapon.gd
2 changes: 1 addition & 1 deletion .godot/editor/project_metadata.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ last_selected_language="GDScript"

[recent_files]

scripts=["res://control.tscn::GDScript_yhbxl", "TextureRect", "Texture2D", "Image", "Button", "res://control.tscn::GDScript_fdhxj", "res://control.tscn::GDScript_8grla", "res://MainWeapon.gd", "res://control.tscn::", "String"]
scripts=["res://control.tscn::", "res://control.tscn::GDScript_yhbxl", "TextureRect", "Texture2D", "Image", "Button", "res://control.tscn::GDScript_fdhxj", "res://control.tscn::GDScript_8grla", "res://MainWeapon.gd", "String"]
scenes=["res://control.tscn"]

[color_picker]
Expand Down
2 changes: 1 addition & 1 deletion .godot/editor/recent_dirs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
E:/Godot Exports/Relase
res://temi
E:/Godot Exports/Relase
E:/Godot Exports/Debug
E:/exportGodot/web
E:/exportGodot
Expand Down
2 changes: 1 addition & 1 deletion .godot/editor/script_editor_cache.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ state={
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 8,
"scroll_position": 0.0,
"scroll_position": 4.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
Binary file added .godot/imported/perk_di.svg-838b2e358e62725a80654e8ff9a119d3.ctex
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/perk_di.svg-838b2e358e62725a80654e8ff9a119d3.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="4d652df96d5a75b94171fd500e12fa53"
dest_md5="f07fc83c554d516ab83e45b154f4d032"

Binary file added .godot/imported/perk_optic.svg-ee1c92dcf229164a7ebcf4dfee35c941.ctex
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/perk_optic.svg-ee1c92dcf229164a7ebcf4dfee35c941.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="a795ac1ff6788da9e5200659c24622a9"
dest_md5="5c1511717a03ced14cb652a68a678f36"

Binary file added .godot/imported/perk_shield.svg-19536ae3cae1a68f5343cf9fe65344a0.ctex
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/perk_shield.svg-19536ae3cae1a68f5343cf9fe65344a0.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="aad5d4282f9fe4e1b6bbb72457863af9"
dest_md5="44beac6304ce04c333ab1590ecf5dfca"

Binary file added .godot/imported/perk_thermal.svg-636790dc3ad45331d2cf273587ef2da7.ctex
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/perk_thermal.svg-636790dc3ad45331d2cf273587ef2da7.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="f1812aa24f5ea4dcb34897954379bbb1"
dest_md5="896616a14601c5a2d936d7869b6d81a5"

Binary file added .godot/imported/perk_underbarrel.svg-c50430c9504ccf6b0368d5f0d474e28a.ctex
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/perk_underbarrel.svg-c50430c9504ccf6b0368d5f0d474e28a.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="50b28cba5b61f9445518ff9a94c5eb0a"
dest_md5="7a9503cba6aaf387baf9c69be04850d8"

Binary file modified .godot/uid_cache.bin
View file
Binary file not shown.
Loading

0 comments on commit debf0c4

Please sign in to comment.