Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/assets

2024-04-25 23:47:42 -04:00 · 2024-04-25 23:47:42 -04:00 · 4c9ff53974
commit 4c9ff53974
parent 61c8761633 57061b09af
13 changed files with 31 additions and 9 deletions
--- a/animations/insurrectionist/anims-tommy.blend
+++ b/animations/insurrectionist/anims-tommy.blend
--- a/animations/insurrectionist/anims-tommy6.blend
+++ b/animations/insurrectionist/anims-tommy6.blend
--- a/animations/insurrectionist/anims-tommy7.blend
+++ b/animations/insurrectionist/anims-tommy7.blend
--- a/animations/promotional/infantry_anims.blend
+++ b/animations/promotional/infantry_anims.blend
--- a/characters/infantry/p10-rigging.blend
+++ b/characters/infantry/p10-rigging.blend
--- 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
--- a/props/button/mesh_button.fbx
+++ b/props/button/mesh_button.fbx
--- a/props/button/mesh_button_button.fbx
+++ b/props/button/mesh_button_button.fbx
--- a/props/button/mesh_button_console.fbx
+++ b/props/button/mesh_button_console.fbx
--- a/props/tower/textures/m_tower_arm.png
+++ b/props/tower/textures/m_tower_arm.png
--- a/props/tower/textures/m_tower_basecolor.png
+++ b/props/tower/textures/m_tower_basecolor.png
--- a/props/tower/textures/m_tower_normal.png
+++ b/props/tower/textures/m_tower_normal.png
--- a/props/tower/tower.fbx
+++ b/props/tower/tower.fbx