diff --git a/FuturePlans.md b/FuturePlans.md index fdbec6fb0..0577b97d7 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -45,12 +45,11 @@ More weapons, because we need 'em. In addition, a bunch of cleanup in base weapo ## 1.4 update *(Fine Refinements)*: -Re-animation of old FK models and fully dropping the Unreal vertex format. Plus extra score incentives and achievements. +Re-animation of old FK models. Plus extra score incentives and achievements. * **Re-animate all base models with IK *(important for consistency)*** - - Re-animate base weapon set *(won't be hard)* + - Re-animate base weapon set and gestures *(won't be hard)* - Re-animate player model *(this might be harder)* -* **Re-export all animated models as IQM *(saves space and memory)*** * **Additional Items:** - Ballsy™ Bomb *(re-purposes lead ball)* - Battle-Boi™ Deployable Sentry *(re-purposes saltshot)* diff --git a/language.version b/language.version index b87c2f89b..72c64e917 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r753 \cu(Tue 28 Feb 00:01:03 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r753 \cu(2023-02-28 00:01:03)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r754 \cu(Tue 28 Feb 17:25:20 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r754 \cu(2023-02-28 17:25:20)\c-"; diff --git a/modeldef/gesture.txt b/modeldef/gesture.txt index 5830bf5e2..7a8c39dc9 100644 --- a/modeldef/gesture.txt +++ b/modeldef/gesture.txt @@ -2,12 +2,12 @@ Model "SWWMGesture" { Path "models" - Model 0 "GestureArms_d.3d" + Model 0 "GestureArms.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Initial FrameIndex XZW1 A 0 0 @@ -114,13 +114,13 @@ Model "SWWMGesture" Model "SWWMGesture" { Path "models" - Model 0 "Grenade1st_d.3d" + Model 0 "Grenade1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "ExplodiumGun.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Quick Grenade FrameIndex XZW4 Q 0 0 @@ -167,13 +167,13 @@ Model "SWWMGesture" Model "SWWMGesture" { Path "models" - Model 0 "QuickPunch1st_d.3d" + Model 0 "QuickPunch1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Punch FrameIndex XZW0 A 0 0 diff --git a/modeldef/items/itemgesture.txt b/modeldef/items/itemgesture.txt index 3af55441c..f86b0609d 100644 --- a/modeldef/items/itemgesture.txt +++ b/modeldef/items/itemgesture.txt @@ -1,14 +1,14 @@ Model "GenericCubeGesture" { Path "models" - Model 0 "GenericCube1st_d.3d" + Model 0 "GenericCube1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "PerfectlyGeneric.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -36,14 +36,14 @@ Model "GenericCubeGesture" Model "AkariProjectGesture" { Path "models" - Model 0 "AkariProject1st_d.3d" + Model 0 "AkariProject1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "AkariProject.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -71,14 +71,14 @@ Model "AkariProjectGesture" Model "LoveSignalsCDGesture" { Path "models" - Model 0 "LoveSignalsCD1st_d.3d" + Model 0 "LoveSignalsCD1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "LoveSignals.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -106,14 +106,14 @@ Model "LoveSignalsCDGesture" Model "NutatcoBarGesture" { Path "models" - Model 0 "NutatcoBar1st_d.3d" + Model 0 "NutatcoBar1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "Nutatco.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -141,14 +141,14 @@ Model "NutatcoBarGesture" Model "FrispyCornGesture" { Path "models" - Model 0 "FrispyCorn1st_d.3d" + Model 0 "FrispyCorn1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "FrispyCorn.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -176,14 +176,14 @@ Model "FrispyCornGesture" Model "SayaBeanGesture" { Path "models" - Model 0 "SayaBean1st_d.3d" + Model 0 "SayaBean1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "SayaBean.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -215,14 +215,14 @@ Model "SayaBeanGesture" Model "MothPlushyGesture" { Path "models" - Model 0 "MothPlush1st_d.3d" + Model 0 "MothPlush1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "MothPlush.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -267,7 +267,7 @@ Model "SayasMugGesture" SurfaceSkin 0 3 "SayasMug.png" AngleOffset -90 - Scale -64 32 64 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -325,7 +325,7 @@ Model "SayasMugGesture" Model "DemoPlushGesture" { Path "models" - Model 0 "DemoPlush1st_d.3d" + Model 0 "DemoPlush1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" @@ -333,7 +333,7 @@ Model "DemoPlushGesture" SurfaceSkin 0 4 "DemoPlush2.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -365,7 +365,7 @@ Model "DemoPlushGesture" Model "KirinCummiesGesture" { Path "models" - Model 0 "TootFroot1st_d.3d" + Model 0 "TootFroot1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" @@ -373,7 +373,7 @@ Model "KirinCummiesGesture" SurfaceSkin 0 4 "envmap/silverenv.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -401,14 +401,14 @@ Model "KirinCummiesGesture" Model "MilkBreadsGesture" { Path "models" - Model 0 "MilkBreads1st_d.3d" + Model 0 "MilkBreads1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "MilkBreads.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -436,14 +436,14 @@ Model "MilkBreadsGesture" Model "KirinMangaGesture" { Path "models" - Model 0 "AkariProject1st_d.3d" + Model 0 "KirinManga1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "KirinManga.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 @@ -471,14 +471,14 @@ Model "KirinMangaGesture" Model "KirinPlushGesture" { Path "models" - Model 0 "KirinPlush1st_d.3d" + Model 0 "KirinPlush1st.iqm" SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "KirinPlush.png" AngleOffset -90 - Scale -0.005 0.0025 0.005 + Scale -128 64 128 // Base FrameIndex XZW1 A 0 0 diff --git a/models/.gitignore b/models/.gitignore new file mode 100644 index 000000000..d1b0ff416 --- /dev/null +++ b/models/.gitignore @@ -0,0 +1 @@ +*.blend1 diff --git a/models/AkariProject1st.blend b/models/AkariProject1st.blend index 022846608..22ddc26ad 100644 Binary files a/models/AkariProject1st.blend and b/models/AkariProject1st.blend differ diff --git a/models/AkariProject1st.iqm b/models/AkariProject1st.iqm new file mode 100644 index 000000000..18ecf30cc Binary files /dev/null and b/models/AkariProject1st.iqm differ diff --git a/models/AkariProject1st_a.3d b/models/AkariProject1st_a.3d deleted file mode 100644 index d601a40d1..000000000 Binary files a/models/AkariProject1st_a.3d and /dev/null differ diff --git a/models/AkariProject1st_d.3d b/models/AkariProject1st_d.3d deleted file mode 100644 index 9bf28fb5e..000000000 Binary files a/models/AkariProject1st_d.3d and /dev/null differ diff --git a/models/DemoPlush.blend b/models/DemoPlush.blend index 682060a27..e30be2a84 100644 Binary files a/models/DemoPlush.blend and b/models/DemoPlush.blend differ diff --git a/models/DemoPlush.iqm b/models/DemoPlush.iqm index 53585e455..2a76cd23c 100644 Binary files a/models/DemoPlush.iqm and b/models/DemoPlush.iqm differ diff --git a/models/DemoPlush1st.blend b/models/DemoPlush1st.blend index ae680d3bc..ef7b8419f 100644 Binary files a/models/DemoPlush1st.blend and b/models/DemoPlush1st.blend differ diff --git a/models/DemoPlush1st.iqm b/models/DemoPlush1st.iqm new file mode 100644 index 000000000..87737db46 Binary files /dev/null and b/models/DemoPlush1st.iqm differ diff --git a/models/DemoPlush1st_a.3d b/models/DemoPlush1st_a.3d deleted file mode 100644 index 7b5d584b7..000000000 Binary files a/models/DemoPlush1st_a.3d and /dev/null differ diff --git a/models/DemoPlush1st_d.3d b/models/DemoPlush1st_d.3d deleted file mode 100644 index 392a02a2a..000000000 Binary files a/models/DemoPlush1st_d.3d and /dev/null differ diff --git a/models/FrispyCorn1st.blend b/models/FrispyCorn1st.blend index f5ea06fb6..8c559584d 100644 Binary files a/models/FrispyCorn1st.blend and b/models/FrispyCorn1st.blend differ diff --git a/models/FrispyCorn1st.iqm b/models/FrispyCorn1st.iqm new file mode 100644 index 000000000..66cf59a3d Binary files /dev/null and b/models/FrispyCorn1st.iqm differ diff --git a/models/FrispyCorn1st_a.3d b/models/FrispyCorn1st_a.3d deleted file mode 100644 index 4476c7846..000000000 Binary files a/models/FrispyCorn1st_a.3d and /dev/null differ diff --git a/models/FrispyCorn1st_d.3d b/models/FrispyCorn1st_d.3d deleted file mode 100644 index f5e31b406..000000000 Binary files a/models/FrispyCorn1st_d.3d and /dev/null differ diff --git a/models/GenericCube1st.blend b/models/GenericCube1st.blend index 2e4b45f09..4cbd8f72c 100644 Binary files a/models/GenericCube1st.blend and b/models/GenericCube1st.blend differ diff --git a/models/GenericCube1st.iqm b/models/GenericCube1st.iqm new file mode 100644 index 000000000..52af70cbf Binary files /dev/null and b/models/GenericCube1st.iqm differ diff --git a/models/GenericCube1st_a.3d b/models/GenericCube1st_a.3d deleted file mode 100644 index 2b1ee4b0c..000000000 Binary files a/models/GenericCube1st_a.3d and /dev/null differ diff --git a/models/GenericCube1st_d.3d b/models/GenericCube1st_d.3d deleted file mode 100644 index 825fa92d7..000000000 Binary files a/models/GenericCube1st_d.3d and /dev/null differ diff --git a/models/GestureArms.blend b/models/GestureArms.blend index 38aaaa938..4e6b38e93 100644 Binary files a/models/GestureArms.blend and b/models/GestureArms.blend differ diff --git a/models/GestureArms.iqm b/models/GestureArms.iqm new file mode 100644 index 000000000..c95220c0e Binary files /dev/null and b/models/GestureArms.iqm differ diff --git a/models/GestureArms_a.3d b/models/GestureArms_a.3d deleted file mode 100644 index 49e9d110c..000000000 Binary files a/models/GestureArms_a.3d and /dev/null differ diff --git a/models/GestureArms_d.3d b/models/GestureArms_d.3d deleted file mode 100644 index 36a38de1b..000000000 Binary files a/models/GestureArms_d.3d and /dev/null differ diff --git a/models/Grenade1st.blend b/models/Grenade1st.blend index 8b2325381..771dce590 100644 Binary files a/models/Grenade1st.blend and b/models/Grenade1st.blend differ diff --git a/models/Grenade1st.iqm b/models/Grenade1st.iqm new file mode 100644 index 000000000..12902aacc Binary files /dev/null and b/models/Grenade1st.iqm differ diff --git a/models/Grenade1st_a.3d b/models/Grenade1st_a.3d deleted file mode 100644 index 28d16b482..000000000 Binary files a/models/Grenade1st_a.3d and /dev/null differ diff --git a/models/Grenade1st_d.3d b/models/Grenade1st_d.3d deleted file mode 100644 index 97dd515fb..000000000 Binary files a/models/Grenade1st_d.3d and /dev/null differ diff --git a/models/KirinManga1st.blend b/models/KirinManga1st.blend index 0da3f7c06..9e034b2aa 100644 Binary files a/models/KirinManga1st.blend and b/models/KirinManga1st.blend differ diff --git a/models/KirinManga1st.iqm b/models/KirinManga1st.iqm new file mode 100644 index 000000000..2c3df934b Binary files /dev/null and b/models/KirinManga1st.iqm differ diff --git a/models/KirinManga1st_a.3d b/models/KirinManga1st_a.3d deleted file mode 100644 index 6db9ba540..000000000 Binary files a/models/KirinManga1st_a.3d and /dev/null differ diff --git a/models/KirinManga1st_d.3d b/models/KirinManga1st_d.3d deleted file mode 100644 index 9bf28fb5e..000000000 Binary files a/models/KirinManga1st_d.3d and /dev/null differ diff --git a/models/KirinPlush1st.blend b/models/KirinPlush1st.blend index 703c7dc1d..a65158ed9 100644 Binary files a/models/KirinPlush1st.blend and b/models/KirinPlush1st.blend differ diff --git a/models/KirinPlush1st.iqm b/models/KirinPlush1st.iqm new file mode 100644 index 000000000..0b25d7cbb Binary files /dev/null and b/models/KirinPlush1st.iqm differ diff --git a/models/KirinPlush1st_a.3d b/models/KirinPlush1st_a.3d deleted file mode 100644 index 8f7b19637..000000000 Binary files a/models/KirinPlush1st_a.3d and /dev/null differ diff --git a/models/KirinPlush1st_d.3d b/models/KirinPlush1st_d.3d deleted file mode 100644 index 657f4bec8..000000000 Binary files a/models/KirinPlush1st_d.3d and /dev/null differ diff --git a/models/LoveSignalsCD1st.blend b/models/LoveSignalsCD1st.blend index aaa711b3d..a79df17ef 100644 Binary files a/models/LoveSignalsCD1st.blend and b/models/LoveSignalsCD1st.blend differ diff --git a/models/LoveSignalsCD1st.iqm b/models/LoveSignalsCD1st.iqm new file mode 100644 index 000000000..7cb7bd945 Binary files /dev/null and b/models/LoveSignalsCD1st.iqm differ diff --git a/models/LoveSignalsCD1st_a.3d b/models/LoveSignalsCD1st_a.3d deleted file mode 100644 index 94fbcb3a0..000000000 Binary files a/models/LoveSignalsCD1st_a.3d and /dev/null differ diff --git a/models/LoveSignalsCD1st_d.3d b/models/LoveSignalsCD1st_d.3d deleted file mode 100644 index 6637c47f1..000000000 Binary files a/models/LoveSignalsCD1st_d.3d and /dev/null differ diff --git a/models/MilkBreads1st.blend b/models/MilkBreads1st.blend index 1370ad427..a686600ff 100644 Binary files a/models/MilkBreads1st.blend and b/models/MilkBreads1st.blend differ diff --git a/models/MilkBreads1st.iqm b/models/MilkBreads1st.iqm new file mode 100644 index 000000000..7a2ec069c Binary files /dev/null and b/models/MilkBreads1st.iqm differ diff --git a/models/MilkBreads1st_a.3d b/models/MilkBreads1st_a.3d deleted file mode 100644 index b839cce71..000000000 Binary files a/models/MilkBreads1st_a.3d and /dev/null differ diff --git a/models/MilkBreads1st_d.3d b/models/MilkBreads1st_d.3d deleted file mode 100644 index d2c0e2b72..000000000 Binary files a/models/MilkBreads1st_d.3d and /dev/null differ diff --git a/models/MothPlush1st.blend b/models/MothPlush1st.blend index 494dbc46a..8f6934133 100644 Binary files a/models/MothPlush1st.blend and b/models/MothPlush1st.blend differ diff --git a/models/MothPlush1st.iqm b/models/MothPlush1st.iqm new file mode 100644 index 000000000..52e55b130 Binary files /dev/null and b/models/MothPlush1st.iqm differ diff --git a/models/MothPlush1st_a.3d b/models/MothPlush1st_a.3d deleted file mode 100644 index 4ed7d33b2..000000000 Binary files a/models/MothPlush1st_a.3d and /dev/null differ diff --git a/models/MothPlush1st_d.3d b/models/MothPlush1st_d.3d deleted file mode 100644 index 01514aaf8..000000000 Binary files a/models/MothPlush1st_d.3d and /dev/null differ diff --git a/models/NutatcoBar1st.blend b/models/NutatcoBar1st.blend index 1b106043c..32cb74057 100644 Binary files a/models/NutatcoBar1st.blend and b/models/NutatcoBar1st.blend differ diff --git a/models/NutatcoBar1st.iqm b/models/NutatcoBar1st.iqm new file mode 100644 index 000000000..f8fe5a5fc Binary files /dev/null and b/models/NutatcoBar1st.iqm differ diff --git a/models/NutatcoBar1st_a.3d b/models/NutatcoBar1st_a.3d deleted file mode 100644 index d1b486ab3..000000000 Binary files a/models/NutatcoBar1st_a.3d and /dev/null differ diff --git a/models/NutatcoBar1st_d.3d b/models/NutatcoBar1st_d.3d deleted file mode 100644 index 0661de23c..000000000 Binary files a/models/NutatcoBar1st_d.3d and /dev/null differ diff --git a/models/QuickPunch1st.blend b/models/QuickPunch1st.blend index d006ef35c..ae648590c 100644 Binary files a/models/QuickPunch1st.blend and b/models/QuickPunch1st.blend differ diff --git a/models/QuickPunch1st.iqm b/models/QuickPunch1st.iqm new file mode 100644 index 000000000..6671665cf Binary files /dev/null and b/models/QuickPunch1st.iqm differ diff --git a/models/QuickPunch1st_a.3d b/models/QuickPunch1st_a.3d deleted file mode 100644 index 9ea23b446..000000000 Binary files a/models/QuickPunch1st_a.3d and /dev/null differ diff --git a/models/QuickPunch1st_d.3d b/models/QuickPunch1st_d.3d deleted file mode 100644 index 7fabf5734..000000000 Binary files a/models/QuickPunch1st_d.3d and /dev/null differ diff --git a/models/SayaBean1st.blend b/models/SayaBean1st.blend index 4ddd2de3e..f51cccb4d 100644 Binary files a/models/SayaBean1st.blend and b/models/SayaBean1st.blend differ diff --git a/models/SayaBean1st.iqm b/models/SayaBean1st.iqm new file mode 100644 index 000000000..f0f9e1563 Binary files /dev/null and b/models/SayaBean1st.iqm differ diff --git a/models/SayaBean1st_a.3d b/models/SayaBean1st_a.3d deleted file mode 100644 index 775ac9729..000000000 Binary files a/models/SayaBean1st_a.3d and /dev/null differ diff --git a/models/SayaBean1st_d.3d b/models/SayaBean1st_d.3d deleted file mode 100644 index 53fff01fd..000000000 Binary files a/models/SayaBean1st_d.3d and /dev/null differ diff --git a/models/TootFroot1st.blend b/models/TootFroot1st.blend index 62a234a03..53004f981 100644 Binary files a/models/TootFroot1st.blend and b/models/TootFroot1st.blend differ diff --git a/models/TootFroot1st.iqm b/models/TootFroot1st.iqm new file mode 100644 index 000000000..439b0432f Binary files /dev/null and b/models/TootFroot1st.iqm differ diff --git a/models/TootFroot1st_a.3d b/models/TootFroot1st_a.3d deleted file mode 100644 index c108ecbbd..000000000 Binary files a/models/TootFroot1st_a.3d and /dev/null differ diff --git a/models/TootFroot1st_d.3d b/models/TootFroot1st_d.3d deleted file mode 100644 index c4589adaa..000000000 Binary files a/models/TootFroot1st_d.3d and /dev/null differ diff --git a/tools/.gitignore b/tools/.gitignore index fbc8514d7..efba67cee 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,2 +1 @@ -mkstartup mklang