Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ship Animation Updates #46

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Ship Animation Updates #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e0e5a5
Ship updates
KamiQuasi Jan 14, 2023
9ed374e
Ship updates
KamiQuasi Jan 14, 2023
22890dc
Initial Ship animation
KamiQuasi Jan 16, 2023
a28bb02
Reduce ship animation complexity
KamiQuasi Jan 16, 2023
5961ae5
Add separate thrust
KamiQuasi Jan 18, 2023
7ad38dd
Fix Merge Conflicts
KamiQuasi Jan 18, 2023
4e432b0
Latest updates
KamiQuasi Jan 26, 2023
73a79f0
Merge main
KamiQuasi Jan 26, 2023
0ca2062
Animation Updates
KamiQuasi Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Assets/Sprites/Ships/health-green.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Assets/Sprites/Ships/health-green.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/health-green.png-4731e1654f1cf6585b81aadbc26e806d.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/Ships/health-green.png"
dest_files=[ "res://.import/health-green.png-4731e1654f1cf6585b81aadbc26e806d.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
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added Assets/Sprites/Ships/health-grey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Assets/Sprites/Ships/health-grey.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/health-grey.png-bcba478fd3fed9f2f17f792a3d16b360.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/Ships/health-grey.png"
dest_files=[ "res://.import/health-grey.png-bcba478fd3fed9f2f17f792a3d16b360.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
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added Assets/Sprites/Ships/health-orange.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Assets/Sprites/Ships/health-orange.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/health-orange.png-9990d8299172b15be0a3789a8754974f.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/Ships/health-orange.png"
dest_files=[ "res://.import/health-orange.png-9990d8299172b15be0a3789a8754974f.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
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added Assets/Sprites/Ships/health-red.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Assets/Sprites/Ships/health-red.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/health-red.png-72789e525e79317dc633a787c0acebda.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/Ships/health-red.png"
dest_files=[ "res://.import/health-red.png-72789e525e79317dc633a787c0acebda.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
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added Assets/Sprites/Ships/health.xcf
View file
Open in desktop
Binary file not shown.
Binary file added Assets/Sprites/Ships/spaceship_spritesheet.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Assets/Sprites/Ships/spaceship_spritesheet.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/spaceship_spritesheet.png-2d89419fd5f7955dfd129b3f651af4b1.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/Ships/spaceship_spritesheet.png"
dest_files=[ "res://.import/spaceship_spritesheet.png-2d89419fd5f7955dfd129b3f651af4b1.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
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added Assets/Sprites/Ships/thrust_spritesheet.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Assets/Sprites/Ships/thrust_spritesheet.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/thrust_spritesheet.png-45d215604095befdeadc8cf1e1567aa9.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Sprites/Ships/thrust_spritesheet.png"
dest_files=[ "res://.import/thrust_spritesheet.png-45d215604095befdeadc8cf1e1567aa9.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
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Loading