diff --git a/gldefs.misc b/gldefs.misc index 16e76b2f7..be10c7ddb 100644 --- a/gldefs.misc +++ b/gldefs.misc @@ -140,6 +140,10 @@ HardwareShader Texture "graphics/M_DEMOCHAN_THUMBUP.png" { Shader "shaders/glsl/Bilinear.fp" } +HardwareShader Texture "graphics/M_DEMOCHAN_HAMMER.png" +{ + Shader "shaders/glsl/Bilinear.fp" +} HardwareShader Texture "graphics/M_DEMOCHAN_SHEEN.png" { Shader "shaders/glsl/Bilinear.fp" diff --git a/graphics/M_DEMOCHAN_HAMMER.png b/graphics/M_DEMOCHAN_HAMMER.png new file mode 100644 index 000000000..9640a1086 Binary files /dev/null and b/graphics/M_DEMOCHAN_HAMMER.png differ diff --git a/language.def_menu b/language.def_menu index 87a68a712..fa74bed65 100644 --- a/language.def_menu +++ b/language.def_menu @@ -295,7 +295,7 @@ TOOLTIP_NETEVENT_SWWMUPDATEGLOWS = "Adds/Removes item glows at runtime, without TOOLTIP_NETEVENT_SWWMUPDATEHITBOXES = "Removes extended item hitboxes at runtime. Due to implementation quirks, they can't be added without a map restart."; TOOLTIP_NETEVENT_SWWMUPDATETRACKERS = "Adds/Removes combat trackers at runtime. This command has the potential to cause severe performance issues in certain situations."; // main menu poses (do not localize) -SWWM_NMENUPOSE = "21"; +SWWM_NMENUPOSE = "22"; SWWM_MENUPOSE1 = "graphics/M_DEMOCHAN_DEEPIMPACT.png"; SWWM_MENUPOSE2 = "graphics/M_DEMOCHAN_EXPLOGUN.png"; SWWM_MENUPOSE3 = "graphics/M_DEMOCHAN_SPREADGUN.png"; @@ -316,11 +316,11 @@ SWWM_MENUPOSE17 = "graphics/M_DEMOCHAN_SHELLS.png"; SWWM_MENUPOSE18 = "graphics/M_DEMOCHAN_SKULL.png"; SWWM_MENUPOSE19 = "graphics/M_DEMOCHAN_THONK.png"; SWWM_MENUPOSE20 = "graphics/M_DEMOCHAN_THUMBUP.png"; -//SWWM_MENUPOSE21 = "graphics/M_DEMOCHAN_HAMMER.png"; +SWWM_MENUPOSE21 = "graphics/M_DEMOCHAN_HAMMER.png"; //SWWM_MENUPOSE22 = "graphics/M_DEMOCHAN_PLASMA.png"; //SWWM_MENUPOSE23 = "graphics/M_DEMOCHAN_REVOLVER.png"; //SWWM_MENUPOSE24 = "graphics/M_DEMOCHAN_SMG.png"; -SWWM_MENUPOSE21 = "graphics/M_DEMOCHAN_SHEEN.png"; // temp (25) +SWWM_MENUPOSE22 = "graphics/M_DEMOCHAN_SHEEN.png"; // temp (25) //SWWM_MENUPOSE26 = "graphics/M_DEMOCHAN_QUADRAVOL.png"; //SWWM_MENUPOSE27 = "graphics/M_DEMOCHAN_SPARKSTER.png"; //SWWM_MENUPOSE28 = "graphics/M_DEMOCHAN_RAYKHOM.png"; diff --git a/language.version b/language.version index a4394e7d2..40cc4754b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r292 \cu(Wed 10 Aug 22:15:16 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r292 \cu(2022-08-10 22:15:16)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r293 \cu(Wed 10 Aug 22:53:32 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r293 \cu(2022-08-10 22:53:32)\c-"; diff --git a/modeldef.hammer b/modeldef.hammer index f0d8befbc..6784abbd4 100644 --- a/modeldef.hammer +++ b/modeldef.hammer @@ -2,7 +2,7 @@ Model "ItamexHammer" { Path "models" - Model 0 "CombatHammer_d.3d" + Model 0 "CombatHammerPickup_d.3d" Skin 0 "CombatHammer.png" Scale 0.4 0.4 0.4 ZOffset 28 diff --git a/models/CombatHammer_a.3d b/models/CombatHammerPickup_a.3d similarity index 100% rename from models/CombatHammer_a.3d rename to models/CombatHammerPickup_a.3d diff --git a/models/CombatHammer_d.3d b/models/CombatHammerPickup_d.3d similarity index 100% rename from models/CombatHammer_d.3d rename to models/CombatHammerPickup_d.3d