From 7d29c02d1f44f7389eb7c32693343622d3e3eff2 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 1 Feb 2024 19:13:00 -0500 Subject: [PATCH 1/6] Turret Textures --- Turret/Turret_Base.fbx | 3 --- Turret/Turret_Head.fbx | 4 ++-- Turret/materials/TurretBase/mat_TurretStand_AO.png | 3 +++ Turret/materials/TurretBase/mat_TurretStand_basecolor.png | 3 +++ Turret/materials/TurretBase/mat_TurretStand_metallic.png | 3 +++ Turret/materials/TurretBase/mat_TurretStand_normal.png | 3 +++ Turret/materials/TurretBase/mat_TurretStand_roughness.png | 3 +++ Turret/materials/TurretHead/mat_TurretHead_AO.png | 3 +++ Turret/materials/TurretHead/mat_turretHead_Emission.png | 3 +++ Turret/materials/TurretHead/mat_turretHead_basecolor.png | 3 +++ Turret/materials/TurretHead/mat_turretHead_metallic.png | 3 +++ Turret/materials/TurretHead/mat_turretHead_normal.png | 3 +++ Turret/materials/TurretHead/mat_turretHead_roughness.png | 3 +++ Turret/turret base.fbx | 3 +++ 14 files changed, 38 insertions(+), 5 deletions(-) delete mode 100644 Turret/Turret_Base.fbx create mode 100644 Turret/materials/TurretBase/mat_TurretStand_AO.png create mode 100644 Turret/materials/TurretBase/mat_TurretStand_basecolor.png create mode 100644 Turret/materials/TurretBase/mat_TurretStand_metallic.png create mode 100644 Turret/materials/TurretBase/mat_TurretStand_normal.png create mode 100644 Turret/materials/TurretBase/mat_TurretStand_roughness.png create mode 100644 Turret/materials/TurretHead/mat_TurretHead_AO.png create mode 100644 Turret/materials/TurretHead/mat_turretHead_Emission.png create mode 100644 Turret/materials/TurretHead/mat_turretHead_basecolor.png create mode 100644 Turret/materials/TurretHead/mat_turretHead_metallic.png create mode 100644 Turret/materials/TurretHead/mat_turretHead_normal.png create mode 100644 Turret/materials/TurretHead/mat_turretHead_roughness.png create mode 100644 Turret/turret base.fbx diff --git a/Turret/Turret_Base.fbx b/Turret/Turret_Base.fbx deleted file mode 100644 index 9dd7683..0000000 --- a/Turret/Turret_Base.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:473cb9612813fd109caa9416014a5c7875faa0bc3ee4e2d13f04d39fce20edba -size 244720 diff --git a/Turret/Turret_Head.fbx b/Turret/Turret_Head.fbx index ac04ef7..22cb05e 100644 --- a/Turret/Turret_Head.fbx +++ b/Turret/Turret_Head.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0751ad8ec956ae176abe72310d6992e1a5d25c4da596435895448d4decf0a6c -size 156112 +oid sha256:3a4d4a1d3aa0c6e4fdb6b336d5117fb578759e337bdb2ff245bebafb59c21558 +size 157568 diff --git a/Turret/materials/TurretBase/mat_TurretStand_AO.png b/Turret/materials/TurretBase/mat_TurretStand_AO.png new file mode 100644 index 0000000..cc96401 --- /dev/null +++ b/Turret/materials/TurretBase/mat_TurretStand_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64c659046b580159cc7c051a14c66cf1214a2783d81abe1bedf33e9a01091699 +size 1429932 diff --git a/Turret/materials/TurretBase/mat_TurretStand_basecolor.png b/Turret/materials/TurretBase/mat_TurretStand_basecolor.png new file mode 100644 index 0000000..22bdcff --- /dev/null +++ b/Turret/materials/TurretBase/mat_TurretStand_basecolor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c61ae9b18efe94ea7521462e5f5767d8d0b10a843e89e225f240a6c1b8bbdf4 +size 4241112 diff --git a/Turret/materials/TurretBase/mat_TurretStand_metallic.png b/Turret/materials/TurretBase/mat_TurretStand_metallic.png new file mode 100644 index 0000000..b852d8b --- /dev/null +++ b/Turret/materials/TurretBase/mat_TurretStand_metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3000baeb9cee5d9bb0abe5993e3f9d488e585c54420cc528fc5e9ba0767dfe92 +size 1340398 diff --git a/Turret/materials/TurretBase/mat_TurretStand_normal.png b/Turret/materials/TurretBase/mat_TurretStand_normal.png new file mode 100644 index 0000000..c46b6af --- /dev/null +++ b/Turret/materials/TurretBase/mat_TurretStand_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32eb892097f130b80b750870ab90fee4aafd7bf7a4925b46367d40448e01d1cf +size 451485 diff --git a/Turret/materials/TurretBase/mat_TurretStand_roughness.png b/Turret/materials/TurretBase/mat_TurretStand_roughness.png new file mode 100644 index 0000000..4836b7f --- /dev/null +++ b/Turret/materials/TurretBase/mat_TurretStand_roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6800f9ea9c5fbf3021ad0a8faaa83e6de067092e068f86bbbf6ddc53b2e4557b +size 909071 diff --git a/Turret/materials/TurretHead/mat_TurretHead_AO.png b/Turret/materials/TurretHead/mat_TurretHead_AO.png new file mode 100644 index 0000000..b9cb122 --- /dev/null +++ b/Turret/materials/TurretHead/mat_TurretHead_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1572da38c1481ff7cb89582e95e9b60f9971785061ab623bc1c7c9b172e1db4 +size 1329659 diff --git a/Turret/materials/TurretHead/mat_turretHead_Emission.png b/Turret/materials/TurretHead/mat_turretHead_Emission.png new file mode 100644 index 0000000..bb74a6d --- /dev/null +++ b/Turret/materials/TurretHead/mat_turretHead_Emission.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47e41764e32e47059bd71959df8a27f626c841d4cc6b8896db52242e4b88743a +size 9869 diff --git a/Turret/materials/TurretHead/mat_turretHead_basecolor.png b/Turret/materials/TurretHead/mat_turretHead_basecolor.png new file mode 100644 index 0000000..a83b341 --- /dev/null +++ b/Turret/materials/TurretHead/mat_turretHead_basecolor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8c4e991c9db5c1e17c6a80b2e68b54b7dfa618b2beb316868506e957d99a0c3 +size 1986609 diff --git a/Turret/materials/TurretHead/mat_turretHead_metallic.png b/Turret/materials/TurretHead/mat_turretHead_metallic.png new file mode 100644 index 0000000..56cf0bf --- /dev/null +++ b/Turret/materials/TurretHead/mat_turretHead_metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b897e6ac05a661dfeb6afcf66c45f96d0b388aa224ab65d4dd59d58ed1d4c64d +size 691326 diff --git a/Turret/materials/TurretHead/mat_turretHead_normal.png b/Turret/materials/TurretHead/mat_turretHead_normal.png new file mode 100644 index 0000000..b01f118 --- /dev/null +++ b/Turret/materials/TurretHead/mat_turretHead_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d64a28f4d5dbf35cf67d1dc49634f7c308b06fcebb5794eb40989f3d67f6df4 +size 2127898 diff --git a/Turret/materials/TurretHead/mat_turretHead_roughness.png b/Turret/materials/TurretHead/mat_turretHead_roughness.png new file mode 100644 index 0000000..1766a56 --- /dev/null +++ b/Turret/materials/TurretHead/mat_turretHead_roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe201813dbe1289dc91e5755fcb05a0573f151d1d76e7938ffcc962e407c5518 +size 494226 diff --git a/Turret/turret base.fbx b/Turret/turret base.fbx new file mode 100644 index 0000000..a8f1aea --- /dev/null +++ b/Turret/turret base.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a54d0b584bfad8defe7b2b776268404db213e492daf34b9b974f272201c23591 +size 191024 From 51641d9a71eed03ac5cca89d28a2acd4387e47ed Mon Sep 17 00:00:00 2001 From: alan Date: Thu, 1 Feb 2024 21:30:26 -0500 Subject: [PATCH 2/6] HUD cast audio --- audio/hud/cast_failure.wav | 3 +++ audio/hud/cast_ready.wav | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 audio/hud/cast_failure.wav create mode 100644 audio/hud/cast_ready.wav diff --git a/audio/hud/cast_failure.wav b/audio/hud/cast_failure.wav new file mode 100644 index 0000000..dafe15a --- /dev/null +++ b/audio/hud/cast_failure.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b42f36c9f07833c10bd3b41929b09434e27e4b0b4c57f922ac22d532eed6b69f +size 45702 diff --git a/audio/hud/cast_ready.wav b/audio/hud/cast_ready.wav new file mode 100644 index 0000000..7d8dddb --- /dev/null +++ b/audio/hud/cast_ready.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71dfc64699b6f007233901206be5ce9f0adf072c97107932f5cced75d53c9068 +size 26646 From f123d429d353cc9a4ab5ae92f3a3d4777a070475 Mon Sep 17 00:00:00 2001 From: shelby Date: Thu, 1 Feb 2024 23:23:01 -0500 Subject: [PATCH 3/6] Axe Spin + Axe Throw/Catch --- animations/insurrectionist/anims-shelby_005.blend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 animations/insurrectionist/anims-shelby_005.blend diff --git a/animations/insurrectionist/anims-shelby_005.blend b/animations/insurrectionist/anims-shelby_005.blend new file mode 100644 index 0000000..6894860 --- /dev/null +++ b/animations/insurrectionist/anims-shelby_005.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d10341c56f98bf22c972fe9cad1c09d9c5610de6ae05a68871dae8942a73de9 +size 3860780 From ecb768ca3d64edede94de12c740e920a7aa655ac Mon Sep 17 00:00:00 2001 From: Alan O'Cull Date: Sat, 3 Feb 2024 13:50:41 -0500 Subject: [PATCH 4/6] Slight animation fixes --- animations/insurrectionist/anims-shelby_005.blend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/animations/insurrectionist/anims-shelby_005.blend b/animations/insurrectionist/anims-shelby_005.blend index 6894860..b8cff59 100644 --- a/animations/insurrectionist/anims-shelby_005.blend +++ b/animations/insurrectionist/anims-shelby_005.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d10341c56f98bf22c972fe9cad1c09d9c5610de6ae05a68871dae8942a73de9 -size 3860780 +oid sha256:f0d0ff70409a2740c6e3336496eb1a27bd2948f0320e2848f8ebec051b216229 +size 4515692 From 64db7bc4aa50a309d23c7513f07414f46c1b66ad Mon Sep 17 00:00:00 2001 From: Alan O'Cull Date: Mon, 5 Feb 2024 13:19:20 -0500 Subject: [PATCH 5/6] Improve grapple aim, grapple reel + taunt animations --- animations/insurrectionist/anims-alan.blend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/animations/insurrectionist/anims-alan.blend b/animations/insurrectionist/anims-alan.blend index 28792f4..c00140f 100644 --- a/animations/insurrectionist/anims-alan.blend +++ b/animations/insurrectionist/anims-alan.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b17e12f22bdb3757f60131d9a29212a8656d42f5a4e7e03e2c51e2ed27684fa -size 3819600 +oid sha256:228e9636d21242e576391a2075cbd203cee2b9d4ce41422fa8f1cd4e1f0a4824 +size 4377244 From 96c8c3bdc12d4d4f36bf3b4b72a6be8ce15b47f4 Mon Sep 17 00:00:00 2001 From: Alan O'Cull Date: Tue, 6 Feb 2024 19:54:21 -0500 Subject: [PATCH 6/6] Add animation pacer to Shelby's file --- animations/animation_helpers.blend | 3 +++ animations/insurrectionist/anims-shelby_005.blend | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 animations/animation_helpers.blend diff --git a/animations/animation_helpers.blend b/animations/animation_helpers.blend new file mode 100644 index 0000000..75ba6ef --- /dev/null +++ b/animations/animation_helpers.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:638ea1561775ce50288f15441690a4143a15488f1028d04d42e5645d4de92633 +size 945300 diff --git a/animations/insurrectionist/anims-shelby_005.blend b/animations/insurrectionist/anims-shelby_005.blend index b8cff59..afe95ff 100644 --- a/animations/insurrectionist/anims-shelby_005.blend +++ b/animations/insurrectionist/anims-shelby_005.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0d0ff70409a2740c6e3336496eb1a27bd2948f0320e2848f8ebec051b216229 -size 4515692 +oid sha256:0ef22f71c8ada6c5af5b348c4ad5f7730e6f2671e545546c4a7f49b7a1aff0e0 +size 4600624