mirror of
https://github.com/JohnBreaux/Boat-Battle.git
synced 2024-11-15 05:25:57 +00:00
Reimport assets with texture filtering disabled
This commit is contained in:
parent
21a5de5701
commit
c290cfd0f6
@ -1,3 +1,3 @@
|
|||||||
source_md5="d7fa4a808d473904c3043c7892700d02"
|
source_md5="d7fa4a808d473904c3043c7892700d02"
|
||||||
dest_md5="603497c5e82c90610e6693faacd65c41"
|
dest_md5="79d2761024299394407590a3c9590ba8"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="e860aab5fa3b6ce9c5831b3624861eb0"
|
source_md5="e860aab5fa3b6ce9c5831b3624861eb0"
|
||||||
dest_md5="a265f8881bf649748bb86076a1059462"
|
dest_md5="6cfd2389113f263dc5b688a08942f9dd"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="f1043053126af1a739ae9a6d20541705"
|
source_md5="f1043053126af1a739ae9a6d20541705"
|
||||||
dest_md5="33d90f901d38e94006bc94b2bafbcc7f"
|
dest_md5="b8036943867f6bf24077960327ed2b97"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="e5510033f1a1421d95771be4d1f17c06"
|
source_md5="e5510033f1a1421d95771be4d1f17c06"
|
||||||
dest_md5="acfea8b7761d165a201dbc0a0af2c167"
|
dest_md5="e80f208bbbbd2ca30e0a7359660729b1"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="236f053c1af2cb6dc8fb21dd8c49fee6"
|
source_md5="236f053c1af2cb6dc8fb21dd8c49fee6"
|
||||||
dest_md5="e8811c15e8ebcd4a71c62994dc9c6d5a"
|
dest_md5="7fc84b78077c1b49d4a882905def4f97"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="dc5c89239ead115c7989cdbee213c307"
|
source_md5="dc5c89239ead115c7989cdbee213c307"
|
||||||
dest_md5="d26cc3c5d8c5165d3f5afb242806bdb4"
|
dest_md5="2b046b004e32d55eddb3f221f313e885"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="d743da5448801d5a71eb2caff679e6ff"
|
source_md5="d743da5448801d5a71eb2caff679e6ff"
|
||||||
dest_md5="5d974b679ce52f358bf54f29b7a68669"
|
dest_md5="3184b5500b4d274c2a28f30369cb91fe"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="4608512057ad7b079766b3ddf107024a"
|
source_md5="4608512057ad7b079766b3ddf107024a"
|
||||||
dest_md5="8f5996bd2322644767582317aefaf44d"
|
dest_md5="360db98d84e4b72717b0996af7233b3b"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="d170428fb8fee49a5eb5678c98b2250a"
|
source_md5="d170428fb8fee49a5eb5678c98b2250a"
|
||||||
dest_md5="b0ca5f775a2fc3f7bb0490efd7529b1f"
|
dest_md5="87e09d85627d00797694e1356ac184f6"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="63dd36a667b0c12811b2125ee52eccfa"
|
source_md5="63dd36a667b0c12811b2125ee52eccfa"
|
||||||
dest_md5="6d17cd95e250f32964311c12ff5cfaf8"
|
dest_md5="c4ef4c1f90d4bda5ea479c896e10e94f"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
source_md5="005f64fb1ff8de71218d3545cc20441c"
|
source_md5="005f64fb1ff8de71218d3545cc20441c"
|
||||||
dest_md5="dcee8e0391b5bffbc76299f1b93a1100"
|
dest_md5="0908c08a25eefd29b814ad5d83f456c9"
|
||||||
|
|
||||||
|
Binary file not shown.
@ -20,7 +20,7 @@ compress/hdr_mode=0
|
|||||||
compress/bptc_ldr=0
|
compress/bptc_ldr=0
|
||||||
compress/normal_map=0
|
compress/normal_map=0
|
||||||
flags/repeat=0
|
flags/repeat=0
|
||||||
flags/filter=true
|
flags/filter=false
|
||||||
flags/mipmaps=false
|
flags/mipmaps=false
|
||||||
flags/anisotropic=false
|
flags/anisotropic=false
|
||||||
flags/srgb=2
|
flags/srgb=2
|
||||||
|
@ -20,7 +20,7 @@ compress/hdr_mode=0
|
|||||||
compress/bptc_ldr=0
|
compress/bptc_ldr=0
|
||||||
compress/normal_map=0
|
compress/normal_map=0
|
||||||
flags/repeat=0
|
flags/repeat=0
|
||||||
flags/filter=true
|
flags/filter=false
|
||||||
flags/mipmaps=false
|
flags/mipmaps=false
|
||||||
flags/anisotropic=false
|
flags/anisotropic=false
|
||||||
flags/srgb=2
|
flags/srgb=2
|
||||||
|
@ -2,24 +2,15 @@
|
|||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="StreamTexture"
|
type="StreamTexture"
|
||||||
<<<<<<< HEAD:godot_ship/assets/backgrounds/Background_Dark.png.import
|
|
||||||
path="res://.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex"
|
|
||||||
=======
|
|
||||||
path="res://.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex"
|
path="res://.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex"
|
||||||
>>>>>>> game-logic:godot_ship/assets/game/HitMissAtlas.png.import
|
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
|
|
||||||
<<<<<<< HEAD:godot_ship/assets/backgrounds/Background_Dark.png.import
|
|
||||||
source_file="res://assets/backgrounds/Background_Dark.png"
|
|
||||||
dest_files=[ "res://.import/Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex" ]
|
|
||||||
=======
|
|
||||||
source_file="res://assets/game/HitMissAtlas.png"
|
source_file="res://assets/game/HitMissAtlas.png"
|
||||||
dest_files=[ "res://.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex" ]
|
dest_files=[ "res://.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex" ]
|
||||||
>>>>>>> game-logic:godot_ship/assets/game/HitMissAtlas.png.import
|
|
||||||
|
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
@ -29,7 +20,7 @@ compress/hdr_mode=0
|
|||||||
compress/bptc_ldr=0
|
compress/bptc_ldr=0
|
||||||
compress/normal_map=0
|
compress/normal_map=0
|
||||||
flags/repeat=0
|
flags/repeat=0
|
||||||
flags/filter=true
|
flags/filter=false
|
||||||
flags/mipmaps=false
|
flags/mipmaps=false
|
||||||
flags/anisotropic=false
|
flags/anisotropic=false
|
||||||
flags/srgb=2
|
flags/srgb=2
|
||||||
|
@ -20,7 +20,7 @@ compress/hdr_mode=0
|
|||||||
compress/bptc_ldr=0
|
compress/bptc_ldr=0
|
||||||
compress/normal_map=0
|
compress/normal_map=0
|
||||||
flags/repeat=0
|
flags/repeat=0
|
||||||
flags/filter=true
|
flags/filter=false
|
||||||
flags/mipmaps=false
|
flags/mipmaps=false
|
||||||
flags/anisotropic=false
|
flags/anisotropic=false
|
||||||
flags/srgb=2
|
flags/srgb=2
|
||||||
|
@ -20,7 +20,7 @@ compress/hdr_mode=0
|
|||||||
compress/bptc_ldr=0
|
compress/bptc_ldr=0
|
||||||
compress/normal_map=0
|
compress/normal_map=0
|
||||||
flags/repeat=0
|
flags/repeat=0
|
||||||
flags/filter=true
|
flags/filter=false
|
||||||
flags/mipmaps=false
|
flags/mipmaps=false
|
||||||
flags/anisotropic=false
|
flags/anisotropic=false
|
||||||
flags/srgb=2
|
flags/srgb=2
|
||||||
|
@ -20,7 +20,7 @@ compress/hdr_mode=0
|
|||||||
compress/bptc_ldr=0
|
compress/bptc_ldr=0
|
||||||
compress/normal_map=0
|
compress/normal_map=0
|
||||||
flags/repeat=0
|
flags/repeat=0
|
||||||
flags/filter=true
|
flags/filter=false
|
||||||
flags/mipmaps=false
|
flags/mipmaps=false
|
||||||
flags/anisotropic=false
|
flags/anisotropic=false
|
||||||
flags/srgb=2
|
flags/srgb=2
|
||||||
|
@ -2,24 +2,15 @@
|
|||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="StreamTexture"
|
type="StreamTexture"
|
||||||
<<<<<<< HEAD:godot_ship/assets/game/2Ship.png.import
|
|
||||||
path="res://.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex"
|
|
||||||
=======
|
|
||||||
path="res://.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex"
|
path="res://.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex"
|
||||||
>>>>>>> game-logic:godot_ship/assets/icons/Icon128.png.import
|
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
|
|
||||||
<<<<<<< HEAD:godot_ship/assets/game/2Ship.png.import
|
|
||||||
source_file="res://assets/game/2Ship.png"
|
|
||||||
dest_files=[ "res://.import/2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex" ]
|
|
||||||
=======
|
|
||||||
source_file="res://assets/icons/Icon128.png"
|
source_file="res://assets/icons/Icon128.png"
|
||||||
dest_files=[ "res://.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex" ]
|
dest_files=[ "res://.import/Icon128.png-8fa6a445b29adcafaf69c45a7d758b76.stex" ]
|
||||||
>>>>>>> game-logic:godot_ship/assets/icons/Icon128.png.import
|
|
||||||
|
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
@ -39,5 +30,5 @@ process/HDR_as_SRGB=false
|
|||||||
process/invert_color=false
|
process/invert_color=false
|
||||||
stream=false
|
stream=false
|
||||||
size_limit=0
|
size_limit=0
|
||||||
detect_3d=false
|
detect_3d=true
|
||||||
svg/scale=1.0
|
svg/scale=1.0
|
||||||
|
@ -2,24 +2,15 @@
|
|||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="StreamTexture"
|
type="StreamTexture"
|
||||||
<<<<<<< HEAD:godot_ship/assets/game/3ShipA.png.import
|
|
||||||
path="res://.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex"
|
|
||||||
=======
|
|
||||||
path="res://.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex"
|
path="res://.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex"
|
||||||
>>>>>>> game-logic:godot_ship/assets/icons/Icon16.png.import
|
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
|
|
||||||
<<<<<<< HEAD:godot_ship/assets/game/3ShipA.png.import
|
|
||||||
source_file="res://assets/game/3ShipA.png"
|
|
||||||
dest_files=[ "res://.import/3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex" ]
|
|
||||||
=======
|
|
||||||
source_file="res://assets/icons/Icon16.png"
|
source_file="res://assets/icons/Icon16.png"
|
||||||
dest_files=[ "res://.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex" ]
|
dest_files=[ "res://.import/Icon16.png-e916d7bb27530c71f994d2d2cacbe08b.stex" ]
|
||||||
>>>>>>> game-logic:godot_ship/assets/icons/Icon16.png.import
|
|
||||||
|
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
@ -39,5 +30,5 @@ process/HDR_as_SRGB=false
|
|||||||
process/invert_color=false
|
process/invert_color=false
|
||||||
stream=false
|
stream=false
|
||||||
size_limit=0
|
size_limit=0
|
||||||
detect_3d=false
|
detect_3d=true
|
||||||
svg/scale=1.0
|
svg/scale=1.0
|
||||||
|
@ -2,24 +2,15 @@
|
|||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="StreamTexture"
|
type="StreamTexture"
|
||||||
<<<<<<< HEAD:godot_ship/assets/game/3ShipB.png.import
|
|
||||||
path="res://.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.stex"
|
|
||||||
=======
|
|
||||||
path="res://.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex"
|
path="res://.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex"
|
||||||
>>>>>>> game-logic:godot_ship/assets/icons/Icon256.png.import
|
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
|
|
||||||
<<<<<<< HEAD:godot_ship/assets/game/3ShipB.png.import
|
|
||||||
source_file="res://assets/game/3ShipB.png"
|
|
||||||
dest_files=[ "res://.import/3ShipB.png-28ed039caa6839d715648812af8f65e4.stex" ]
|
|
||||||
=======
|
|
||||||
source_file="res://assets/icons/Icon256.png"
|
source_file="res://assets/icons/Icon256.png"
|
||||||
dest_files=[ "res://.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex" ]
|
dest_files=[ "res://.import/Icon256.png-5fcf1bd6fb6791cb3c432c7c88dff8da.stex" ]
|
||||||
>>>>>>> game-logic:godot_ship/assets/icons/Icon256.png.import
|
|
||||||
|
|
||||||
[params]
|
[params]
|
||||||
|
|
||||||
@ -39,5 +30,5 @@ process/HDR_as_SRGB=false
|
|||||||
process/invert_color=false
|
process/invert_color=false
|
||||||
stream=false
|
stream=false
|
||||||
size_limit=0
|
size_limit=0
|
||||||
detect_3d=false
|
detect_3d=true
|
||||||
svg/scale=1.0
|
svg/scale=1.0
|
||||||
|
@ -20,7 +20,7 @@ compress/hdr_mode=0
|
|||||||
compress/bptc_ldr=0
|
compress/bptc_ldr=0
|
||||||
compress/normal_map=0
|
compress/normal_map=0
|
||||||
flags/repeat=0
|
flags/repeat=0
|
||||||
flags/filter=true
|
flags/filter=false
|
||||||
flags/mipmaps=false
|
flags/mipmaps=false
|
||||||
flags/anisotropic=false
|
flags/anisotropic=false
|
||||||
flags/srgb=2
|
flags/srgb=2
|
||||||
|
@ -20,7 +20,7 @@ compress/hdr_mode=0
|
|||||||
compress/bptc_ldr=0
|
compress/bptc_ldr=0
|
||||||
compress/normal_map=0
|
compress/normal_map=0
|
||||||
flags/repeat=0
|
flags/repeat=0
|
||||||
flags/filter=true
|
flags/filter=false
|
||||||
flags/mipmaps=false
|
flags/mipmaps=false
|
||||||
flags/anisotropic=false
|
flags/anisotropic=false
|
||||||
flags/srgb=2
|
flags/srgb=2
|
||||||
|
Loading…
Reference in New Issue
Block a user