diff --git a/platform/base_textures.pk3dir/textures/editor/ambient_generic.mat b/platform/base_textures.pk3dir/textures/editor/ambient_generic.mat new file mode 100644 index 00000000..d5bd6dcb --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/ambient_generic.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/ambient_generic.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/ambient_generic.tga b/platform/base_textures.pk3dir/textures/editor/ambient_generic.tga new file mode 100644 index 00000000..3b950b2e Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/ambient_generic.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/env_cubemap.mat b/platform/base_textures.pk3dir/textures/editor/env_cubemap.mat new file mode 100644 index 00000000..8d2861c8 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/env_cubemap.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/env_cubemap.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/env_cubemap.tga b/platform/base_textures.pk3dir/textures/editor/env_cubemap.tga new file mode 100644 index 00000000..38c99fd7 Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/env_cubemap.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/info_intermission.mat b/platform/base_textures.pk3dir/textures/editor/info_intermission.mat new file mode 100644 index 00000000..d0e8afe1 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/info_intermission.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/info_intermission.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/info_intermission.tga b/platform/base_textures.pk3dir/textures/editor/info_intermission.tga new file mode 100644 index 00000000..7d8ce1d4 Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/info_intermission.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/info_landmark.mat b/platform/base_textures.pk3dir/textures/editor/info_landmark.mat new file mode 100644 index 00000000..ed8e46ab --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/info_landmark.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/info_landmark.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/info_landmark.tga b/platform/base_textures.pk3dir/textures/editor/info_landmark.tga new file mode 100644 index 00000000..c823f62a Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/info_landmark.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/info_node.mat b/platform/base_textures.pk3dir/textures/editor/info_node.mat index 1826ad2a..89fed4ad 100644 --- a/platform/base_textures.pk3dir/textures/editor/info_node.mat +++ b/platform/base_textures.pk3dir/textures/editor/info_node.mat @@ -3,6 +3,6 @@ { map $diffuse - blendFunc blend + alphaFunc GE128 } } diff --git a/platform/base_textures.pk3dir/textures/editor/info_node_air.mat b/platform/base_textures.pk3dir/textures/editor/info_node_air.mat index 1a54303f..98c7f48c 100644 --- a/platform/base_textures.pk3dir/textures/editor/info_node_air.mat +++ b/platform/base_textures.pk3dir/textures/editor/info_node_air.mat @@ -3,6 +3,6 @@ { map $diffuse - blendFunc blend + alphaFunc GE128 } } diff --git a/platform/base_textures.pk3dir/textures/editor/light.mat b/platform/base_textures.pk3dir/textures/editor/light.mat new file mode 100644 index 00000000..d6e56aae --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/light.mat @@ -0,0 +1,9 @@ +{ + diffusemap textures/editor/light.tga + + { + map $diffuse + rgbGen vertex + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/light.tga b/platform/base_textures.pk3dir/textures/editor/light.tga new file mode 100644 index 00000000..6524ac91 Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/light.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/light_dynamic.mat b/platform/base_textures.pk3dir/textures/editor/light_dynamic.mat index 93f29a95..e873c9d5 100644 --- a/platform/base_textures.pk3dir/textures/editor/light_dynamic.mat +++ b/platform/base_textures.pk3dir/textures/editor/light_dynamic.mat @@ -3,7 +3,7 @@ { map $diffuse - blendFunc blend + alphaFunc GE128 rgbGen vertex } } diff --git a/platform/base_textures.pk3dir/textures/editor/model_bone.mat b/platform/base_textures.pk3dir/textures/editor/model_bone.mat index a1054ffb..3ca6147a 100644 --- a/platform/base_textures.pk3dir/textures/editor/model_bone.mat +++ b/platform/base_textures.pk3dir/textures/editor/model_bone.mat @@ -3,6 +3,6 @@ { map $diffuse - blendFunc blend + alphaFunc GE128 } } diff --git a/platform/base_textures.pk3dir/textures/editor/path_track.mat b/platform/base_textures.pk3dir/textures/editor/path_track.mat index 7809f8da..7651e60e 100644 --- a/platform/base_textures.pk3dir/textures/editor/path_track.mat +++ b/platform/base_textures.pk3dir/textures/editor/path_track.mat @@ -3,6 +3,6 @@ { map $diffuse - blendFunc blend + alphaFunc GE128 } } diff --git a/platform/base_textures.pk3dir/textures/editor/prop_door_rotating.mat b/platform/base_textures.pk3dir/textures/editor/prop_door_rotating.mat new file mode 100644 index 00000000..10a3dfd5 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/prop_door_rotating.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/prop_door_rotating.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/prop_door_rotating.tga b/platform/base_textures.pk3dir/textures/editor/prop_door_rotating.tga new file mode 100644 index 00000000..86a387ac Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/prop_door_rotating.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/scripted_sentence.mat b/platform/base_textures.pk3dir/textures/editor/scripted_sentence.mat new file mode 100644 index 00000000..ad977f42 --- /dev/null +++ b/platform/base_textures.pk3dir/textures/editor/scripted_sentence.mat @@ -0,0 +1,8 @@ +{ + diffusemap textures/editor/scripted_sentence.tga + + { + map $diffuse + alphaFunc GE128 + } +} diff --git a/platform/base_textures.pk3dir/textures/editor/scripted_sentence.tga b/platform/base_textures.pk3dir/textures/editor/scripted_sentence.tga new file mode 100644 index 00000000..ed2dfc32 Binary files /dev/null and b/platform/base_textures.pk3dir/textures/editor/scripted_sentence.tga differ diff --git a/platform/base_textures.pk3dir/textures/editor/scripted_sequence.mat b/platform/base_textures.pk3dir/textures/editor/scripted_sequence.mat index 8a473835..05e7e8e4 100644 --- a/platform/base_textures.pk3dir/textures/editor/scripted_sequence.mat +++ b/platform/base_textures.pk3dir/textures/editor/scripted_sequence.mat @@ -3,6 +3,6 @@ { map $diffuse - blendFunc blend + alphaFunc GE128 } } diff --git a/platform/base_textures.pk3dir/textures/editor/scripted_sequence.tga b/platform/base_textures.pk3dir/textures/editor/scripted_sequence.tga index 6b39c3c9..ffbc5251 100644 Binary files a/platform/base_textures.pk3dir/textures/editor/scripted_sequence.tga and b/platform/base_textures.pk3dir/textures/editor/scripted_sequence.tga differ diff --git a/src/gs-entbase/server/env_shake.qc b/src/gs-entbase/server/env_shake.qc index 9b685115..c6bc0fe7 100644 --- a/src/gs-entbase/server/env_shake.qc +++ b/src/gs-entbase/server/env_shake.qc @@ -46,6 +46,8 @@ public: virtual void SpawnKey(string,string); virtual void Trigger(entity, triggermode_t); + virtual void OnRemoveEntity(void); + private: float m_flRadius; float m_flAmplitude; @@ -62,6 +64,19 @@ env_shake::env_shake(void) m_flFrequency = 0.0f; } +void +env_shake::OnRemoveEntity(void) +{ + if (HasSpawnFlags(1)) { + WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); + WriteByte(MSG_MULTICAST, EV_SHAKE); + WriteFloat(MSG_MULTICAST, 1.0); + WriteFloat(MSG_MULTICAST, m_flAmplitude); + WriteFloat(MSG_MULTICAST, m_flFrequency); + multicast([0,0,0], MULTICAST_ALL_R); + } +} + void env_shake::Save(float handle) { @@ -117,5 +132,14 @@ env_shake::SpawnKey(string strKey, string strValue) void env_shake::Trigger(entity act, triggermode_t state) { - Client_ShakeOnce(origin, m_flRadius, m_flDuration, m_flFrequency, m_flAmplitude); + if (HasSpawnFlags(1)) { + WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); + WriteByte(MSG_MULTICAST, EV_SHAKE); + WriteFloat(MSG_MULTICAST, m_flDuration); + WriteFloat(MSG_MULTICAST, m_flAmplitude); + WriteFloat(MSG_MULTICAST, m_flFrequency); + multicast([0,0,0], MULTICAST_ALL_R); + } else { + Client_ShakeOnce(origin, m_flRadius, m_flDuration, m_flFrequency, m_flAmplitude); + } }