Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Sammy 2021-06-13 00:37:59 +02:00
commit 06f44f17eb
4 changed files with 430 additions and 16 deletions

View File

@ -1,6 +1,6 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://assets/placeholder_white.png" type="Texture" id=1]
[ext_resource path="res://assets/Figur1.png" type="Texture" id=1]
[ext_resource path="res://Guest.gd" type="Script" id=2]
[sub_resource type="PhysicsMaterial" id=3]
@ -36,6 +36,7 @@ shape = SubResource( 1 )
disabled = true
[node name="Sprite" type="Sprite" parent="."]
scale = Vector2( 0.1, 0.1 )
texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]

File diff suppressed because one or more lines are too long

BIN
assets/Figur1.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

34
assets/Figur1.png.import Normal file
View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Figur1.png-0e2d731b6eeb8575db0cd2c3cc6736ae.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Figur1.png"
dest_files=[ "res://.import/Figur1.png-0e2d731b6eeb8575db0cd2c3cc6736ae.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=false
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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0