Skip to content

Commit

Permalink
Fixed: Frame close shortcut ALT + E closes all opened frame at once
Browse files Browse the repository at this point in the history
Fixed: Frame close shortcut `ALT + E` closes the last frame on the stack
Fixed: workshop_publish.bat not deleting the last extracted log
  • Loading branch information
dvdvideo1234 committed Oct 12, 2019
1 parent 17ca0fe commit 0f7f503
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
4 changes: 3 additions & 1 deletion lua/autorun/trackassembly_init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ local gtInitLogs = {"*Init", false, 0}

------ CONFIGURE ASMLIB ------
asmlib.InitBase("track","assembly")
asmlib.SetOpVar("TOOL_VERSION","7.571")
asmlib.SetOpVar("TOOL_VERSION","7.573")
asmlib.SetIndexes("V" , "x", "y", "z")
asmlib.SetIndexes("A" ,"pitch","yaw","roll")
asmlib.SetIndexes("WV",1,2,3)
Expand Down Expand Up @@ -115,6 +115,8 @@ if(SERVER) then
end

------ CONFIGURE INTERNALS -----
asmlib.IsFlag("new_close_frame", false)
asmlib.IsFlag("old_close_frame", false)
asmlib.IsFlag("en_context_menu", false)
asmlib.SetOpVar("MODE_DATABASE", asmlib.GetAsmConvar("modedb" , "STR"))
asmlib.SetOpVar("TRACE_MARGIN" , asmlib.GetAsmConvar("maxtrmarg", "FLT"))
Expand Down
4 changes: 3 additions & 1 deletion lua/weapons/gmod_tool/stools/trackassembly.lua
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,9 @@ function TOOL:Think()
local wormo = self:GetWorkingMode()
if(utilIsValidModel(model)) then
if(CLIENT) then -- Precache the model or it is invalid otherwise
if(inputIsKeyDown(KEY_LALT) and inputIsKeyDown(KEY_E)) then
local bOld = asmlib.IsFlag("old_close_frame", asmlib.IsFlag("new_close_frame"))
local bNew = asmlib.IsFlag("new_close_frame", inputIsKeyDown(KEY_E))
if(not bOld and bNew and inputIsKeyDown(KEY_LALT)) then
local pnFrame = conElements:Pull() -- Retrieve a panel from the stack
if(IsValid(pnFrame)) then pnFrame:Close() end -- Call close on it !
end -- Shortcut for closing the routine pieces. A `close` call, get it :D
Expand Down
5 changes: 5 additions & 0 deletions workshop_publish.bat
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,8 @@ rd /S /Q !gmadRevPath!Workshop
echo !gmadName! Published !
echo.
timeout 500

:: Give a chance to copy the logs
del !gmadRevPath!!gmadNameLOG!

exit 0

0 comments on commit 0f7f503

Please sign in to comment.