diff --git a/gldefs.hammer b/gldefs.hammer new file mode 100644 index 000000000..13f0d19c7 --- /dev/null +++ b/gldefs.hammer @@ -0,0 +1,11 @@ +HardwareShader Texture "models/CombatHammer.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/CombatHammer_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".6" + Define "RIMFACT" = ".8" + Define "RIMSTEP" = "0." +} diff --git a/language.version b/language.version index ebac71db9..15b6ff209 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r288 \cu(Wed 10 Aug 21:26:17 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r288 \cu(2022-08-10 21:26:17)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r290 \cu(Wed 10 Aug 21:27:34 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r290 \cu(2022-08-10 21:27:34)\c-"; diff --git a/modeldef.hammer b/modeldef.hammer index d54f2b479..f0d8befbc 100644 --- a/modeldef.hammer +++ b/modeldef.hammer @@ -1,12 +1,12 @@ Model "ItamexHammer" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILR" - Scale 0.04 0.04 0.04 - ZOffset 16 - PitchOffset 30 + Model 0 "CombatHammer_d.3d" + Skin 0 "CombatHammer.png" + Scale 0.4 0.4 0.4 + ZOffset 28 + AngleOffset 90 ROTATING FrameIndex XZW1 A 0 0 diff --git a/models/CombatHammer.blend b/models/CombatHammer.blend new file mode 100644 index 000000000..64fb58854 Binary files /dev/null and b/models/CombatHammer.blend differ diff --git a/models/CombatHammer.png b/models/CombatHammer.png new file mode 100644 index 000000000..1239764f3 Binary files /dev/null and b/models/CombatHammer.png differ diff --git a/models/CombatHammer1st.blend b/models/CombatHammer1st.blend new file mode 100644 index 000000000..f63f9aeae Binary files /dev/null and b/models/CombatHammer1st.blend differ diff --git a/models/CombatHammer_a.3d b/models/CombatHammer_a.3d new file mode 100644 index 000000000..8fa7da25d Binary files /dev/null and b/models/CombatHammer_a.3d differ diff --git a/models/CombatHammer_d.3d b/models/CombatHammer_d.3d new file mode 100644 index 000000000..66603c9d4 Binary files /dev/null and b/models/CombatHammer_d.3d differ diff --git a/models/CombatHammer_mask.png b/models/CombatHammer_mask.png new file mode 100644 index 000000000..e41fae958 Binary files /dev/null and b/models/CombatHammer_mask.png differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index 3ff379e03..8987eaacd 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -1,7 +1,7 @@ # DLC Weaponset Weapon models: - - Itamex Hammer + ½ Itamex Hammer - Plasma Blaster - Puntzer Beta - Puntzer Gamma