diff options
author | Henrique Alves <henriquelalves@gmail.com> | 2022-07-17 11:14:16 -0300 |
---|---|---|
committer | Henrique Alves <henriquelalves@gmail.com> | 2022-07-17 11:14:16 -0300 |
commit | 0f24cb0fef9e4caea08941602ae52a8a18fab88d (patch) | |
tree | 57f3a8b8ad9c6f5a08b27a6884d445ef7946db59 | |
parent | bf3730fd6b36f8a3c9d874af1a8c732adbafecf8 (diff) | |
parent | 08a03bbab6342c2a9174e253f0c8ccb72c9d1e65 (diff) | |
download | gamejam-gmtk-2022-0f24cb0fef9e4caea08941602ae52a8a18fab88d.tar.gz gamejam-gmtk-2022-0f24cb0fef9e4caea08941602ae52a8a18fab88d.tar.bz2 gamejam-gmtk-2022-0f24cb0fef9e4caea08941602ae52a8a18fab88d.zip |
Merge remote-tracking branch 'origin/main'
-rw-r--r-- | Assets/Environment/BG-tiled.png | bin | 0 -> 7061 bytes | |||
-rw-r--r-- | Assets/Environment/BG-tiled.png.import | 35 | ||||
-rw-r--r-- | Scenes/Dungeon.tscn | 7 |
3 files changed, 40 insertions, 2 deletions
diff --git a/Assets/Environment/BG-tiled.png b/Assets/Environment/BG-tiled.png Binary files differnew file mode 100644 index 0000000..cc447a8 --- /dev/null +++ b/Assets/Environment/BG-tiled.png diff --git a/Assets/Environment/BG-tiled.png.import b/Assets/Environment/BG-tiled.png.import new file mode 100644 index 0000000..8e0cecd --- /dev/null +++ b/Assets/Environment/BG-tiled.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/BG-tiled.png-8b1fb8619bfbdaaa747ab36272a777e8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Environment/BG-tiled.png" +dest_files=[ "res://.import/BG-tiled.png-8b1fb8619bfbdaaa747ab36272a777e8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Scenes/Dungeon.tscn b/Scenes/Dungeon.tscn index e5f9450..de22f45 100644 --- a/Scenes/Dungeon.tscn +++ b/Scenes/Dungeon.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=2] +[gd_scene load_steps=29 format=2] [ext_resource path="res://Scenes/Dungeon.gd" type="Script" id=1] [ext_resource path="res://Scenes/CameraControl.gd" type="Script" id=2] @@ -7,6 +7,7 @@ [ext_resource path="res://Assets/AlegreyaSansSC-ExtraBold.ttf" type="DynamicFontData" id=5] [ext_resource path="res://Scenes/ScoreParticle.tscn" type="PackedScene" id=6] [ext_resource path="res://Assets/arm.png" type="Texture" id=7] +[ext_resource path="res://Assets/Environment/BG-tiled.png" type="Texture" id=8] [sub_resource type="ProceduralSky" id=2] @@ -305,11 +306,13 @@ light_energy = 0.5 layer = -1 [node name="Cleyton" type="TextureRect" parent="Background"] +modulate = Color( 0.690196, 0.494118, 0.768627, 1 ) anchor_right = 1.0 anchor_bottom = 1.0 rect_rotation = -0.0481524 -texture = ExtResource( 3 ) +texture = ExtResource( 8 ) expand = true +stretch_mode = 2 [node name="UIController" type="CanvasLayer" parent="."] script = ExtResource( 4 ) |