Update enemy animations, make Loading screen a scene
This commit is contained in:
@@ -2,26 +2,16 @@
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
<<<<<<<< HEAD:Zennysoft.Game.Ma/src/minimap/textures/Room Maps/corridor Straight.png.import
|
||||
uid="uid://dddv7r2ab5x36"
|
||||
uid="uid://rmrq1762yxvv"
|
||||
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]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user