Psychomerge

This commit is contained in:
Pal
2025-09-25 17:41:08 -07:00
270 changed files with 839 additions and 686 deletions

View File

@@ -0,0 +1,44 @@
[remap]
importer="texture"
type="CompressedTexture2D"
<<<<<<<< HEAD:Zennysoft.Game.Ma/src/minimap/textures/Room Maps/corridor Straight.png.import
uid="uid://dddv7r2ab5x36"
path="res://.godot/imported/corridor Straight.png-b01b6970d3ff3d23f97927e8450825e4.ctex"
========
uid="uid://bkxbgimxamjjn"
path="res://.godot/imported/gossip_stele.png-ed5ae96280085586f545cfcd8b22a0ec.ctex"
>>>>>>>> f75cd03744b8596bb9035516cb536abaceacf2ad:Zennysoft.Game.Ma/src/map/assets/gossip_stele.png.import
metadata={
"vram_texture": false
}
[deps]
<<<<<<<< HEAD:Zennysoft.Game.Ma/src/minimap/textures/Room Maps/corridor Straight.png.import
source_file="res://src/minimap/textures/Room Maps/corridor Straight.png"
dest_files=["res://.godot/imported/corridor Straight.png-b01b6970d3ff3d23f97927e8450825e4.ctex"]
========
source_file="res://src/map/assets/gossip_stele.png"
dest_files=["res://.godot/imported/gossip_stele.png-ed5ae96280085586f545cfcd8b22a0ec.ctex"]
>>>>>>>> f75cd03744b8596bb9035516cb536abaceacf2ad:Zennysoft.Game.Ma/src/map/assets/gossip_stele.png.import
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0