From 34da5017b17b1f9c49482a5c2fe0d6e6146a2d7f Mon Sep 17 00:00:00 2001 From: Alan O'Cull Date: Wed, 28 Feb 2024 14:02:43 -0500 Subject: [PATCH 1/4] Promotional materials for CGT365 milestone 2 presentation --- animations/infantry/anims-alan.blend | 4 ++-- animations/promotional/reel_infinite.blend | 3 +++ animations/promotional/reel_infinite.gif | 3 +++ characters/infantry/textures/mat_infantry_arm.png | 3 +++ characters/infantry/textures/mat_infantry_basecolor.png | 3 +++ characters/infantry/textures/mat_infantry_normal.png | 3 +++ props/ShippingContainer/preview.blend | 4 ++-- 7 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 animations/promotional/reel_infinite.blend create mode 100644 animations/promotional/reel_infinite.gif create mode 100644 characters/infantry/textures/mat_infantry_arm.png create mode 100644 characters/infantry/textures/mat_infantry_basecolor.png create mode 100644 characters/infantry/textures/mat_infantry_normal.png diff --git a/animations/infantry/anims-alan.blend b/animations/infantry/anims-alan.blend index bd72044..cd3f54b 100644 --- a/animations/infantry/anims-alan.blend +++ b/animations/infantry/anims-alan.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b96b184291ecb373a2ac19823eb0abd9345ed6b66351516400b934eee72f14c8 -size 2851756 +oid sha256:16930dc2f858587d4923e846f64d420a5a5c38b1286bcdf78f5854218e49c179 +size 3092816 diff --git a/animations/promotional/reel_infinite.blend b/animations/promotional/reel_infinite.blend new file mode 100644 index 0000000..bf781bc --- /dev/null +++ b/animations/promotional/reel_infinite.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c39d509790a999db0c03573f35e9763d1ecfc35208e18802a77a672a98d8938f +size 716664 diff --git a/animations/promotional/reel_infinite.gif b/animations/promotional/reel_infinite.gif new file mode 100644 index 0000000..e8656c0 --- /dev/null +++ b/animations/promotional/reel_infinite.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b92c42a33dd69ad03ccb3fa733c8138665963fb33db5721782d6b1e39873d7bd +size 1327852 diff --git a/characters/infantry/textures/mat_infantry_arm.png b/characters/infantry/textures/mat_infantry_arm.png new file mode 100644 index 0000000..e11d9de --- /dev/null +++ b/characters/infantry/textures/mat_infantry_arm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adf5264f2913ad9334b462e14fb3d02d892bd5c2f18fb045b993fb965ef2fcc2 +size 8059796 diff --git a/characters/infantry/textures/mat_infantry_basecolor.png b/characters/infantry/textures/mat_infantry_basecolor.png new file mode 100644 index 0000000..030bd29 --- /dev/null +++ b/characters/infantry/textures/mat_infantry_basecolor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26b65b3ab7a6f13a23116b483d317bec41f8c5ca751fb90cc4cccc42c6742365 +size 59198 diff --git a/characters/infantry/textures/mat_infantry_normal.png b/characters/infantry/textures/mat_infantry_normal.png new file mode 100644 index 0000000..375ab6d --- /dev/null +++ b/characters/infantry/textures/mat_infantry_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa67ef9098824d87f7b1486a36043f483d29d63b35b019d5d0d6014ec30be1ed +size 42506453 diff --git a/props/ShippingContainer/preview.blend b/props/ShippingContainer/preview.blend index ddc428b..e02164b 100644 --- a/props/ShippingContainer/preview.blend +++ b/props/ShippingContainer/preview.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a852f3693d407d1141b76761ea2c166eaa87bb1269acb4247cc7c051b5bff60 -size 1032827 +oid sha256:3ff65180b2729ca4c26e677d50d61b96426c8a1ddaf3bb4c5c003ab63e628e7f +size 1074135 From 81ac7795113bed37e7c4a315c37aecc1bda0bae8 Mon Sep 17 00:00:00 2001 From: alan Date: Wed, 28 Feb 2024 16:04:37 -0500 Subject: [PATCH 2/4] Move some renders to a 'promotional' folder --- animations/infantry/anims-alan.blend | 4 ++-- characters/infantry/p10-rigging.blend | 4 ++-- promotional/insurrectionist/axe_spin.png | 3 +++ promotional/insurrectionist/grapple_aim.png | 3 +++ .../insurrectionist}/reel_infinite.gif | 0 5 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 promotional/insurrectionist/axe_spin.png create mode 100644 promotional/insurrectionist/grapple_aim.png rename {animations/promotional => promotional/insurrectionist}/reel_infinite.gif (100%) diff --git a/animations/infantry/anims-alan.blend b/animations/infantry/anims-alan.blend index cd3f54b..bcdc0d9 100644 --- a/animations/infantry/anims-alan.blend +++ b/animations/infantry/anims-alan.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16930dc2f858587d4923e846f64d420a5a5c38b1286bcdf78f5854218e49c179 -size 3092816 +oid sha256:87e7a1cbbcf40a9282c91609e67f8d068e1de1e3cc3784fce178c7c1967dd706 +size 3168064 diff --git a/characters/infantry/p10-rigging.blend b/characters/infantry/p10-rigging.blend index 041cb61..ea079ab 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:d2b10bb9d115f238fa03e4ecd1d04f3fc96a488d8c07099cbeb5ff800749a4d7 -size 5633721 +oid sha256:b6ba39f749ad1c7ea973f2e37b1b19da62c7c1604c4ce1e81bb606f7c491330d +size 5655806 diff --git a/promotional/insurrectionist/axe_spin.png b/promotional/insurrectionist/axe_spin.png new file mode 100644 index 0000000..2dd75fc --- /dev/null +++ b/promotional/insurrectionist/axe_spin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7918ca35340c0ea707a60b513af3f510721fa171143fb933c1dec0eeefe21d4c +size 855188 diff --git a/promotional/insurrectionist/grapple_aim.png b/promotional/insurrectionist/grapple_aim.png new file mode 100644 index 0000000..f1b4c48 --- /dev/null +++ b/promotional/insurrectionist/grapple_aim.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dcb3165b9ae823fbaf18e03b4c90098c609c0f45bcf9ff7b3eeefce88e45471 +size 833291 diff --git a/animations/promotional/reel_infinite.gif b/promotional/insurrectionist/reel_infinite.gif similarity index 100% rename from animations/promotional/reel_infinite.gif rename to promotional/insurrectionist/reel_infinite.gif From c27111f17188277e23ecb56fdeb226090cfa17f0 Mon Sep 17 00:00:00 2001 From: Tommy Hochstetler Date: Wed, 28 Feb 2024 21:32:22 -0500 Subject: [PATCH 3/4] Update anims-tommy.blend --- animations/infantry/Tommy/anims-tommy.blend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/animations/infantry/Tommy/anims-tommy.blend b/animations/infantry/Tommy/anims-tommy.blend index 22326be..df76a79 100644 --- a/animations/infantry/Tommy/anims-tommy.blend +++ b/animations/infantry/Tommy/anims-tommy.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f1e0f6f9e49cdb2632ac9573b6c76330bcd81dbdfb22a096c2130a044929b0b -size 3296496 +oid sha256:232aa3d94f71803af7890ec387d2cee71d9ccc80abca0d94d1cf3cd941d42714 +size 3587920 From d7a80622ce3d30e1658711e83f7b23473827c83b Mon Sep 17 00:00:00 2001 From: Tommy Hochstetler Date: Wed, 28 Feb 2024 21:43:34 -0500 Subject: [PATCH 4/4] Update anims-tommy.blend --- animations/infantry/Tommy/anims-tommy.blend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/animations/infantry/Tommy/anims-tommy.blend b/animations/infantry/Tommy/anims-tommy.blend index df76a79..ccf9d2b 100644 --- a/animations/infantry/Tommy/anims-tommy.blend +++ b/animations/infantry/Tommy/anims-tommy.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:232aa3d94f71803af7890ec387d2cee71d9ccc80abca0d94d1cf3cd941d42714 -size 3587920 +oid sha256:d34d8aa74f79d599c4ca07db74a26f7509fffee43506600801077c24ca98335a +size 3943348