From f4027819445d40526d98caf6070084c230bb211c Mon Sep 17 00:00:00 2001 From: Tommy Hochstetler Date: Fri, 19 Apr 2024 15:36:53 -0400 Subject: [PATCH 1/7] Update anims-tommy6.blend --- animations/insurrectionist/anims-tommy6.blend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/animations/insurrectionist/anims-tommy6.blend b/animations/insurrectionist/anims-tommy6.blend index 40199cd..5e05165 100644 --- a/animations/insurrectionist/anims-tommy6.blend +++ b/animations/insurrectionist/anims-tommy6.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ffc99bdfebaaa1f4b33f080c8d2f640ad6e06880fa28c8b411db0c6c27ca2ab -size 9842240 +oid sha256:897cf916284ae05001344863a6f9f774b3d525acff67e9afbba741d9eb59a000 +size 9844836 From 477e2e63432498dd0dd113c5ea19a58af88cb951 Mon Sep 17 00:00:00 2001 From: Alan O'Cull Date: Fri, 19 Apr 2024 15:40:17 -0400 Subject: [PATCH 2/7] Put Infantry rig back in Pose mode --- characters/infantry/p10-rigging.blend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/characters/infantry/p10-rigging.blend b/characters/infantry/p10-rigging.blend index 4c600dd..d4ea502 100644 --- a/characters/infantry/p10-rigging.blend +++ b/characters/infantry/p10-rigging.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:639162a97d4d1d6e1d6eee85670e899017fc81a0944b7c27986e839a97b4e6c1 -size 6299985 +oid sha256:e02db3db8e5dcc8c83de972831ca8f6fb3c38211a8558eb428ddc65ad8c3e7ea +size 6300257 From 1ad2340390615adfb18785d196f00cf6815c8ab4 Mon Sep 17 00:00:00 2001 From: alan Date: Sun, 21 Apr 2024 23:59:33 -0400 Subject: [PATCH 3/7] Render infantry for CGT365 --- animations/promotional/infantry_anims.blend | 3 +++ pipeline/export_all_anims.cmd | 1 + 2 files changed, 4 insertions(+) create mode 100644 animations/promotional/infantry_anims.blend diff --git a/animations/promotional/infantry_anims.blend b/animations/promotional/infantry_anims.blend new file mode 100644 index 0000000..7b389c4 --- /dev/null +++ b/animations/promotional/infantry_anims.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8635fb326d7a78b6914e9c3fa7eb188a3045bf7a169830f38242360dd8e13b5 +size 8572308 diff --git a/pipeline/export_all_anims.cmd b/pipeline/export_all_anims.cmd index 2ee13b3..8bab1cf 100644 --- a/pipeline/export_all_anims.cmd +++ b/pipeline/export_all_anims.cmd @@ -3,6 +3,7 @@ set PATH=%PATH%;"C:\Program Files\Blender Foundation\Blender 3.6" REM Insurrectionist Animations blender ..\animations\insurrectionist\anims-alan.blend --background --python export_anims.py blender ..\animations\insurrectionist\anims-shelby.blend --background --python export_anims.py +blender ..\animations\insurrectionist\anims-tommy6.blend --background --python export_anims.py REM Infantry Animations blender ..\animations\infantry\anims-alan.blend --background --python export_anims.py From 28f5ba706d2d732ba051acdf394af403c2bfb723 Mon Sep 17 00:00:00 2001 From: Tommy Hochstetler Date: Tue, 23 Apr 2024 23:07:41 -0400 Subject: [PATCH 4/7] edits --- animations/insurrectionist/anims-tommy6.blend | 4 ++-- animations/insurrectionist/anims-tommy7.blend | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 animations/insurrectionist/anims-tommy7.blend diff --git a/animations/insurrectionist/anims-tommy6.blend b/animations/insurrectionist/anims-tommy6.blend index 5e05165..d9d1f07 100644 --- a/animations/insurrectionist/anims-tommy6.blend +++ b/animations/insurrectionist/anims-tommy6.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:897cf916284ae05001344863a6f9f774b3d525acff67e9afbba741d9eb59a000 -size 9844836 +oid sha256:c4867aafb82dfa5f7f0a8edae7beae8a353efb8aa01cbe8446b15c533539b895 +size 9918128 diff --git a/animations/insurrectionist/anims-tommy7.blend b/animations/insurrectionist/anims-tommy7.blend new file mode 100644 index 0000000..60efbca --- /dev/null +++ b/animations/insurrectionist/anims-tommy7.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddfcaa849d47b5eed5851f6aaed960acaf9f8c5e565e9d27f0c4d7a15870f0fc +size 9933556 From e7349d7551ff614d3fde7aff76b8c4f636344833 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 24 Apr 2024 17:28:05 -0400 Subject: [PATCH 5/7] button button fix fixed button and replaced with button button --- props/button/mesh_button.fbx | 3 --- props/button/mesh_button_button.fbx | 3 +++ props/button/mesh_button_console.fbx | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 props/button/mesh_button.fbx create mode 100644 props/button/mesh_button_button.fbx create mode 100644 props/button/mesh_button_console.fbx diff --git a/props/button/mesh_button.fbx b/props/button/mesh_button.fbx deleted file mode 100644 index 58c367b..0000000 --- a/props/button/mesh_button.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13c3974426faf23e8a75548b07066d48bc3987a760fd4cc10e15fe4959302545 -size 46544 diff --git a/props/button/mesh_button_button.fbx b/props/button/mesh_button_button.fbx new file mode 100644 index 0000000..a5d1e35 --- /dev/null +++ b/props/button/mesh_button_button.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26b2b25e26231b9363d2f9374088baf5f5dc4ffd59e7567af1e8435d1a89cf30 +size 23584 diff --git a/props/button/mesh_button_console.fbx b/props/button/mesh_button_console.fbx new file mode 100644 index 0000000..414f304 --- /dev/null +++ b/props/button/mesh_button_console.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad419f8671566b2b921f28f74700eeca0129eb042feb5aa843dbe30b6d83590c +size 41728 From 20e68eb7bed847900aca15887aff7fdf14f58f5a Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 24 Apr 2024 17:30:35 -0400 Subject: [PATCH 6/7] Tower Model and Texture only mildly scuffed don't worry --- props/tower/textures/m_tower_arm.png | 3 +++ props/tower/textures/m_tower_basecolor.png | 3 +++ props/tower/textures/m_tower_normal.png | 3 +++ props/tower/tower.fbx | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 props/tower/textures/m_tower_arm.png create mode 100644 props/tower/textures/m_tower_basecolor.png create mode 100644 props/tower/textures/m_tower_normal.png create mode 100644 props/tower/tower.fbx diff --git a/props/tower/textures/m_tower_arm.png b/props/tower/textures/m_tower_arm.png new file mode 100644 index 0000000..89b1ce7 --- /dev/null +++ b/props/tower/textures/m_tower_arm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e933c797dc60e4ea1d6528822a85e633db48a0d6d8a596aedc86fc5eb539fee +size 12411677 diff --git a/props/tower/textures/m_tower_basecolor.png b/props/tower/textures/m_tower_basecolor.png new file mode 100644 index 0000000..d4a6292 --- /dev/null +++ b/props/tower/textures/m_tower_basecolor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7308daacba00bf9dbe8a655e3dc276e4c39181821977bf860dcf578a90a279e0 +size 4085248 diff --git a/props/tower/textures/m_tower_normal.png b/props/tower/textures/m_tower_normal.png new file mode 100644 index 0000000..20813e5 --- /dev/null +++ b/props/tower/textures/m_tower_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:259a020c4a733f2875a702dd3691043a93baa978433f7eb9d6ca76d201db40bb +size 4146518 diff --git a/props/tower/tower.fbx b/props/tower/tower.fbx new file mode 100644 index 0000000..8d7173d --- /dev/null +++ b/props/tower/tower.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61987ceb4407e78c40c84a4c78558fb2400724bf1e7c49b401b3fdf3409db92f +size 115456 From 57061b09afc9611b5038d27e80d242fc13b0d315 Mon Sep 17 00:00:00 2001 From: Tommy Hochstetler Date: Wed, 24 Apr 2024 19:35:42 -0400 Subject: [PATCH 7/7] Update anims-tommy.blend --- animations/insurrectionist/anims-tommy.blend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/animations/insurrectionist/anims-tommy.blend b/animations/insurrectionist/anims-tommy.blend index 8076705..5c0bc2a 100644 --- a/animations/insurrectionist/anims-tommy.blend +++ b/animations/insurrectionist/anims-tommy.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bc31128a53b3c1f62d37fff3b3c2d9530f163260c652849bb5c0ba7e1aca788 -size 3880452 +oid sha256:3d528d0b62ed23ecbc31823c8b4a6cd8ef5d27c678b7b109cdbe6ec3bea65e31 +size 9905724