diff --git a/language.version b/language.version index 944993b43..36fec0a8f 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1078 \cu(Wed 3 Jan 14:34:45 CET 2024)\c-"; -SWWM_SHORTVER="\cw1.3pre r1078 \cu(2024-01-03 14:34:45)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1079 \cu(Wed 3 Jan 20:27:52 CET 2024)\c-"; +SWWM_SHORTVER="\cw1.3pre r1079 \cu(2024-01-03 20:27:52)\c-"; diff --git a/modeldef/misc.txt b/modeldef/misc.txt index 4f06d94e1..f719af940 100644 --- a/modeldef/misc.txt +++ b/modeldef/misc.txt @@ -161,10 +161,9 @@ Model "MykradvoTendril" { Path "models/extra" - Model 0 "WarpBeam3.iqm" - Animation 0 "WarpBeam3.iqm" + Model 0 "WarpBeam3.md3" Skin 0 "AnomTrail.png" - Scale 64 64 64 + Scale 1 1 1 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL @@ -191,10 +190,9 @@ Model "MykradvoSmallTendril" { Path "models/extra" - Model 0 "WarpBeam2.iqm" - Animation 0 "WarpBeam2.iqm" + Model 0 "WarpBeam2.md3" Skin 0 "AnomTrail.png" - Scale 16 32 32 + Scale 0.25 0.5 0.5 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL @@ -221,10 +219,9 @@ Model "MykradvoSmallNullTendril" { Path "models/extra" - Model 0 "WarpBeam2.iqm" - Animation 0 "WarpBeam2.iqm" + Model 0 "WarpBeam2.md3" Skin 0 "AnomTrail.png" - Scale 8 16 16 + Scale 0.125 0.25 0.25 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL @@ -252,9 +249,8 @@ Model "SaltBeam" { Path "models/extra" - Model 0 "WarpBeam2.iqm" - Animation 0 "WarpBeam2.iqm" - Scale 32 32 32 + Model 0 "WarpBeam2.md3" + Scale 0.5 0.5 0.5 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL diff --git a/modeldef/weapons/sparkster.txt b/modeldef/weapons/sparkster.txt index 9ee0d7464..a4e0f9ed5 100644 --- a/modeldef/weapons/sparkster.txt +++ b/modeldef/weapons/sparkster.txt @@ -21,10 +21,9 @@ Model "BiosparkArc" { Path "models/extra" - Model 0 "WarpBeam.iqm" - Animation 0 "WarpBeam.iqm" + Model 0 "WarpBeam.md3" Skin 0 "SparksterBeam.png" - Scale 16 40 40 + Scale 0.25 0.625 0.625 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL @@ -47,10 +46,9 @@ Model "BiosparkArcSmall" { Path "models/extra" - Model 0 "WarpBeam.iqm" - Animation 0 "WarpBeam.iqm" + Model 0 "WarpBeam.md3" Skin 0 "SparksterBeam.png" - Scale 8 20 20 + Scale 0.125 0.3125 0.3125 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL @@ -73,10 +71,9 @@ Model "BiosparkArcBig" { Path "models/extra" - Model 0 "WarpBeam.iqm" - Animation 0 "WarpBeam.iqm" + Model 0 "WarpBeam.md3" Skin 0 "SparksterBeam.png" - Scale 64 160 160 + Scale 1 2.5 2.5 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL @@ -116,9 +113,8 @@ Model "BiosparkChildBeam" { Path "models/extra" - Model 0 "WarpBeam.iqm" - Animation 0 "WarpBeam.iqm" - Scale 256 256 256 + Model 0 "WarpBeam.md3" + Scale 4 8 8 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL diff --git a/modeldef/weapons/ynykron.txt b/modeldef/weapons/ynykron.txt index 87b1364d3..a699798a2 100644 --- a/modeldef/weapons/ynykron.txt +++ b/modeldef/weapons/ynykron.txt @@ -17,9 +17,8 @@ Model "YnykronBeam" { Path "models/extra" - Model 0 "WarpBeam2.iqm" - Animation 0 "Warpbeam2.iqm" - Scale 256 256 256 + Model 0 "WarpBeam2.md3" + Scale 4 4 4 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL @@ -112,9 +111,8 @@ Model "YnykronAltBeam" { Path "models/extra" - Model 0 "WarpBeam2.iqm" - Animation 0 "Warpbeam2.iqm" - Scale 128 128 128 + Model 0 "WarpBeam2.md3" + Scale 2 2 2 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL @@ -193,9 +191,8 @@ Model "YnykronLightningArc" { Path "models/extra" - Model 0 "WarpBeam.iqm" - Animation 0 "Warpbeam.iqm" - Scale 128 200 200 + Model 0 "WarpBeam.md3" + Scale 2 2 2 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL @@ -231,9 +228,8 @@ Model "YnykronLightningArcSub" { Path "models/extra" - Model 0 "WarpBeam.iqm" - Animation 0 "Warpbeam.iqm" - Scale 32 40 40 + Model 0 "WarpBeam.md3" + Scale 0.5 0.5 0.5 DONTCULLBACKFACES USEACTORPITCH USEACTORROLL diff --git a/models/extra/WarpBeam.iqm b/models/extra/WarpBeam.iqm deleted file mode 100644 index 474f3b45e..000000000 Binary files a/models/extra/WarpBeam.iqm and /dev/null differ diff --git a/models/extra/WarpBeam.md3 b/models/extra/WarpBeam.md3 new file mode 100644 index 000000000..bdff3c96e Binary files /dev/null and b/models/extra/WarpBeam.md3 differ diff --git a/models/extra/WarpBeam2.iqm b/models/extra/WarpBeam2.iqm deleted file mode 100644 index 93169da84..000000000 Binary files a/models/extra/WarpBeam2.iqm and /dev/null differ diff --git a/models/extra/WarpBeam2.md3 b/models/extra/WarpBeam2.md3 new file mode 100644 index 000000000..2d1087ae7 Binary files /dev/null and b/models/extra/WarpBeam2.md3 differ diff --git a/models/extra/WarpBeam3.iqm b/models/extra/WarpBeam3.iqm deleted file mode 100644 index 935e6135b..000000000 Binary files a/models/extra/WarpBeam3.iqm and /dev/null differ diff --git a/models/extra/WarpBeam3.md3 b/models/extra/WarpBeam3.md3 new file mode 100644 index 000000000..830afe46a Binary files /dev/null and b/models/extra/WarpBeam3.md3 differ