From 362ab88f6ccfa99bcfd8cf6b725eb67a12f12541 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 28 Mar 2024 19:28:22 -0400 Subject: [PATCH 1/2] Boss Grenade --- props/Boss Grenade/BossGrenadeLP.fbx | 3 +++ props/Boss Grenade/Textures/mat_BossGrenade_arm.png | 3 +++ props/Boss Grenade/Textures/mat_BossGrenade_basecolor.png | 3 +++ props/Boss Grenade/Textures/mat_BossGrenade_emissive.png | 3 +++ props/Boss Grenade/Textures/mat_BossGrenade_normal.png | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 props/Boss Grenade/BossGrenadeLP.fbx create mode 100644 props/Boss Grenade/Textures/mat_BossGrenade_arm.png create mode 100644 props/Boss Grenade/Textures/mat_BossGrenade_basecolor.png create mode 100644 props/Boss Grenade/Textures/mat_BossGrenade_emissive.png create mode 100644 props/Boss Grenade/Textures/mat_BossGrenade_normal.png diff --git a/props/Boss Grenade/BossGrenadeLP.fbx b/props/Boss Grenade/BossGrenadeLP.fbx new file mode 100644 index 0000000..425245b --- /dev/null +++ b/props/Boss Grenade/BossGrenadeLP.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b99c652c5ebbc39dffa3fbb5c3e27669f2c196c5d722fcc92b9b0bf80b9d601e +size 38720 diff --git a/props/Boss Grenade/Textures/mat_BossGrenade_arm.png b/props/Boss Grenade/Textures/mat_BossGrenade_arm.png new file mode 100644 index 0000000..a8da947 --- /dev/null +++ b/props/Boss Grenade/Textures/mat_BossGrenade_arm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e928719ddeb3716f33d01367a76fb5da2232898d812fa425eb665ef49d838054 +size 256547 diff --git a/props/Boss Grenade/Textures/mat_BossGrenade_basecolor.png b/props/Boss Grenade/Textures/mat_BossGrenade_basecolor.png new file mode 100644 index 0000000..a745a2e --- /dev/null +++ b/props/Boss Grenade/Textures/mat_BossGrenade_basecolor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b30630ada50f99bfdd430afce988ce469f5c679337d787fa7a9be1c4140326d4 +size 174054 diff --git a/props/Boss Grenade/Textures/mat_BossGrenade_emissive.png b/props/Boss Grenade/Textures/mat_BossGrenade_emissive.png new file mode 100644 index 0000000..f4f5fb6 --- /dev/null +++ b/props/Boss Grenade/Textures/mat_BossGrenade_emissive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42b9dcc89df1016b518557890836cc7d352ef06d34f778cb80601f90a3d8a13f +size 7485 diff --git a/props/Boss Grenade/Textures/mat_BossGrenade_normal.png b/props/Boss Grenade/Textures/mat_BossGrenade_normal.png new file mode 100644 index 0000000..c1ff70a --- /dev/null +++ b/props/Boss Grenade/Textures/mat_BossGrenade_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e44bec13b424018b526d596ba5a6203846451e5d8175c368d3b26d8f21af5542 +size 98891 From 1847db31c9895a52262a5a09a7251e16462a5789 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 29 Mar 2024 00:08:37 -0400 Subject: [PATCH 2/2] Fix some pipeline bugs --- animations/infantry/anims-alan.blend | 4 ++-- pipeline/export_anims.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/animations/infantry/anims-alan.blend b/animations/infantry/anims-alan.blend index da2b1d1..7ebdf54 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:14e6eecf938b48fb84fd0d724f01a8efaac30082403b26bb385bfe4e2e94edcc -size 3297452 +oid sha256:4c56b2c106fcc3a1a6722d5b0f77611520d8aeba3798b939d2b0e453a29be15c +size 3434400 diff --git a/pipeline/export_anims.py b/pipeline/export_anims.py index 215b7cf..48eba69 100644 --- a/pipeline/export_anims.py +++ b/pipeline/export_anims.py @@ -36,10 +36,10 @@ for i in range(29,32): # bpy.ops.object.make_local(type='SELECT_OBDATA') # Clear all posing and pose constraints -# bpy.ops.object.mode_set(mode='POSE') # Enter pose mode -# bpy.ops.pose.select_all(action='SELECT') +bpy.ops.object.mode_set(mode='POSE') # Enter pose mode +bpy.ops.pose.select_all(action='SELECT') # bpy.ops.pose.constraints_clear() # Clear all constraints -# bpy.ops.pose.transforms_clear() # Clear all transforms +bpy.ops.pose.transforms_clear() # Clear all transforms # Export animations bpy.ops.export_scene.fbx(