diff --git a/gldefs.pickups b/gldefs.pickups index 25be24273..1182bc16a 100644 --- a/gldefs.pickups +++ b/gldefs.pickups @@ -65,16 +65,40 @@ Brightmap Texture "models/GhostArtifact.png" Map "models/GhostArtifact_bright.png" DisableFullbright } +HardwareShader Texture "models/GhostArtifact.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/GhostArtifact_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" +} Brightmap Texture "models/Gravity.png" { Map "models/Gravity_bright.png" DisableFullbright } +HardwareShader Texture "models/Gravity.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Gravity_mask.png" + Texture "envtex" "models/envmap/ekaenv.png" + Texture "rimtex" "models/envmap/ekarim.png" + Define "RIM_LIGHTING" +} Brightmap Texture "models/Ragekit.png" { Map "models/Ragekit_bright.png" DisableFullbright } +HardwareShader Texture "models/Ragekit.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Ragekit_mask.png" + Texture "envtex" "models/envmap/ekaenv.png" + Texture "rimtex" "models/envmap/ekarim.png" + Define "RIM_LIGHTING" +} Brightmap Texture "models/Omnisight.png" { Map "models/Omnisight_bright.png" @@ -85,11 +109,35 @@ Brightmap Texture "models/Lamp.png" Map "models/Lamp_bright.png" DisableFullbright } +HardwareShader Texture "models/Lamp.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Lamp_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" +} +HardwareShader Texture "models/Lamp_off.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Lamp_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" +} Brightmap Texture "models/Invinciball.png" { Map "brightmaps/nobright.png" DisableFullbright } +HardwareShader Texture "models/Invinciball.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Invinciball_mask.png" + Texture "envtex" "models/envmap/ekaenv.png" + Texture "rimtex" "models/envmap/ekarim.png" + Define "RIM_LIGHTING" +} Brightmap Texture "models/Moth_Mashiro.png" { Map "models/Moth_Mashiro_bright.png" @@ -99,6 +147,14 @@ Brightmap Texture "models/Barrier.png" Map "models/Barrier_bright.png" DisableFullbright } +HardwareShader Texture "models/Barrier.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Barrier_mask.png" + Texture "envtex" "models/envmap/ekaenv.png" + Texture "rimtex" "models/envmap/ekarim.png" + Define "RIM_LIGHTING" +} HardwareShader Sprite "MKRVA0" { Shader "shaders/glsl/Mykradvo.fp" @@ -150,7 +206,8 @@ HardwareShader Texture "models/SafetyTether.png" Texture "envtex" "models/envmap/silverenv.png" Texture "rimtex" "models/envmap/silverrim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = ".8" + Define "ENVFACT" = ".5" + Define "RIMFACT" = ".8" } HardwareShader Texture "models/SafetyTether_off.png" { @@ -159,7 +216,8 @@ HardwareShader Texture "models/SafetyTether_off.png" Texture "envtex" "models/envmap/silverenv.png" Texture "rimtex" "models/envmap/silverrim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = ".8" + Define "ENVFACT" = ".5" + Define "RIMFACT" = ".8" } PointLight ARMORNUGGETLIGHT diff --git a/language.version b/language.version index 3208f3c7a..a6367a8f9 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r633 \cu(Fri 25 Nov 23:39:29 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r633 \cu(2022-11-25 23:39:29)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r634 \cu(Sat 26 Nov 03:04:30 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r634 \cu(2022-11-26 03:04:30)\c-"; diff --git a/modeldef.collectibles b/modeldef.collectibles index c0aeb671f..b783f98f3 100644 --- a/modeldef.collectibles +++ b/modeldef.collectibles @@ -40,9 +40,9 @@ Model "NutatcoBar" { Path "models" - Model 0 "Nutatco_d.3d" + Model 0 "Nutatco.iqm" Skin 0 "Nutatco.png" - Scale 0.018 0.018 0.018 + Scale 4 4 4 ZOffset 16 PitchOffset -60 RollOffset 90 @@ -54,10 +54,11 @@ Model "FrispyCorn" { Path "models" - Model 0 "FrispyCorn_d.3d" + Model 0 "FrispyCorn.iqm" Skin 0 "FrispyCorn.png" - Scale 0.025 0.025 0.025 + Scale 6 6 6 ZOffset 16 + AngleOffset -90 RollOffset 30 ROTATING @@ -67,9 +68,9 @@ Model "SayaBean" { Path "models" - Model 0 "SayaBean_d.3d" + Model 0 "SayaBean.iqm" Skin 0 "SayaBean.png" - Scale 0.025 0.025 0.025 + Scale 6 6 6 ZOffset 16 RollOffset 30 ROTATING @@ -80,9 +81,9 @@ Model "MothPlushy" { Path "models" - Model 0 "MothPlush_d.3d" + Model 0 "MothPlush.iqm" Skin 0 "MothPlush.png" - Scale 0.06 0.06 0.06 + Scale 15 15 15 ZOffset 20 RollOffset 30 ROTATING @@ -93,9 +94,9 @@ Model "SayasMug" { Path "models" - Model 0 "SayasMug_d.3d" + Model 0 "SayasMug.iqm" Skin 0 "SayasMug.png" - Scale 0.02 0.02 0.02 + Scale 50 50 50 ZOffset 16 AngleOffset 90 PitchOffset 30 @@ -107,10 +108,10 @@ Model "DemoPlush" { Path "models" - Model 0 "DemoPlush_d.3d" + Model 0 "DemoPlush.iqm" SurfaceSkin 0 0 "DemoPlush.png" SurfaceSkin 0 1 "DemoPlush2.png" - Scale 0.075 0.075 0.075 + Scale 15 15 15 ZOffset 20 RollOffset 30 ROTATING @@ -121,10 +122,10 @@ Model "KirinCummies" { Path "models" - Model 0 "TootFroot_d.3d" + Model 0 "TootFroot.iqm" SurfaceSkin 0 0 "TootFroot.png" SurfaceSkin 0 1 "envmap/silverenv.png" - Scale 0.015 0.015 0.015 + Scale 4 4 4 ZOffset 16 PitchOffset 30 ROTATING @@ -135,9 +136,9 @@ Model "MilkBreads" { Path "models" - Model 0 "MilkBreads_d.3d" + Model 0 "MilkBreads.iqm" Skin 0 "MilkBreads.png" - Scale 0.016 0.016 0.016 + Scale 4 4 4 ZOffset 16 ROTATING @@ -160,9 +161,9 @@ Model "KirinPlush" { Path "models" - Model 0 "KirinPlush_d.3d" + Model 0 "KirinPlush.iqm" Skin 0 "KirinPlush.png" - Scale 0.08 0.08 0.08 + Scale 40 40 40 ZOffset 20 RollOffset 30 ROTATING diff --git a/modeldef.demolitionist b/modeldef.demolitionist index f5b02c7c6..8e3e1d3d1 100644 --- a/modeldef.demolitionist +++ b/modeldef.demolitionist @@ -543,9 +543,10 @@ Model "Demolitionist" Model "SWWMVoodooDoll" { Path "models" - Model 0 "VoodooDoll_d.3d" + Model 0 "VoodooDoll.iqm" + Animation 0 "VoodooDoll.iqm" SurfaceSkin 0 0 "VoodooDoll.png" - Scale 0.0025 0.0025 0.0025 + Scale 40.96 40.96 40.96 AngleOffset -90 IGNORETRANSLATION diff --git a/modeldef.keys b/modeldef.keys index 1b6b61316..bafc0cf3b 100644 --- a/modeldef.keys +++ b/modeldef.keys @@ -212,9 +212,9 @@ Model "SWWMFakePurpleSkull" Model "SWWMKeyGreen" { Path "models" - Model 0 "HereticGreenKey_d.3d" + Model 0 "HereticGreenKey.iqm" Skin 0 "envmap/greenenv.png" - Scale 0.05 0.05 0.05 + Scale 10 10 10 RollOffset 15 ZOffset 16 ROTATING @@ -224,9 +224,9 @@ Model "SWWMKeyGreen" Model "SWWMKeyBlue" { Path "models" - Model 0 "HereticBlueKey_d.3d" + Model 0 "HereticBlueKey.iqm" Skin 0 "envmap/bluenv.png" - Scale 0.04 0.04 0.04 + Scale 10 10 10 RollOffset 15 ZOffset 16 ROTATING @@ -236,9 +236,9 @@ Model "SWWMKeyBlue" Model "SWWMKeyYellow" { Path "models" - Model 0 "HereticYellowKey_d.3d" + Model 0 "HereticYellowKey.iqm" Skin 0 "envmap/goldenv.png" - Scale 0.05 0.05 0.05 + Scale 10 10 10 RollOffset 15 ZOffset 16 ROTATING @@ -248,9 +248,9 @@ Model "SWWMKeyYellow" Model "SWWMKeyRed" { Path "models" - Model 0 "HereticRedKey_d.3d" + Model 0 "HereticRedKey.iqm" Skin 0 "envmap/redenv.png" - Scale 0.05 0.05 0.05 + Scale 10 10 10 RollOffset 15 ZOffset 16 ROTATING diff --git a/modeldef.pickups b/modeldef.pickups index 5a8a5d8e6..0413c08f7 100644 --- a/modeldef.pickups +++ b/modeldef.pickups @@ -62,9 +62,9 @@ Model "CubeHealthItem" Model "RefresherItem" { Path "models" - Model 0 "Refresher_d.3d" + Model 0 "Refresher.iqm" Skin 0 "Refresher.png" - Scale 0.04 0.04 0.04 + Scale 10 10 10 ZOffset 16 RollOffset 30 ROTATING @@ -87,9 +87,9 @@ Model "BlastSuitItem" Model "WarArmorItem" { Path "models" - Model 0 "WarArmor_d.3d" + Model 0 "WarArmor.iqm" Skin 0 "WarArmor.png" - Scale 0.07 0.07 0.07 + Scale 18 18 18 ZOffset 20 ROTATING @@ -99,10 +99,10 @@ Model "WarArmorItem" Model "GrilledCheeseSandwich" { Path "models" - Model 0 "Sandwich_d.3d" + Model 0 "Sandwich.iqm" SurfaceSkin 0 0 "envmap/goldenv.png" SurfaceSkin 0 1 "Sandwich.png" - Scale 0.04 0.04 0.04 + Scale 10 10 10 PitchOffset -45 ZOffset 16 ROTATING @@ -113,9 +113,9 @@ Model "GrilledCheeseSandwich" Model "GhostArtifact" { Path "models" - Model 0 "GhostArtifact_d.3d" - SurfaceSkin 0 1 "GhostArtifact.png" - Scale 0.05 0.05 0.05 + Model 0 "GhostArtifact.iqm" + Skin 0 "GhostArtifact.png" + Scale 12 12 12 ZOffset 16 ROTATING @@ -124,9 +124,9 @@ Model "GhostArtifact" Model "GhostArtifactX" { Path "models" - Model 0 "GhostArtifact_d.3d" - SurfaceSkin 0 0 "envmap/darkenv.png" - Scale 0.05 0.05 0.05 + Model 0 "GhostArtifactX.iqm" + Skin 0 "envmap/darkenv.png" + Scale 12 12 12 ZOffset 16 FrameIndex XZW1 A 0 0 @@ -135,9 +135,9 @@ Model "GhostArtifactX" Model "GravitySuppressor" { Path "models" - Model 0 "Gravity_d.3d" - SurfaceSkin 0 0 "Gravity.png" - Scale 0.06 0.06 0.06 + Model 0 "Gravity.iqm" + Skin 0 "Gravity.png" + Scale 16 16 16 ZOffset 16 ROTATING @@ -146,9 +146,9 @@ Model "GravitySuppressor" Model "GravityX" { Path "models" - Model 0 "Gravity_d.3d" - SurfaceSkin 0 1 "envmap/watrenv.png" - Scale 0.06 0.06 0.06 + Model 0 "GravityX.iqm" + Skin 0 "envmap/watrenv.png" + Scale 16 16 16 ZOffset 16 FrameIndex XZW1 A 0 0 @@ -157,9 +157,9 @@ Model "GravityX" Model "FuckingInvinciball" { Path "models" - Model 0 "Invinciball_d.3d" - SurfaceSkin 0 0 "Invinciball.png" - Scale 0.04 0.04 0.04 + Model 0 "Invinciball.iqm" + Skin 0 "Invinciball.png" + Scale 10 10 10 ZOffset 16 ROTATING @@ -168,9 +168,9 @@ Model "FuckingInvinciball" Model "InvinciballX" { Path "models" - Model 0 "Invinciball_d.3d" - SurfaceSkin 0 1 "envmap/redenv.png" - Scale 0.04 0.04 0.04 + Model 0 "InvinciballX.iqm" + Skin 0 "envmap/redenv.png" + Scale 10 10 10 ZOffset 16 FrameIndex XZW1 A 0 0 @@ -179,9 +179,9 @@ Model "InvinciballX" Model "Ragekit" { Path "models" - Model 0 "Ragekit_d.3d" - SurfaceSkin 0 0 "Ragekit.png" - Scale 0.05 0.05 0.05 + Model 0 "Ragekit.iqm" + Skin 0 "Ragekit.png" + Scale 12 12 12 ZOffset 16 ROTATING @@ -190,9 +190,9 @@ Model "Ragekit" Model "RagekitX" { Path "models" - Model 0 "Ragekit_d.3d" - SurfaceSkin 0 1 "envmap/lavaenv.png" - Scale 0.05 0.05 0.05 + Model 0 "RagekitX.iqm" + Skin 0 "envmap/lavaenv.png" + Scale 12 12 12 ZOffset 16 FrameIndex XZW1 A 0 0 @@ -201,9 +201,9 @@ Model "RagekitX" Model "Omnisight" { Path "models" - Model 0 "Omnisight_d.3d" + Model 0 "Omnisight.iqm" Skin 0 "Omnisight.png" - Scale 0.04 0.04 0.04 + Scale 8 8 8 RollOffset 30 ZOffset 16 ROTATING @@ -214,10 +214,11 @@ Model "Omnisight" Model "LampMoth" { Path "models" - Model 0 "Moth_d.3d" + Model 0 "Moth.md3" Skin 0 "Moth.png" - Scale 0.005 0.005 0.005 + Scale 0.008 0.008 0.008 ZOffset 0.5 + AngleOffset -90 USEACTORPITCH DONTCULLBACKFACES @@ -227,10 +228,11 @@ Model "LampMoth" Model "LampMoth2" { Path "models" - Model 0 "Moth_d.3d" + Model 0 "Moth.md3" Skin 0 "Moth_Mashiro.png" - Scale 0.008 0.008 0.008 + Scale 0.012 0.012 0.012 ZOffset 0.5 + AngleOffset -90 USEACTORPITCH DONTCULLBACKFACES @@ -241,9 +243,9 @@ Model "LampMoth2" Model "CompanionLamp" { Path "models" - Model 0 "Lamp_d.3d" + Model 0 "Lamp.iqm" Skin 0 "Lamp_off.png" - Scale 0.03 0.03 0.03 + Scale 8 8 8 ZOffset 8 FrameIndex XZW1 A 0 0 @@ -254,9 +256,9 @@ Model "CompanionLamp" Model "SWWMLamp" { Path "models" - Model 0 "Lamp_d.3d" + Model 0 "Lamp.iqm" Skin 0 "Lamp_off.png" - Scale 0.05 0.05 0.05 + Scale 12 12 12 ZOffset 16 ROTATING @@ -303,9 +305,9 @@ Model "SafetyTether" { Path "models" - Model 0 "SafetyTether_d.3d" + Model 0 "SafetyTether.iqm" Skin 0 "SafetyTether_off.png" - Scale 0.02 0.02 0.02 + Scale 5 5 5 ZOffset 16 PitchOffset 30 ROTATING diff --git a/models/Barrier_mask.png b/models/Barrier_mask.png new file mode 100644 index 000000000..8bbf14244 Binary files /dev/null and b/models/Barrier_mask.png differ diff --git a/models/DemoPlush.blend b/models/DemoPlush.blend index 054ca8608..682060a27 100644 Binary files a/models/DemoPlush.blend and b/models/DemoPlush.blend differ diff --git a/models/DemoPlush.iqm b/models/DemoPlush.iqm new file mode 100644 index 000000000..53585e455 Binary files /dev/null and b/models/DemoPlush.iqm differ diff --git a/models/DemoPlush_a.3d b/models/DemoPlush_a.3d deleted file mode 100644 index cff217898..000000000 Binary files a/models/DemoPlush_a.3d and /dev/null differ diff --git a/models/DemoPlush_d.3d b/models/DemoPlush_d.3d deleted file mode 100644 index 4212eee3c..000000000 Binary files a/models/DemoPlush_d.3d and /dev/null differ diff --git a/models/FrispyCorn.iqm b/models/FrispyCorn.iqm new file mode 100644 index 000000000..198c022cf Binary files /dev/null and b/models/FrispyCorn.iqm differ diff --git a/models/FrispyCorn_a.3d b/models/FrispyCorn_a.3d deleted file mode 100644 index cba508c6c..000000000 Binary files a/models/FrispyCorn_a.3d and /dev/null differ diff --git a/models/FrispyCorn_d.3d b/models/FrispyCorn_d.3d deleted file mode 100644 index 6e267d4dc..000000000 Binary files a/models/FrispyCorn_d.3d and /dev/null differ diff --git a/models/GhostArtifact.iqm b/models/GhostArtifact.iqm new file mode 100644 index 000000000..4cc72db07 Binary files /dev/null and b/models/GhostArtifact.iqm differ diff --git a/models/GhostArtifactX.iqm b/models/GhostArtifactX.iqm new file mode 100644 index 000000000..0b217d76a Binary files /dev/null and b/models/GhostArtifactX.iqm differ diff --git a/models/GhostArtifact_a.3d b/models/GhostArtifact_a.3d deleted file mode 100644 index 189f46d69..000000000 Binary files a/models/GhostArtifact_a.3d and /dev/null differ diff --git a/models/GhostArtifact_d.3d b/models/GhostArtifact_d.3d deleted file mode 100644 index ce8586083..000000000 Binary files a/models/GhostArtifact_d.3d and /dev/null differ diff --git a/models/GhostArtifact_mask.png b/models/GhostArtifact_mask.png new file mode 100644 index 000000000..4cd2165b6 Binary files /dev/null and b/models/GhostArtifact_mask.png differ diff --git a/models/GibBreast_a.3d b/models/GibBreast_a.3d deleted file mode 100644 index ccd2a102c..000000000 Binary files a/models/GibBreast_a.3d and /dev/null differ diff --git a/models/GibBreast_d.3d b/models/GibBreast_d.3d deleted file mode 100644 index 2e8f7b9cf..000000000 Binary files a/models/GibBreast_d.3d and /dev/null differ diff --git a/models/GibDrumstick_a.3d b/models/GibDrumstick_a.3d deleted file mode 100644 index e9d4c22e5..000000000 Binary files a/models/GibDrumstick_a.3d and /dev/null differ diff --git a/models/GibDrumstick_d.3d b/models/GibDrumstick_d.3d deleted file mode 100644 index 62f065ecb..000000000 Binary files a/models/GibDrumstick_d.3d and /dev/null differ diff --git a/models/GibSteak_a.3d b/models/GibSteak_a.3d deleted file mode 100644 index 454c16317..000000000 Binary files a/models/GibSteak_a.3d and /dev/null differ diff --git a/models/GibSteak_d.3d b/models/GibSteak_d.3d deleted file mode 100644 index cb17e48fa..000000000 Binary files a/models/GibSteak_d.3d and /dev/null differ diff --git a/models/Gravity.iqm b/models/Gravity.iqm new file mode 100644 index 000000000..c3f07b0f5 Binary files /dev/null and b/models/Gravity.iqm differ diff --git a/models/GravityX.iqm b/models/GravityX.iqm new file mode 100644 index 000000000..b971cedd4 Binary files /dev/null and b/models/GravityX.iqm differ diff --git a/models/Gravity_a.3d b/models/Gravity_a.3d deleted file mode 100644 index 3c9171f9a..000000000 Binary files a/models/Gravity_a.3d and /dev/null differ diff --git a/models/Gravity_d.3d b/models/Gravity_d.3d deleted file mode 100644 index 662d6d04c..000000000 Binary files a/models/Gravity_d.3d and /dev/null differ diff --git a/models/Gravity_mask.png b/models/Gravity_mask.png new file mode 100644 index 000000000..1bf41dda8 Binary files /dev/null and b/models/Gravity_mask.png differ diff --git a/models/HereticBlueKey.iqm b/models/HereticBlueKey.iqm new file mode 100644 index 000000000..6969e584c Binary files /dev/null and b/models/HereticBlueKey.iqm differ diff --git a/models/HereticBlueKey_a.3d b/models/HereticBlueKey_a.3d deleted file mode 100644 index 88b0054f1..000000000 Binary files a/models/HereticBlueKey_a.3d and /dev/null differ diff --git a/models/HereticBlueKey_d.3d b/models/HereticBlueKey_d.3d deleted file mode 100644 index 010f3991c..000000000 Binary files a/models/HereticBlueKey_d.3d and /dev/null differ diff --git a/models/HereticGreenKey.iqm b/models/HereticGreenKey.iqm new file mode 100644 index 000000000..b4ff07396 Binary files /dev/null and b/models/HereticGreenKey.iqm differ diff --git a/models/HereticGreenKey_a.3d b/models/HereticGreenKey_a.3d deleted file mode 100644 index 664bff951..000000000 Binary files a/models/HereticGreenKey_a.3d and /dev/null differ diff --git a/models/HereticGreenKey_d.3d b/models/HereticGreenKey_d.3d deleted file mode 100644 index b224b8680..000000000 Binary files a/models/HereticGreenKey_d.3d and /dev/null differ diff --git a/models/HereticRedKey.iqm b/models/HereticRedKey.iqm new file mode 100644 index 000000000..b0996062b Binary files /dev/null and b/models/HereticRedKey.iqm differ diff --git a/models/HereticRedKey_a.3d b/models/HereticRedKey_a.3d deleted file mode 100644 index 7b085a182..000000000 Binary files a/models/HereticRedKey_a.3d and /dev/null differ diff --git a/models/HereticRedKey_d.3d b/models/HereticRedKey_d.3d deleted file mode 100644 index b767f956c..000000000 Binary files a/models/HereticRedKey_d.3d and /dev/null differ diff --git a/models/HereticYellowKey.iqm b/models/HereticYellowKey.iqm new file mode 100644 index 000000000..d6df43b7d Binary files /dev/null and b/models/HereticYellowKey.iqm differ diff --git a/models/HereticYellowKey_a.3d b/models/HereticYellowKey_a.3d deleted file mode 100644 index f12aca97d..000000000 Binary files a/models/HereticYellowKey_a.3d and /dev/null differ diff --git a/models/HereticYellowKey_d.3d b/models/HereticYellowKey_d.3d deleted file mode 100644 index 722324d2d..000000000 Binary files a/models/HereticYellowKey_d.3d and /dev/null differ diff --git a/models/Invinciball.iqm b/models/Invinciball.iqm new file mode 100644 index 000000000..27396a3f7 Binary files /dev/null and b/models/Invinciball.iqm differ diff --git a/models/InvinciballX.iqm b/models/InvinciballX.iqm new file mode 100644 index 000000000..b9df5d706 Binary files /dev/null and b/models/InvinciballX.iqm differ diff --git a/models/Invinciball_a.3d b/models/Invinciball_a.3d deleted file mode 100644 index 9ab806259..000000000 Binary files a/models/Invinciball_a.3d and /dev/null differ diff --git a/models/Invinciball_d.3d b/models/Invinciball_d.3d deleted file mode 100644 index 95d7aef21..000000000 Binary files a/models/Invinciball_d.3d and /dev/null differ diff --git a/models/Invinciball_mask.png b/models/Invinciball_mask.png new file mode 100644 index 000000000..05850abcb Binary files /dev/null and b/models/Invinciball_mask.png differ diff --git a/models/KirinPlush.blend b/models/KirinPlush.blend index 78190c733..bc00897a7 100644 Binary files a/models/KirinPlush.blend and b/models/KirinPlush.blend differ diff --git a/models/KirinPlush.iqm b/models/KirinPlush.iqm new file mode 100644 index 000000000..7c0a860bd Binary files /dev/null and b/models/KirinPlush.iqm differ diff --git a/models/KirinPlush_a.3d b/models/KirinPlush_a.3d deleted file mode 100644 index 62c4c7340..000000000 Binary files a/models/KirinPlush_a.3d and /dev/null differ diff --git a/models/KirinPlush_d.3d b/models/KirinPlush_d.3d deleted file mode 100644 index 715322750..000000000 Binary files a/models/KirinPlush_d.3d and /dev/null differ diff --git a/models/Lamp.iqm b/models/Lamp.iqm new file mode 100644 index 000000000..3da16b956 Binary files /dev/null and b/models/Lamp.iqm differ diff --git a/models/Lamp_a.3d b/models/Lamp_a.3d deleted file mode 100644 index e8efdd223..000000000 Binary files a/models/Lamp_a.3d and /dev/null differ diff --git a/models/Lamp_d.3d b/models/Lamp_d.3d deleted file mode 100644 index f61e955ec..000000000 Binary files a/models/Lamp_d.3d and /dev/null differ diff --git a/models/Lamp_mask.png b/models/Lamp_mask.png new file mode 100644 index 000000000..89ff1b813 Binary files /dev/null and b/models/Lamp_mask.png differ diff --git a/models/MilkBreads.blend b/models/MilkBreads.blend index 754dceb50..caaad4e19 100644 Binary files a/models/MilkBreads.blend and b/models/MilkBreads.blend differ diff --git a/models/MilkBreads.iqm b/models/MilkBreads.iqm new file mode 100644 index 000000000..8020ac056 Binary files /dev/null and b/models/MilkBreads.iqm differ diff --git a/models/MilkBreads_a.3d b/models/MilkBreads_a.3d deleted file mode 100644 index 710c44bd4..000000000 Binary files a/models/MilkBreads_a.3d and /dev/null differ diff --git a/models/MilkBreads_d.3d b/models/MilkBreads_d.3d deleted file mode 100644 index a975d1f58..000000000 Binary files a/models/MilkBreads_d.3d and /dev/null differ diff --git a/models/Moth.md3 b/models/Moth.md3 new file mode 100644 index 000000000..eba4cb33c Binary files /dev/null and b/models/Moth.md3 differ diff --git a/models/MothPlush.blend b/models/MothPlush.blend index 225272253..3d4c19964 100644 Binary files a/models/MothPlush.blend and b/models/MothPlush.blend differ diff --git a/models/MothPlush.iqm b/models/MothPlush.iqm new file mode 100644 index 000000000..d44ae8cee Binary files /dev/null and b/models/MothPlush.iqm differ diff --git a/models/MothPlush_a.3d b/models/MothPlush_a.3d deleted file mode 100644 index ae7cc8a91..000000000 Binary files a/models/MothPlush_a.3d and /dev/null differ diff --git a/models/MothPlush_d.3d b/models/MothPlush_d.3d deleted file mode 100644 index 167a9aff2..000000000 Binary files a/models/MothPlush_d.3d and /dev/null differ diff --git a/models/Moth_a.3d b/models/Moth_a.3d deleted file mode 100644 index 706f306d9..000000000 Binary files a/models/Moth_a.3d and /dev/null differ diff --git a/models/Moth_d.3d b/models/Moth_d.3d deleted file mode 100644 index a77c64e12..000000000 Binary files a/models/Moth_d.3d and /dev/null differ diff --git a/models/Nutatco.blend b/models/Nutatco.blend index 6fc77fba6..cb5cdd89c 100644 Binary files a/models/Nutatco.blend and b/models/Nutatco.blend differ diff --git a/models/Nutatco.iqm b/models/Nutatco.iqm new file mode 100644 index 000000000..e880c612f Binary files /dev/null and b/models/Nutatco.iqm differ diff --git a/models/Nutatco_a.3d b/models/Nutatco_a.3d deleted file mode 100644 index 9916859a6..000000000 Binary files a/models/Nutatco_a.3d and /dev/null differ diff --git a/models/Nutatco_d.3d b/models/Nutatco_d.3d deleted file mode 100644 index 460d1e0f6..000000000 Binary files a/models/Nutatco_d.3d and /dev/null differ diff --git a/models/Omnisight.iqm b/models/Omnisight.iqm new file mode 100644 index 000000000..a8d4a4c33 Binary files /dev/null and b/models/Omnisight.iqm differ diff --git a/models/Omnisight_a.3d b/models/Omnisight_a.3d deleted file mode 100644 index cfd192f7f..000000000 Binary files a/models/Omnisight_a.3d and /dev/null differ diff --git a/models/Omnisight_d.3d b/models/Omnisight_d.3d deleted file mode 100644 index 8108e429c..000000000 Binary files a/models/Omnisight_d.3d and /dev/null differ diff --git a/models/PlasmaGlob.md3 b/models/PlasmaGlob.md3 new file mode 100644 index 000000000..02a7bd516 Binary files /dev/null and b/models/PlasmaGlob.md3 differ diff --git a/models/PlasmaGlob_a.3d b/models/PlasmaGlob_a.3d deleted file mode 100644 index 38acd4aff..000000000 Binary files a/models/PlasmaGlob_a.3d and /dev/null differ diff --git a/models/PlasmaGlob_d.3d b/models/PlasmaGlob_d.3d deleted file mode 100644 index df68c6fbf..000000000 Binary files a/models/PlasmaGlob_d.3d and /dev/null differ diff --git a/models/Ragekit.iqm b/models/Ragekit.iqm new file mode 100644 index 000000000..d6aa74f6e Binary files /dev/null and b/models/Ragekit.iqm differ diff --git a/models/RagekitX.iqm b/models/RagekitX.iqm new file mode 100644 index 000000000..8fb68ad85 Binary files /dev/null and b/models/RagekitX.iqm differ diff --git a/models/Ragekit_a.3d b/models/Ragekit_a.3d deleted file mode 100644 index 6e798c8aa..000000000 Binary files a/models/Ragekit_a.3d and /dev/null differ diff --git a/models/Ragekit_d.3d b/models/Ragekit_d.3d deleted file mode 100644 index c11b5e9ca..000000000 Binary files a/models/Ragekit_d.3d and /dev/null differ diff --git a/models/Ragekit_mask.png b/models/Ragekit_mask.png new file mode 100644 index 000000000..24a5049c1 Binary files /dev/null and b/models/Ragekit_mask.png differ diff --git a/models/Refresher.iqm b/models/Refresher.iqm new file mode 100644 index 000000000..a2beaeb57 Binary files /dev/null and b/models/Refresher.iqm differ diff --git a/models/Refresher_a.3d b/models/Refresher_a.3d deleted file mode 100644 index aa5e39869..000000000 Binary files a/models/Refresher_a.3d and /dev/null differ diff --git a/models/Refresher_d.3d b/models/Refresher_d.3d deleted file mode 100644 index 59be26be5..000000000 Binary files a/models/Refresher_d.3d and /dev/null differ diff --git a/models/SafetyTether.blend b/models/SafetyTether.blend index 76c5a4f59..2d4158d04 100644 Binary files a/models/SafetyTether.blend and b/models/SafetyTether.blend differ diff --git a/models/SafetyTether.iqm b/models/SafetyTether.iqm new file mode 100644 index 000000000..aef5309a5 Binary files /dev/null and b/models/SafetyTether.iqm differ diff --git a/models/SafetyTether_a.3d b/models/SafetyTether_a.3d deleted file mode 100644 index ce13e5e75..000000000 Binary files a/models/SafetyTether_a.3d and /dev/null differ diff --git a/models/SafetyTether_d.3d b/models/SafetyTether_d.3d deleted file mode 100644 index b43dfbbc4..000000000 Binary files a/models/SafetyTether_d.3d and /dev/null differ diff --git a/models/Sandwich.iqm b/models/Sandwich.iqm new file mode 100644 index 000000000..6fee5db77 Binary files /dev/null and b/models/Sandwich.iqm differ diff --git a/models/Sandwich_a.3d b/models/Sandwich_a.3d deleted file mode 100644 index 2784d8353..000000000 Binary files a/models/Sandwich_a.3d and /dev/null differ diff --git a/models/Sandwich_d.3d b/models/Sandwich_d.3d deleted file mode 100644 index a813d45f5..000000000 Binary files a/models/Sandwich_d.3d and /dev/null differ diff --git a/models/SayaBean.blend b/models/SayaBean.blend index e585eb7a9..cf94ee884 100644 Binary files a/models/SayaBean.blend and b/models/SayaBean.blend differ diff --git a/models/SayaBean.iqm b/models/SayaBean.iqm new file mode 100644 index 000000000..0a937f158 Binary files /dev/null and b/models/SayaBean.iqm differ diff --git a/models/SayaBean_a.3d b/models/SayaBean_a.3d deleted file mode 100644 index d1d351051..000000000 Binary files a/models/SayaBean_a.3d and /dev/null differ diff --git a/models/SayaBean_d.3d b/models/SayaBean_d.3d deleted file mode 100644 index 0ec30b299..000000000 Binary files a/models/SayaBean_d.3d and /dev/null differ diff --git a/models/SayasMug.blend b/models/SayasMug.blend index 24523648c..9c386e68d 100644 Binary files a/models/SayasMug.blend and b/models/SayasMug.blend differ diff --git a/models/SayasMug.iqm b/models/SayasMug.iqm new file mode 100644 index 000000000..0f80cb117 Binary files /dev/null and b/models/SayasMug.iqm differ diff --git a/models/SayasMug_a.3d b/models/SayasMug_a.3d deleted file mode 100644 index c084f325a..000000000 Binary files a/models/SayasMug_a.3d and /dev/null differ diff --git a/models/SayasMug_d.3d b/models/SayasMug_d.3d deleted file mode 100644 index 6a95a5aae..000000000 Binary files a/models/SayasMug_d.3d and /dev/null differ diff --git a/models/TootFroot.blend b/models/TootFroot.blend index bf22b631b..dbb42ca22 100644 Binary files a/models/TootFroot.blend and b/models/TootFroot.blend differ diff --git a/models/TootFroot.iqm b/models/TootFroot.iqm new file mode 100644 index 000000000..5010db8ad Binary files /dev/null and b/models/TootFroot.iqm differ diff --git a/models/TootFroot_a.3d b/models/TootFroot_a.3d deleted file mode 100644 index 76a484bce..000000000 Binary files a/models/TootFroot_a.3d and /dev/null differ diff --git a/models/TootFroot_d.3d b/models/TootFroot_d.3d deleted file mode 100644 index f1d8c69f8..000000000 Binary files a/models/TootFroot_d.3d and /dev/null differ diff --git a/models/VoodooDoll.blend b/models/VoodooDoll.blend index 2b93b40ba..2a8ccdaa3 100644 Binary files a/models/VoodooDoll.blend and b/models/VoodooDoll.blend differ diff --git a/models/VoodooDoll.iqm b/models/VoodooDoll.iqm new file mode 100644 index 000000000..f00b9bb43 Binary files /dev/null and b/models/VoodooDoll.iqm differ diff --git a/models/VoodooDollNoFace.png b/models/VoodooDollNoFace.png new file mode 100644 index 000000000..81bee391a Binary files /dev/null and b/models/VoodooDollNoFace.png differ diff --git a/models/VoodooDoll_a.3d b/models/VoodooDoll_a.3d deleted file mode 100644 index 14fd66eb0..000000000 Binary files a/models/VoodooDoll_a.3d and /dev/null differ diff --git a/models/VoodooDoll_d.3d b/models/VoodooDoll_d.3d deleted file mode 100644 index c9dba2dd8..000000000 Binary files a/models/VoodooDoll_d.3d and /dev/null differ diff --git a/models/WarArmor.iqm b/models/WarArmor.iqm new file mode 100644 index 000000000..c6c69444c Binary files /dev/null and b/models/WarArmor.iqm differ diff --git a/models/WarArmor_a.3d b/models/WarArmor_a.3d deleted file mode 100644 index be7aa5a77..000000000 Binary files a/models/WarArmor_a.3d and /dev/null differ diff --git a/models/WarArmor_d.3d b/models/WarArmor_d.3d deleted file mode 100644 index 3e63c260a..000000000 Binary files a/models/WarArmor_d.3d and /dev/null differ