j/Boat-Battle
1
0
Fork 0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2025-02-04 12:28:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'game-logic'

Browse Source
This commit is contained in:
John
2021-11-24 22:32:17 -06:00
parent 06b8711a08 af9b18243e
commit 21a5de5701
83 changed files with 2184 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
godot_ship/assets/game/HitMissAtlas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

43
godot_ship/assets/game/HitMissAtlas.png.import Normal file
View File

@@ -0,0 +1,43 @@
[remap]
importer="texture"
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"
>>>>>>> game-logic:godot_ship/assets/game/HitMissAtlas.png.import
metadata={
"vram_texture": false
}
[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"
dest_files=[ "res://.import/HitMissAtlas.png-47e352b9aa0deb2bd08f554355b13c14.stex" ]
>>>>>>> game-logic:godot_ship/assets/game/HitMissAtlas.png.import
[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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

BIN
godot_ship/assets/game/TextureAtlas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

34
godot_ship/assets/game/TextureAtlas.png.import Normal file
View File

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