Skip to content

Assorted patches #5797

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.

Sign up for GitHub

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

Open
SteelBlueZK wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −12
Open

Assorted patches #5797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion LuaUI/Widgets/gui_reclaiminfo.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ local rangeend = {} --counting radius end point
local b1was = false -- cursor was outside the map?
local vsx, vsy = widgetHandler:GetViewSizes()
local form = 12 --text format depends on screen size
local xstart,ystart = 0
local xstart,ystart = 0, 0
local cmd,xend,yend,x,y,b1,b2
local inMinimap = false --mouse cursor in minimap

Expand Down
10 changes: 0 additions & 10 deletions effects/roach.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,6 @@ return {
},
},
blastwing = {
groundflash = {
flashalpha = 1,
flashsize = 108,
ttl = 75,
color = {
[1] = 0.7,
[2] = 0.3,
[3] = 0.1,
},
},
redploom = {
air = true,
class = [[CExpGenSpawner]],
Expand Down
2 changes: 1 addition & 1 deletion lups/lups.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ local function GameFrame(_,n)
CleanInvalidUnitFX()

--// update FXs
framesToUpdate = thisGameFrame - lastGameFrame
local framesToUpdate = thisGameFrame - lastGameFrame
for _,partFx in pairs(particles) do
if (n>=partFx.dieGameFrame) then
--// lifetime ended
Expand Down