From 7ba66bc7a3dd08959a36f020d321bcd8a032cebe Mon Sep 17 00:00:00 2001 From: shelby Date: Fri, 23 Feb 2024 13:53:55 -0500 Subject: [PATCH 1/3] More Attacks --- animations/insurrectionist/anims-shelby_011.blend | 3 +++ animations/insurrectionist/anims-shelby_012.blend | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 animations/insurrectionist/anims-shelby_011.blend create mode 100644 animations/insurrectionist/anims-shelby_012.blend diff --git a/animations/insurrectionist/anims-shelby_011.blend b/animations/insurrectionist/anims-shelby_011.blend new file mode 100644 index 0000000..7b5f010 --- /dev/null +++ b/animations/insurrectionist/anims-shelby_011.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e29637731352d49d32274a80b3aa8df9a47ff3748e7ce519982124e260f30a9 +size 6175156 diff --git a/animations/insurrectionist/anims-shelby_012.blend b/animations/insurrectionist/anims-shelby_012.blend new file mode 100644 index 0000000..a767ae9 --- /dev/null +++ b/animations/insurrectionist/anims-shelby_012.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:057fe40b75e3984ffe95c1a89bd30f886f5b72e0996d6dd79fb3ec482c81fb2f +size 6333780 From c29888a5fa7a7ae36d5fdf7e04e83387cdcfc9b6 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 23 Feb 2024 14:49:46 -0500 Subject: [PATCH 2/3] jetpack model and texture --- characters/infantry/models/jetpack_asset/jetpack.fbx | 3 +++ characters/infantry/textures/mat_jetpack_arm.png | 3 +++ characters/infantry/textures/mat_jetpack_basecolor.png | 3 +++ characters/infantry/textures/mat_jetpack_emissive.png | 3 +++ characters/infantry/textures/mat_jetpack_normal.png | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 characters/infantry/models/jetpack_asset/jetpack.fbx create mode 100644 characters/infantry/textures/mat_jetpack_arm.png create mode 100644 characters/infantry/textures/mat_jetpack_basecolor.png create mode 100644 characters/infantry/textures/mat_jetpack_emissive.png create mode 100644 characters/infantry/textures/mat_jetpack_normal.png diff --git a/characters/infantry/models/jetpack_asset/jetpack.fbx b/characters/infantry/models/jetpack_asset/jetpack.fbx new file mode 100644 index 0000000..e7c049f --- /dev/null +++ b/characters/infantry/models/jetpack_asset/jetpack.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ccc4a0d435c799444ad5fb30d6f32397704ca597a8f35d47e9342b35f42763b +size 84080 diff --git a/characters/infantry/textures/mat_jetpack_arm.png b/characters/infantry/textures/mat_jetpack_arm.png new file mode 100644 index 0000000..3fe3b73 --- /dev/null +++ b/characters/infantry/textures/mat_jetpack_arm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cc4a53bf0acc5a6021bd4597728c79723e2c5204acd89593c6620f2b690b1e9 +size 4573804 diff --git a/characters/infantry/textures/mat_jetpack_basecolor.png b/characters/infantry/textures/mat_jetpack_basecolor.png new file mode 100644 index 0000000..82a44cc --- /dev/null +++ b/characters/infantry/textures/mat_jetpack_basecolor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e5c4d0d1a4683971ab4454eaa62cddb6418ce1c2cf70c2bcff7c222f5647f5b +size 3448690 diff --git a/characters/infantry/textures/mat_jetpack_emissive.png b/characters/infantry/textures/mat_jetpack_emissive.png new file mode 100644 index 0000000..972dc0e --- /dev/null +++ b/characters/infantry/textures/mat_jetpack_emissive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a774c1e7b5821f9e239a830e670ed01a60e1375b353894d4700f8aedf29c477 +size 17405 diff --git a/characters/infantry/textures/mat_jetpack_normal.png b/characters/infantry/textures/mat_jetpack_normal.png new file mode 100644 index 0000000..7380b8b --- /dev/null +++ b/characters/infantry/textures/mat_jetpack_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8e3dc55bf7e913cda4cc614c83584547b94950ac3af41addf47413353d1fbb5 +size 6197867 From 6dcada20da89d87da544c275c8928d077f935b63 Mon Sep 17 00:00:00 2001 From: shelby Date: Fri, 23 Feb 2024 18:29:57 -0500 Subject: [PATCH 3/3] Cycle Test --- animations/insurrectionist/anims-shelby_012.blend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/animations/insurrectionist/anims-shelby_012.blend b/animations/insurrectionist/anims-shelby_012.blend index a767ae9..57b6718 100644 --- a/animations/insurrectionist/anims-shelby_012.blend +++ b/animations/insurrectionist/anims-shelby_012.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:057fe40b75e3984ffe95c1a89bd30f886f5b72e0996d6dd79fb3ec482c81fb2f -size 6333780 +oid sha256:df18ed80a46a6befa507985a53943e304fcdb95190ceec005573a91989ed897f +size 6496044