From fc4f4ed8d56a5210c37f4ffa11de9cf60216042b Mon Sep 17 00:00:00 2001 From: oier Date: Mon, 4 Sep 2023 22:42:35 +0200 Subject: [PATCH] inventory ui texture --- README.md | 4 + .../icons/cog-32.svg | 98 +++++++++++++++++ .../icons/cog-64-hover.svg | 100 +++++++++++++++++ .../icons/cog-64-press.svg | 101 ++++++++++++++++++ .../icons/cog-64.svg | 99 +++++++++++++++++ .../icons/cog.svg | 1 + .../images/inventory-bg.png | Bin 0 -> 5708 bytes .../inventory/inventory_ui.tscn | 28 +++-- 8 files changed, 416 insertions(+), 15 deletions(-) create mode 100644 gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-32.svg create mode 100644 gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg create mode 100644 gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-press.svg create mode 100644 gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64.svg create mode 100644 gymkhana/addons/escoria-ui-return-monkey-island/icons/cog.svg create mode 100644 gymkhana/addons/escoria-ui-return-monkey-island/images/inventory-bg.png diff --git a/README.md b/README.md index fd3d3e60..f160baea 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,10 @@ This is the demo game that acts as a testing ground for future Escoria developme ## Art credits +- Ripper paper texture [Image by starline](https://www.freepik.com/free-vector/three-long-piece-torn-papers-transparent-background_8563073.htm#query=ripped%20paper%20texture&position=0&from_view=keyword&track=ais) on Freepik + +- blank-white-notepaper-design texture [Image by rawpixel.com](https://www.freepik.com/free-vector/blank-white-notepaper-design_16397306.htm#query=notebook%20texture&position=0&from_view=keyword&track=ais) on Freepik + ### Characters - Mark spritesheet by Marco Giorgini - marcogiorgini.com diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-32.svg b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-32.svg new file mode 100644 index 00000000..79e55964 --- /dev/null +++ b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-32.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg new file mode 100644 index 00000000..f1c370ed --- /dev/null +++ b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-press.svg b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-press.svg new file mode 100644 index 00000000..43377fdb --- /dev/null +++ b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-press.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64.svg b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64.svg new file mode 100644 index 00000000..b2af242f --- /dev/null +++ b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog.svg b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog.svg new file mode 100644 index 00000000..c8ee71aa --- /dev/null +++ b/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/images/inventory-bg.png b/gymkhana/addons/escoria-ui-return-monkey-island/images/inventory-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..d6c7b9bfc9456281958b045370790dc360b7056a GIT binary patch literal 5708 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 R@}(lcK-Wa4>axRw{{mzynjQcE literal 0 HcmV?d00001 diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn index c75919a8..f851727b 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn @@ -1,14 +1,12 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_bg.png" type="Texture" id=2] [ext_resource path="res://addons/escoria-core/ui_library/inventory/esc_inventory_container.gd" type="Script" id=3] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/grey.png" type="Texture" id=4] +[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/inventory-bg.png" type="Texture" id=4] [node name="inventory_ui" type="Control"] -visible = false -anchor_right = 0.4 -anchor_bottom = 0.4 +anchor_right = 0.5 +anchor_bottom = 0.5 margin_right = 768.0 margin_bottom = 540.0 rect_min_size = Vector2( 90, 90 ) @@ -21,16 +19,15 @@ __meta__ = { } inventory_ui_container = NodePath("FloatingInventory/panel/MarginContainer/ScrollContainer/container") -[node name="HBoxContainer" type="HBoxContainer" parent="."] -anchor_right = 1.0 -anchor_bottom = 1.0 - [node name="FloatingInventory" type="CanvasLayer" parent="."] -[node name="grey" type="TextureRect" parent="FloatingInventory"] +[node name="paper" type="TextureRect" parent="FloatingInventory"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 577.0 +margin_top = 500.0 +margin_right = 2053.0 +margin_bottom = 631.0 +rect_scale = Vector2( 0.39, 0.29 ) mouse_filter = 2 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -47,7 +44,6 @@ margin_top = -160.0 rect_min_size = Vector2( 0, 160 ) size_flags_horizontal = 3 size_flags_vertical = 3 -texture = ExtResource( 2 ) expand = true __meta__ = { "_edit_use_anchors_": false @@ -56,6 +52,8 @@ __meta__ = { [node name="MarginContainer" type="MarginContainer" parent="FloatingInventory/panel"] anchor_right = 1.0 anchor_bottom = 1.0 +margin_left = -500.0 +margin_right = -16.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/margin_right = 20 @@ -66,14 +64,14 @@ custom_constants/margin_bottom = 20 [node name="ScrollContainer" type="ScrollContainer" parent="FloatingInventory/panel/MarginContainer"] margin_left = 20.0 margin_top = 80.0 -margin_right = 496.0 +margin_right = 980.0 margin_bottom = 80.0 size_flags_horizontal = 3 size_flags_vertical = 6 scroll_vertical_enabled = false [node name="container" type="HBoxContainer" parent="FloatingInventory/panel/MarginContainer/ScrollContainer"] -margin_right = 476.0 +margin_right = 960.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 20