Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Buttons update #265

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
df165da
Update weapon_gauntlet.lua
PYROTEKNIK May 30, 2021
5c401c1
Update weapon_gauntlet.lua
PYROTEKNIK May 30, 2021
be39ae4
Update sh_location.lua
PYROTEKNIK May 30, 2021
06e7ace
fuck
PYROTEKNIK Jun 5, 2021
fe3eb69
Update sv_effects.lua
PYROTEKNIK Jun 5, 2021
6fd1852
Assets updated
PYROTEKNIK Jun 9, 2021
26952cc
Update shared.lua
PYROTEKNIK Jun 9, 2021
3a32ec4
i really need to clean this shit up
PYROTEKNIK Jun 9, 2021
de7253b
Update sv_effects.lua
PYROTEKNIK Jun 11, 2021
a197a10
Removed unfinished rampage thing
PYROTEKNIK Jun 23, 2021
b1aa251
Update sv_effects.lua
PYROTEKNIK Jun 23, 2021
6d697bc
Update sv_effects.lua
PYROTEKNIK Jun 23, 2021
e3ccb55
Update sv_logic.lua
PYROTEKNIK Jun 23, 2021
8dd1877
reverted gauntlet changes. I have better ones in a different PR.
PYROTEKNIK Jun 23, 2021
a3b4eae
Merge branch 'swampservers:master' into buttons_update
PYROTEKNIK Jun 23, 2021
2f6c3c2
Merge branch 'swampservers:master' into buttons_update
PYROTEKNIK Jun 29, 2021
95c8cc8
reverting to master
PYROTEKNIK Jun 29, 2021
3f1093c
Merge branch 'buttons_update' of https://github.com/PYROTEKNIK/contri…
PYROTEKNIK Jun 29, 2021
c84de67
model has a box under it so it looks okay when floating over some sur…
PYROTEKNIK Jun 29, 2021
ee180e0
box part was not oriented correctly
PYROTEKNIK Jun 29, 2021
0def3d1
remove bodygroup checking, better lighting
PYROTEKNIK Jun 29, 2021
2294bf1
adjust rotation modifying for new model
PYROTEKNIK Jun 29, 2021
28e9cf5
Update sv_effects.lua
PYROTEKNIK Jul 1, 2021
4452958
Merge remote-tracking branch 'upstream/master' into buttons_update
PYROTEKNIK Jul 17, 2021
f0affac
Update init.lua
PYROTEKNIK Jul 18, 2021
545dc02
cringe little animation override that makes it take GetLaggedMovement…
PYROTEKNIK Jul 18, 2021
12fc232
Update sv_effects.lua
PYROTEKNIK Jul 18, 2021
60748aa
Update cl_hud.lua
PYROTEKNIK Jul 18, 2021
1450fea
Update player_extension.lua
PYROTEKNIK Jul 18, 2021
1c1bbbc
Update sv_placement.lua
PYROTEKNIK Jul 18, 2021
e0c24fe
set ammo to 50
PYROTEKNIK Jul 18, 2021
6617e7a
Update sv_effects.lua
PYROTEKNIK Jul 18, 2021
b3976d3
placement failure error reports the position
PYROTEKNIK Jul 18, 2021
43f9326
Update sv_effects.lua
PYROTEKNIK Jul 18, 2021
9c28b6c
Update sv_effects.lua
PYROTEKNIK Jul 18, 2021
316f6c5
Update sv_effects.lua
PYROTEKNIK Jul 18, 2021
f72e824
Revert "Update player_extension.lua"
PYROTEKNIK Jul 25, 2021
bfc6b41
Revert "cringe little animation override that makes it take GetLagged…
PYROTEKNIK Jul 25, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lua/autorun/client/cl_hud.lua
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function DrawAmmoGauge(count, icon, x, y, alignh, alignv, alpha)
local minwidth = math.Round(ScreenScale(64 * overall_scale))
local margin = math.Round(ScreenScale(2 * overall_scale))
local gap = 0
local collimit = 8
local collimit = 7
alpha = alpha or 1
local bgcol = ColorAlpha(color_bg, color_bg.a * alpha)
local fgcol = ColorAlpha(color_fg, color_fg.a * alpha)
Expand Down Expand Up @@ -301,7 +301,7 @@ hook.Add("HUDPaint", "SwampHealthAmmo", function()
stack_height = stack_height + h + 4
end

local drawhealth = ply:Alive() and (ply:Health() < ply:GetMaxHealth() or HumanTeamName)
local drawhealth = ply:Alive() and (ply:Health() != ply:GetMaxHealth() or HumanTeamName)
HEALTH_ALPHA = math.Approach(HEALTH_ALPHA or 0, drawhealth and 1 or 0, FrameTime() * 4)

if (HEALTH_ALPHA > 0) then
Expand Down
Empty file modified lua/autorun/sh_location.lua
100755 → 100644
Empty file.
Loading