From d2fc7f4f65ed81ad533bf4f2c1052bf4841dfa88 Mon Sep 17 00:00:00 2001 From: alan Date: Thu, 8 Feb 2024 12:38:56 -0500 Subject: [PATCH 1/5] Unfinished work I forgot to push --- characters/infantry/p2-blockout.blend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/characters/infantry/p2-blockout.blend b/characters/infantry/p2-blockout.blend index e61ceb7..c4e4a6a 100644 --- a/characters/infantry/p2-blockout.blend +++ b/characters/infantry/p2-blockout.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2c03377f8b4e11ce30a92580b3d34686daebdc05338f81e0b658711b68a3c14 -size 7242630 +oid sha256:0b599d7a74a8b76ef8f9e6c9117f177c2ca4ba5ab6ae6620e5a0194d1317e5cb +size 7279422 From 945a7aab21d6395e4ee06cbe4a97c5dcfd815b27 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 8 Feb 2024 23:23:06 -0500 Subject: [PATCH 2/5] Grapple --- Grapple/GrappleBody.fbx | 3 +++ Grapple/GrappleHook.fbx | 3 +++ Grapple/GrappleMats/GrappleBase/mat_GrappleBody_AO.png | 3 +++ Grapple/GrappleMats/GrappleBase/mat_GrappleBody_BaseColor.png | 3 +++ Grapple/GrappleMats/GrappleBase/mat_GrappleBody_metalic.png | 3 +++ Grapple/GrappleMats/GrappleBase/mat_GrappleBody_normal.png | 3 +++ Grapple/GrappleMats/GrappleBase/mat_GrappleBody_roughness.png | 3 +++ Grapple/GrappleMats/GrappleHook/mat_GrappleHook_AO.png | 3 +++ Grapple/GrappleMats/GrappleHook/mat_GrappleHook_BaseColor.png | 3 +++ Grapple/GrappleMats/GrappleHook/mat_GrappleHook_metalic.png | 3 +++ Grapple/GrappleMats/GrappleHook/mat_GrappleHook_normal.png | 3 +++ Grapple/GrappleMats/GrappleHook/mat_GrappleHook_roughtness.png | 3 +++ Grapple/GrappleMats/TeslaCoil/mat_Coil_AO.png | 3 +++ Grapple/GrappleMats/TeslaCoil/mat_Coil_BaseColor.png | 3 +++ Grapple/GrappleMats/TeslaCoil/mat_Coil_Metalic.png | 3 +++ Grapple/GrappleMats/TeslaCoil/mat_Coil_Roughness.png | 3 +++ Grapple/GrappleMats/TeslaCoil/mat_Coil_normal.png | 3 +++ Grapple/TeslaCoil.fbx | 3 +++ 18 files changed, 54 insertions(+) create mode 100644 Grapple/GrappleBody.fbx create mode 100644 Grapple/GrappleHook.fbx create mode 100644 Grapple/GrappleMats/GrappleBase/mat_GrappleBody_AO.png create mode 100644 Grapple/GrappleMats/GrappleBase/mat_GrappleBody_BaseColor.png create mode 100644 Grapple/GrappleMats/GrappleBase/mat_GrappleBody_metalic.png create mode 100644 Grapple/GrappleMats/GrappleBase/mat_GrappleBody_normal.png create mode 100644 Grapple/GrappleMats/GrappleBase/mat_GrappleBody_roughness.png create mode 100644 Grapple/GrappleMats/GrappleHook/mat_GrappleHook_AO.png create mode 100644 Grapple/GrappleMats/GrappleHook/mat_GrappleHook_BaseColor.png create mode 100644 Grapple/GrappleMats/GrappleHook/mat_GrappleHook_metalic.png create mode 100644 Grapple/GrappleMats/GrappleHook/mat_GrappleHook_normal.png create mode 100644 Grapple/GrappleMats/GrappleHook/mat_GrappleHook_roughtness.png create mode 100644 Grapple/GrappleMats/TeslaCoil/mat_Coil_AO.png create mode 100644 Grapple/GrappleMats/TeslaCoil/mat_Coil_BaseColor.png create mode 100644 Grapple/GrappleMats/TeslaCoil/mat_Coil_Metalic.png create mode 100644 Grapple/GrappleMats/TeslaCoil/mat_Coil_Roughness.png create mode 100644 Grapple/GrappleMats/TeslaCoil/mat_Coil_normal.png create mode 100644 Grapple/TeslaCoil.fbx diff --git a/Grapple/GrappleBody.fbx b/Grapple/GrappleBody.fbx new file mode 100644 index 0000000..1b11a14 --- /dev/null +++ b/Grapple/GrappleBody.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42c6f1680455d48823c40c284b2a262c395aa23c4675034dfad45e3c233368f7 +size 341392 diff --git a/Grapple/GrappleHook.fbx b/Grapple/GrappleHook.fbx new file mode 100644 index 0000000..24a809d --- /dev/null +++ b/Grapple/GrappleHook.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0085901b6875a29b56774e0cac318d35864165e954e27d467e836a4ef879cb40 +size 56064 diff --git a/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_AO.png b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_AO.png new file mode 100644 index 0000000..862dcdd --- /dev/null +++ b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b68f7bef5c718b8aa50e43e6d95092dcf22e3ef5e91a8f03c1ac8045df00fc79 +size 274015 diff --git a/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_BaseColor.png b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_BaseColor.png new file mode 100644 index 0000000..4d9206a --- /dev/null +++ b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ec48b27f95c58818ce5c9509210b36945fa1923c529e240f1d9fcce97cf7a03 +size 1320929 diff --git a/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_metalic.png b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_metalic.png new file mode 100644 index 0000000..54c6bcc --- /dev/null +++ b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_metalic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd708635b67402de5dfab93515348560ddef47deefb62fff8016147fea0323f0 +size 16102 diff --git a/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_normal.png b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_normal.png new file mode 100644 index 0000000..fff94c9 --- /dev/null +++ b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c2b046abf9e7fb97c6c8a72076d27f67d5d5e79d86923e761b8b71ef0899e58 +size 1546157 diff --git a/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_roughness.png b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_roughness.png new file mode 100644 index 0000000..e425785 --- /dev/null +++ b/Grapple/GrappleMats/GrappleBase/mat_GrappleBody_roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b858c4bf322ec7785342909ce56cb268d176d948fd8385bb2de5ea817de8d25 +size 620965 diff --git a/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_AO.png b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_AO.png new file mode 100644 index 0000000..520cdbf --- /dev/null +++ b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:464e8005a8fe93ed983a72f2d5b109d9cc84e9d85e3b9d921df08c74eeec65d9 +size 100589 diff --git a/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_BaseColor.png b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_BaseColor.png new file mode 100644 index 0000000..fae0f6d --- /dev/null +++ b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f0f3b2d66acb9b32f248dc617ddf262a131d01f38064c80a596cfa866b8f83c +size 574235 diff --git a/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_metalic.png b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_metalic.png new file mode 100644 index 0000000..6c6d85a --- /dev/null +++ b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_metalic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:394015b01b70d23e8f7aeb0e4f94bc5c282d162d063ed68e556c3c4d867851dc +size 83186 diff --git a/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_normal.png b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_normal.png new file mode 100644 index 0000000..09901bc --- /dev/null +++ b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f486b5f7648e32ebc4d8a83294bf892911e0bd958d2a6f5b8f7bac9774f0b7a +size 325387 diff --git a/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_roughtness.png b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_roughtness.png new file mode 100644 index 0000000..d6ad9ca --- /dev/null +++ b/Grapple/GrappleMats/GrappleHook/mat_GrappleHook_roughtness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edf108269d038d8cd2f8b21d196432abe829c930475471c1ca79054a0cab80e2 +size 139346 diff --git a/Grapple/GrappleMats/TeslaCoil/mat_Coil_AO.png b/Grapple/GrappleMats/TeslaCoil/mat_Coil_AO.png new file mode 100644 index 0000000..e3a6853 --- /dev/null +++ b/Grapple/GrappleMats/TeslaCoil/mat_Coil_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bb09f6628f3e34b062cc1daacc1c64bac696aa5ee72c10970af3f846ee341b4 +size 261706 diff --git a/Grapple/GrappleMats/TeslaCoil/mat_Coil_BaseColor.png b/Grapple/GrappleMats/TeslaCoil/mat_Coil_BaseColor.png new file mode 100644 index 0000000..38c1205 --- /dev/null +++ b/Grapple/GrappleMats/TeslaCoil/mat_Coil_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90d0ccf79a8bdc951b6c830d18574a9616d753a7b9c5d6d8f1a67cc9653c6fb7 +size 716481 diff --git a/Grapple/GrappleMats/TeslaCoil/mat_Coil_Metalic.png b/Grapple/GrappleMats/TeslaCoil/mat_Coil_Metalic.png new file mode 100644 index 0000000..25543da --- /dev/null +++ b/Grapple/GrappleMats/TeslaCoil/mat_Coil_Metalic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25a54374d6ec1b15805e4e18643b0665d45c32c504aa14621cfb0decb6434bd0 +size 3178 diff --git a/Grapple/GrappleMats/TeslaCoil/mat_Coil_Roughness.png b/Grapple/GrappleMats/TeslaCoil/mat_Coil_Roughness.png new file mode 100644 index 0000000..8ecd372 --- /dev/null +++ b/Grapple/GrappleMats/TeslaCoil/mat_Coil_Roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3485556766c97ff20f1bf63e02f160a85f67330d99ae34041b3768f5ca923f93 +size 287621 diff --git a/Grapple/GrappleMats/TeslaCoil/mat_Coil_normal.png b/Grapple/GrappleMats/TeslaCoil/mat_Coil_normal.png new file mode 100644 index 0000000..1d4ed33 --- /dev/null +++ b/Grapple/GrappleMats/TeslaCoil/mat_Coil_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bb0d71a15d4b7ad126b0abaaa4f8617e8793e936981eea0c7249327743795db +size 967208 diff --git a/Grapple/TeslaCoil.fbx b/Grapple/TeslaCoil.fbx new file mode 100644 index 0000000..3b7e174 --- /dev/null +++ b/Grapple/TeslaCoil.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b42466fa66bdd76d1d5bc5bc57c8939b11ff8c52f50aae2cb6ae01138cb411e1 +size 178128 From 80b931f1750f13feb2d05c0ee4f5d78ed777466f Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 8 Feb 2024 23:23:45 -0500 Subject: [PATCH 3/5] Old PC --- OldPc/OldPC.fbx | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 OldPc/OldPC.fbx diff --git a/OldPc/OldPC.fbx b/OldPc/OldPC.fbx new file mode 100644 index 0000000..7a53fae --- /dev/null +++ b/OldPc/OldPC.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6271e583707da3ed6060a99bdf134178519fdaa28100cb32f7c34a296799397a +size 78416 From e6fc8dc51cb99f0a6e14b284a2e8339d9dd9b559 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 9 Feb 2024 01:30:41 -0500 Subject: [PATCH 4/5] Infantry blockout, sculpt, and lopoly --- characters/infantry/p5-blockout.blend | 4 ++-- characters/infantry/p6-blockout.blend | 4 ++-- characters/infantry/p7-sculpt.blend | 3 +++ characters/infantry/p8-lopoly.blend | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 characters/infantry/p7-sculpt.blend create mode 100644 characters/infantry/p8-lopoly.blend diff --git a/characters/infantry/p5-blockout.blend b/characters/infantry/p5-blockout.blend index 6830681..74bd2f2 100644 --- a/characters/infantry/p5-blockout.blend +++ b/characters/infantry/p5-blockout.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2ab3dd4c85e82479ecbbff28d65e3e6b83125f2be40fd51a1974b862a24783e -size 1532087 +oid sha256:ac920ec7402f0b399c8526540a015b8c7a66913028781889a48c1564de3dec84 +size 1634835 diff --git a/characters/infantry/p6-blockout.blend b/characters/infantry/p6-blockout.blend index e63986f..6a4f738 100644 --- a/characters/infantry/p6-blockout.blend +++ b/characters/infantry/p6-blockout.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1606ebee994023c24b595b3158957f2cf3736497ce532913e56004bfd655aa1 -size 1539815 +oid sha256:67ad4901b7d098863880773004c0461fdf40074decc747e038b4dd7cd4dad046 +size 2670367 diff --git a/characters/infantry/p7-sculpt.blend b/characters/infantry/p7-sculpt.blend new file mode 100644 index 0000000..f3d9e85 --- /dev/null +++ b/characters/infantry/p7-sculpt.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c8cef797fc68aa2c9529fc7b23d78afd94456de2e17b9b6f0bb8566285e800f +size 69944143 diff --git a/characters/infantry/p8-lopoly.blend b/characters/infantry/p8-lopoly.blend new file mode 100644 index 0000000..70d0a54 --- /dev/null +++ b/characters/infantry/p8-lopoly.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9283ff96d5d5913ced20f688a9d00993157a913b0fd38bcdb93cf0a6f4b7ffa8 +size 2455075 From c9a47abdaaecd75da1ed5afa5bc13d3b2e987f39 Mon Sep 17 00:00:00 2001 From: shelby Date: Fri, 9 Feb 2024 12:41:12 -0500 Subject: [PATCH 5/5] Boba Balls Poster --- props/posters/Boba Balls Poster.png | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 props/posters/Boba Balls Poster.png diff --git a/props/posters/Boba Balls Poster.png b/props/posters/Boba Balls Poster.png new file mode 100644 index 0000000..a5b41c0 --- /dev/null +++ b/props/posters/Boba Balls Poster.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f9caa5fd8801de818e7155adfe8e64b579d46bd14a1d7261ff22148ee244cca +size 880738