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 00000000..d6c7b9bf Binary files /dev/null and b/gymkhana/addons/escoria-ui-return-monkey-island/images/inventory-bg.png differ 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