From f2d0a60692306c650a756e2149ec00cf8afeafc1 Mon Sep 17 00:00:00 2001 From: Connor Elsworth Date: Wed, 17 Apr 2024 12:23:09 -0400 Subject: [PATCH 1/3] Add monitor emissive map --- props/OldPc/Monitor.fbx | 4 ++-- props/OldPc/Textures/mat_Monitor_Emissive.png | 3 +++ props/OldPc/Textures/mat_Monitor_basecolor.png | 4 ++-- ui/T_BossHealthBar_Mask.png | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 props/OldPc/Textures/mat_Monitor_Emissive.png create mode 100644 ui/T_BossHealthBar_Mask.png diff --git a/props/OldPc/Monitor.fbx b/props/OldPc/Monitor.fbx index b260561..b9b0625 100644 --- a/props/OldPc/Monitor.fbx +++ b/props/OldPc/Monitor.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2fdc060128b9fadf68504bf6b59a99d30e7b9b25389d1d3be485e078848f959 -size 61184 +oid sha256:c3f6c00da23d4555415e9e69b52276a5ecbd0cbb0ba813e8909723b5cc0ff620 +size 71712 diff --git a/props/OldPc/Textures/mat_Monitor_Emissive.png b/props/OldPc/Textures/mat_Monitor_Emissive.png new file mode 100644 index 0000000..677565a --- /dev/null +++ b/props/OldPc/Textures/mat_Monitor_Emissive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:931ebf3a65735c651c90473d0fa17e74ffe9a2d7ad11a3f93afe270922b30b67 +size 15107 diff --git a/props/OldPc/Textures/mat_Monitor_basecolor.png b/props/OldPc/Textures/mat_Monitor_basecolor.png index a336854..f79be58 100644 --- a/props/OldPc/Textures/mat_Monitor_basecolor.png +++ b/props/OldPc/Textures/mat_Monitor_basecolor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8a81ecc35f2e511a423f532719447d15f34e5a09ffbb1d63ac34cc537df8d28 -size 263031 +oid sha256:3fd76f9ea085f277e08548ec99276da8efb931b7fcb3a5b4ffde34b3d16b6975 +size 273986 diff --git a/ui/T_BossHealthBar_Mask.png b/ui/T_BossHealthBar_Mask.png new file mode 100644 index 0000000..ea07743 --- /dev/null +++ b/ui/T_BossHealthBar_Mask.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:769d5f6a94b2cfb51b03485090d1b2d795e7016513e1c5b5426de68bbbe8cd5e +size 2229 From 9ec91d25f2ed2f74dc2baa08ae24eac945da8380 Mon Sep 17 00:00:00 2001 From: Alan O'Cull Date: Wed, 17 Apr 2024 13:43:50 -0400 Subject: [PATCH 2/3] Add head cleave, armor to Infantry, update animation pipeline --- characters/infantry/cfg_ironpress.json | 15 +++++++++++++++ characters/infantry/models/body/cleave.fbx | 3 +++ characters/infantry/p10-rigging.blend | 4 ++-- characters/infantry/textures/mat_cleave_arm.png | 3 +++ .../infantry/textures/mat_cleave_basecolor.png | 3 +++ .../infantry/textures/mat_cleave_normal.png | 3 +++ pipeline/export_all_anims.cmd | 8 +++++++- pipeline/pipeline_infantry.cmd | 3 +++ 8 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 characters/infantry/cfg_ironpress.json create mode 100644 characters/infantry/models/body/cleave.fbx create mode 100644 characters/infantry/textures/mat_cleave_arm.png create mode 100644 characters/infantry/textures/mat_cleave_basecolor.png create mode 100644 characters/infantry/textures/mat_cleave_normal.png create mode 100644 pipeline/pipeline_infantry.cmd diff --git a/characters/infantry/cfg_ironpress.json b/characters/infantry/cfg_ironpress.json new file mode 100644 index 0000000..4eaaf53 --- /dev/null +++ b/characters/infantry/cfg_ironpress.json @@ -0,0 +1,15 @@ +{ + "out": "..\\..\\export\\infantry\\textures", + "in": "textures", + "flip_normals": false, + "materials": { + "mat_cleave": { + "res_out": 1024, + "channels": [ + "basecolor", + "arm", + "normal" + ] + } + } +} diff --git a/characters/infantry/models/body/cleave.fbx b/characters/infantry/models/body/cleave.fbx new file mode 100644 index 0000000..2cfc7f1 --- /dev/null +++ b/characters/infantry/models/body/cleave.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3a24a949bf69716644f88547d81686f713d14705900dfce46606580e3f82d8b +size 15436 diff --git a/characters/infantry/p10-rigging.blend b/characters/infantry/p10-rigging.blend index 1334837..4c600dd 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:d112e5658a7f53def98948e98f80acdc467de52e722e8e704b78e324e1e7b20e -size 5753878 +oid sha256:639162a97d4d1d6e1d6eee85670e899017fc81a0944b7c27986e839a97b4e6c1 +size 6299985 diff --git a/characters/infantry/textures/mat_cleave_arm.png b/characters/infantry/textures/mat_cleave_arm.png new file mode 100644 index 0000000..d4882f9 --- /dev/null +++ b/characters/infantry/textures/mat_cleave_arm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b28cddd761575b454d56a887d595e4222b0adcaa5c59261f925bf21286cffc16 +size 1991476 diff --git a/characters/infantry/textures/mat_cleave_basecolor.png b/characters/infantry/textures/mat_cleave_basecolor.png new file mode 100644 index 0000000..26a4103 --- /dev/null +++ b/characters/infantry/textures/mat_cleave_basecolor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d36b5a43c107b1689bb9cfaa13382ff2eb2d81a6c4704be228cb3b5a343f7bca +size 2736081 diff --git a/characters/infantry/textures/mat_cleave_normal.png b/characters/infantry/textures/mat_cleave_normal.png new file mode 100644 index 0000000..5bdb66b --- /dev/null +++ b/characters/infantry/textures/mat_cleave_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58adbce7e12be5a5966d85486170924d5ade01ca246cbb822b9fd0bc61b29e09 +size 9540776 diff --git a/pipeline/export_all_anims.cmd b/pipeline/export_all_anims.cmd index 2c0df3e..2ee13b3 100644 --- a/pipeline/export_all_anims.cmd +++ b/pipeline/export_all_anims.cmd @@ -1,3 +1,9 @@ set PATH=%PATH%;"C:\Program Files\Blender Foundation\Blender 3.6" -blender ..\animations\infantry\anims-alan.blend --background --python export_anims.py + +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 + +REM Infantry Animations +blender ..\animations\infantry\anims-alan.blend --background --python export_anims.py +blender ..\animations\infantry\anims-shelby.blend --background --python export_anims.py diff --git a/pipeline/pipeline_infantry.cmd b/pipeline/pipeline_infantry.cmd new file mode 100644 index 0000000..b74fad0 --- /dev/null +++ b/pipeline/pipeline_infantry.cmd @@ -0,0 +1,3 @@ +REM Insurrectionist textures +ironpress.exe ..\characters\infantry\cfg_ironpress.json +pause > nul \ No newline at end of file From 5187f1bed109de25c04affafb5612e74e52f02cd Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 19 Apr 2024 13:46:01 -0400 Subject: [PATCH 3/3] BUTTON has 2 mesh objects in one fbx file --- props/button/mesh_button.fbx | 3 +++ props/button/texture/mat_button_arm.png | 3 +++ props/button/texture/mat_button_basecolor.png | 3 +++ props/button/texture/mat_button_emissive.png | 3 +++ props/button/texture/mat_button_normal.png | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 props/button/mesh_button.fbx create mode 100644 props/button/texture/mat_button_arm.png create mode 100644 props/button/texture/mat_button_basecolor.png create mode 100644 props/button/texture/mat_button_emissive.png create mode 100644 props/button/texture/mat_button_normal.png diff --git a/props/button/mesh_button.fbx b/props/button/mesh_button.fbx new file mode 100644 index 0000000..58c367b --- /dev/null +++ b/props/button/mesh_button.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13c3974426faf23e8a75548b07066d48bc3987a760fd4cc10e15fe4959302545 +size 46544 diff --git a/props/button/texture/mat_button_arm.png b/props/button/texture/mat_button_arm.png new file mode 100644 index 0000000..0e09ca4 --- /dev/null +++ b/props/button/texture/mat_button_arm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc088847926098375a1038982bc531a30cba2824815e74300d8c78e0fd84439d +size 2636183 diff --git a/props/button/texture/mat_button_basecolor.png b/props/button/texture/mat_button_basecolor.png new file mode 100644 index 0000000..b9614b1 --- /dev/null +++ b/props/button/texture/mat_button_basecolor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b798928846bd04aaabd27b19e087ffa947b586e342d6a5db92df3f856e59f926 +size 2816441 diff --git a/props/button/texture/mat_button_emissive.png b/props/button/texture/mat_button_emissive.png new file mode 100644 index 0000000..2e22e7d --- /dev/null +++ b/props/button/texture/mat_button_emissive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbd51ac41532777d4517535aefc308e30cc6ee20a10518f98d900f32f93ad9d8 +size 57066 diff --git a/props/button/texture/mat_button_normal.png b/props/button/texture/mat_button_normal.png new file mode 100644 index 0000000..cf4e84e --- /dev/null +++ b/props/button/texture/mat_button_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:597348a486fde2dc9ab2a65c8ed90fca6294aaba01720288062badbeb9511e09 +size 2892487