diff --git a/gldefs.txt b/gldefs.txt index dfe4024..ad8f228 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -757,18 +757,24 @@ HardwareShader Texture "models/OLSMP.png" { Shader "shaders/glsl/MeshEnviroMapMasked.fp" Texture "masktex" "models/OLSMP_m.png" - texture "envtex" "models/OLSMP_env.png" + Texture "envtex" "models/OLSMP_env.png" } HardwareShader Texture "models/OLSMP_.png" { Shader "shaders/glsl/MeshEnviroMapMasked_AmbientGlow.fp" Texture "masktex" "models/OLSMP_m.png" - texture "envtex" "models/OLSMP_env.png" + Texture "envtex" "models/OLSMP_env.png" } HardwareShader Texture "models/JSentry1_.png" { Shader "shaders/glsl/AmbientGlow.fp" } +HardwareShader Texture "models/Glass2.png" +{ + Shader "shaders/glsl/MeshEnviroMapMasked.fp" + Texture "masktex" "models/Glass2_m.png" + Texture "envtex" "models/NyLeve_env.png" +} // PP shaders HardwareShader PostProcess scene { diff --git a/modeldef.ubiorifle b/modeldef.ubiorifle index 63b41ce..fb322fa 100644 --- a/modeldef.ubiorifle +++ b/modeldef.ubiorifle @@ -294,7 +294,8 @@ Model "UBioRifle" { Path "models" Model 0 "BRifle_d.3d" - Skin 0 "JBrifle1.png" + SurfaceSkin 0 0 "JBrifle1.png" + SurfaceSkin 0 1 "Glass2.png" Scale 0.2 -0.2 0.2 AngleOffset -90 Offset 7 -20 -11.5 diff --git a/modeldef.umisc b/modeldef.umisc index 13efa91..fdde838 100644 --- a/modeldef.umisc +++ b/modeldef.umisc @@ -1,12 +1,11 @@ Model "UnrealBackpack" { Path "models" - Model 0 "Backpack2_d.3d" // cheaply edited out of SelectionMale1 (offsets weren't even readjusted, so I have to do it here) + Model 0 "Backpack2_d.3d" // edited out of SelectionMale1 Skin 0 "bpak.png" - Offset -15.795 13.1625 -16 // calculating the X and Y offsets was hard, but I'm glad I added the "estimated center" feature in umeshinfo now - Scale 0.36 0.3 0.3 - AngleOffset 90 - RollOffset -90 + ZOffset 16 + Scale 0.3 0.3 0.36 + AngleOffset -90 ROTATING FrameIndex BPAK A 0 0 diff --git a/models/BRifle_a.3d b/models/BRifle_a.3d index 3efcade..d17224f 100644 Binary files a/models/BRifle_a.3d and b/models/BRifle_a.3d differ diff --git a/models/BRifle_d.3d b/models/BRifle_d.3d index 6925b34..a8d5aa9 100644 Binary files a/models/BRifle_d.3d and b/models/BRifle_d.3d differ diff --git a/models/BigGun.blend b/models/BigGun.blend index d38fc1f..431ef87 100644 Binary files a/models/BigGun.blend and b/models/BigGun.blend differ diff --git a/models/BigGun_1st.blend b/models/BigGun_1st.blend index 88753be..63a0162 100644 Binary files a/models/BigGun_1st.blend and b/models/BigGun_1st.blend differ diff --git a/models/Bonesaw.blend b/models/Bonesaw.blend index 4dc5727..71e37ca 100644 Binary files a/models/Bonesaw.blend and b/models/Bonesaw.blend differ diff --git a/models/FlameGun.blend b/models/FlameGun.blend index 3bff006..335f9ff 100644 Binary files a/models/FlameGun.blend and b/models/FlameGun.blend differ diff --git a/models/FlameGun_1st.blend b/models/FlameGun_1st.blend index eafa421..5ab6554 100644 Binary files a/models/FlameGun_1st.blend and b/models/FlameGun_1st.blend differ diff --git a/models/Flamethrower.blend b/models/Flamethrower.blend index b5298ba..6d8564c 100644 Binary files a/models/Flamethrower.blend and b/models/Flamethrower.blend differ diff --git a/models/FlamethrowerOld.blend b/models/FlamethrowerOld.blend index 48e101d..74c6c34 100644 Binary files a/models/FlamethrowerOld.blend and b/models/FlamethrowerOld.blend differ diff --git a/models/FlamethrowerOld_1st.blend b/models/FlamethrowerOld_1st.blend index c88588a..bf77c97 100644 Binary files a/models/FlamethrowerOld_1st.blend and b/models/FlamethrowerOld_1st.blend differ diff --git a/models/Flamethrower_1st.blend b/models/Flamethrower_1st.blend index 2570805..feaa140 100644 Binary files a/models/Flamethrower_1st.blend and b/models/Flamethrower_1st.blend differ diff --git a/models/Glass2.png b/models/Glass2.png new file mode 100644 index 0000000..94771cd Binary files /dev/null and b/models/Glass2.png differ diff --git a/models/Glass2_m.png b/models/Glass2_m.png new file mode 100644 index 0000000..6fd7960 Binary files /dev/null and b/models/Glass2_m.png differ diff --git a/models/Impaler_1st.blend b/models/Impaler_1st.blend index d2be55d..b69a050 100644 Binary files a/models/Impaler_1st.blend and b/models/Impaler_1st.blend differ diff --git a/models/NewSentry.blend b/models/NewSentry.blend index 61fa440..7f1c008 100644 Binary files a/models/NewSentry.blend and b/models/NewSentry.blend differ diff --git a/models/NyLeve_env.png b/models/NyLeve_env.png new file mode 100644 index 0000000..68a61e5 Binary files /dev/null and b/models/NyLeve_env.png differ diff --git a/models/OldAutomag.blend b/models/OldAutomag.blend index 1bc32e2..1dd04d0 100644 Binary files a/models/OldAutomag.blend and b/models/OldAutomag.blend differ diff --git a/models/Quadshot.blend b/models/Quadshot.blend index 1bbc0d4..80c4a83 100644 Binary files a/models/Quadshot.blend and b/models/Quadshot.blend differ diff --git a/models/SMinigun.blend b/models/SMinigun.blend index d1f067f..6d549d0 100644 Binary files a/models/SMinigun.blend and b/models/SMinigun.blend differ diff --git a/models/TeleHand.blend b/models/TeleHand.blend index c1d4763..3bc9c3c 100644 Binary files a/models/TeleHand.blend and b/models/TeleHand.blend differ diff --git a/zscript/uminigun.zsc b/zscript/uminigun.zsc index 2c966db..8f05dee 100644 --- a/zscript/uminigun.zsc +++ b/zscript/uminigun.zsc @@ -192,6 +192,8 @@ Class UMinigun : UnrealWeapon AltFire: MGNW A 0 A_PlaySound("umini/wind",CHAN_WEAPON,Dampener.Active(self)?.1:1.); MGNW ABCDEFGHIJKLMNO 1; + MGNW O 0 A_Refire(1); + Goto Release; Hold: MGNF A 0 {