Skip to content
Permalink
Browse files

hiding game interface when chobby interface is on top

  • Loading branch information...
Ruwetuin committed Oct 3, 2019
1 parent b77511b commit 606aa30d0ca5dc509144d9b256fa01bfd500c467
Showing with 438 additions and 4 deletions.
  1. +7 −0 LuaUI/Widgets_Evo/api_chili.lua
  2. +7 −0 LuaUI/Widgets_Evo/camera_player_tv.lua
  3. +7 −0 LuaUI/Widgets_Evo/chili/simple examples/Widgets/gui_chiligui.lua
  4. +7 −0 LuaUI/Widgets_Evo/cmd_customformations2.lua
  5. +7 −0 LuaUI/Widgets_Evo/cmd_mex_placement.lua
  6. +7 −0 LuaUI/Widgets_Evo/dbg_widget_profiler.lua
  7. +8 −1 LuaUI/Widgets_Evo/dbg_widgetprofiler.lua
  8. +7 −0 LuaUI/Widgets_Evo/game_buildHotkeys.lua
  9. +7 −0 LuaUI/Widgets_Evo/gfx_dof.lua
  10. +7 −0 LuaUI/Widgets_Evo/gfx_guishader.lua
  11. +7 −0 LuaUI/Widgets_Evo/gfx_move_window_position.lua
  12. +7 −0 LuaUI/Widgets_Evo/gfx_snow.lua
  13. +7 −0 LuaUI/Widgets_Evo/gui_FactoryExitIndicator.lua
  14. +7 −0 LuaUI/Widgets_Evo/gui_advplayerslist.lua
  15. +7 −0 LuaUI/Widgets_Evo/gui_advplayerslist_displayinfo.lua
  16. +8 −1 LuaUI/Widgets_Evo/gui_allySelectedUnits.lua
  17. +7 −0 LuaUI/Widgets_Evo/gui_attack_aoe.lua
  18. +7 −0 LuaUI/Widgets_Evo/gui_build_eta.lua
  19. +7 −0 LuaUI/Widgets_Evo/gui_clearmapmarks.lua
  20. +7 −0 LuaUI/Widgets_Evo/gui_com_nametags.lua
  21. +7 −0 LuaUI/Widgets_Evo/gui_commands_fx.lua
  22. +7 −0 LuaUI/Widgets_Evo/gui_commands_info.lua
  23. +7 −0 LuaUI/Widgets_Evo/gui_damage_cursortip.lua
  24. +7 −0 LuaUI/Widgets_Evo/gui_discord.lua
  25. +7 −0 LuaUI/Widgets_Evo/gui_display_dps.lua
  26. +8 −1 LuaUI/Widgets_Evo/gui_evo_defaultgui_layout.lua
  27. +7 −0 LuaUI/Widgets_Evo/gui_evo_tooltip.lua
  28. +14 −0 LuaUI/Widgets_Evo/gui_faction_change.lua
  29. +7 −0 LuaUI/Widgets_Evo/gui_gameinfo.lua
  30. +7 −0 LuaUI/Widgets_Evo/gui_given_units.lua
  31. +8 −1 LuaUI/Widgets_Evo/gui_healthbars.lua
  32. +7 −0 LuaUI/Widgets_Evo/gui_highlight_geos.xlua
  33. +7 −0 LuaUI/Widgets_Evo/gui_highlight_selectedunits.lua
  34. +7 −0 LuaUI/Widgets_Evo/gui_highlight_unit.lua
  35. +14 −0 LuaUI/Widgets_Evo/gui_idle_builders.lua
  36. +7 −0 LuaUI/Widgets_Evo/gui_keybind_info.lua
  37. +7 −0 LuaUI/Widgets_Evo/gui_lups_stats.lua
  38. +7 −0 LuaUI/Widgets_Evo/gui_mapinfo.lua
  39. +7 −0 LuaUI/Widgets_Evo/gui_musicPlayer_Dynamic_Advanced.lua
  40. +7 −0 LuaUI/Widgets_Evo/gui_options.lua
  41. +7 −0 LuaUI/Widgets_Evo/gui_pauseScreen.lua
  42. +14 −0 LuaUI/Widgets_Evo/gui_pip.lua
  43. +7 −0 LuaUI/Widgets_Evo/gui_pip_extra1.lua
  44. +7 −0 LuaUI/Widgets_Evo/gui_pip_extra2.lua
  45. +7 −0 LuaUI/Widgets_Evo/gui_point_tracker.lua
  46. +7 −0 LuaUI/Widgets_Evo/gui_red_buildordermenu-EvoRTS.lua
  47. +7 −0 LuaUI/Widgets_Evo/gui_red_minimap.lua
  48. +7 −0 LuaUI/Widgets_Evo/gui_replaybuttons.lua
  49. +7 −0 LuaUI/Widgets_Evo/gui_resourceBar.lua
  50. +7 −0 LuaUI/Widgets_Evo/gui_selected_units_buttons.lua
  51. +7 −0 LuaUI/Widgets_Evo/gui_selfd_icons.lua
  52. +7 −0 LuaUI/Widgets_Evo/gui_tooltip.lua
  53. +7 −0 LuaUI/Widgets_Evo/gui_top_bar.lua
  54. +7 −0 LuaUI/Widgets_Evo/gui_unit_stats.lua
  55. +7 −0 LuaUI/Widgets_Evo/gui_vote_interface.lua
  56. +7 −0 LuaUI/Widgets_Evo/gui_widget_selector.lua
  57. +7 −0 LuaUI/Widgets_Evo/map_startbox.lua
  58. +7 −0 LuaUI/Widgets_Evo/red_ui_framework.lua
  59. +7 −0 LuaUI/Widgets_Evo/red_ui_framework_drawing.lua
@@ -73,7 +73,14 @@ end
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
gl.Color(1,1,1,1)
if (not screen0:IsEmpty()) then
gl.PushMatrix()
@@ -509,7 +509,14 @@ end



function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if not isSpec then return end

local gameFrame = Spring.GetGameFrame()
@@ -36,7 +36,14 @@ WG.Chili.Screen0 = screen0
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if (not th) then
th = Chili.TextureHandler
th.Initialize()
@@ -808,7 +808,14 @@ function widget:ViewResize(viewSizeX, viewSizeY)
Xs, Ys = Xs*0.5, Ys*0.5
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawWorld()
if chobbyInterface then return end
-- Draw lines when a path is drawn instead of a formation, OR when drawmode for formations is not "dots" only
if pathCandidate or options.drawmode.value ~= "dots" then
DrawFormationLines(tVerts, 2)
@@ -755,7 +755,14 @@ function widget:DrawWorldPreUnit()
end
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawWorld()
if chobbyInterface then return end
if Spring.IsGUIHidden() then return end

-- Check command is to build a mex
@@ -383,7 +383,14 @@ function DrawWidgetList(list,name,x,y,j, fontSize,lineSpace,maxLines,colWidth,da
return x,j
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if not (next(callinStats)) then
return --// nothing to do
end
@@ -317,7 +317,14 @@ function CheckLoad(v) --tLoad is %
return ColourString(r,g,b)
end

function widget:DrawScreen()
function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if not (next(callinTimes)) then
return --// nothing to do
end
@@ -240,6 +240,13 @@ function widget:MousePress(x, y, button)
return false
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
gl.Text(hotkeyText, screenWidth * 0.5, 60, 20, "onc")
end
@@ -415,7 +415,14 @@ local function Composition()
glTexture(2, false)
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawWorld()
if chobbyInterface then return end
gl.ActiveShader(dofShader, function() glUniformMatrix(viewProjectionLoc, "projection") end)
end

@@ -473,7 +473,14 @@ function widget:DrawScreenEffectsBlur()
end
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if Spring.IsGUIHidden() then return end

if ((screenBlur or next(guishaderScreenRects) or next(guishaderScreenDlists))) and blurShader then
@@ -257,7 +257,14 @@ function widget:KeyPress(key)
return true
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
gl.CallList(windowList)

local x,y,b = Spring.GetMouseState()
@@ -460,7 +460,14 @@ function widget:Shutdown()
gl.DeleteFont(font)
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if not enabled or not autoReduce then return end

if not gameStarted and snowMaps[currentMapname] ~= nil and snowMaps[currentMapname] then
@@ -91,7 +91,14 @@ function widget:Update()
end
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawWorld()
if chobbyInterface then return end
drawOrientation()

ResetGl()
@@ -1731,7 +1731,14 @@ local Background
local ShareSlider


function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end

if Spring_IsGUIHidden() then return end

@@ -275,7 +275,14 @@ function widget:ViewResize(newX,newY)
end
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if drawlist[1] ~= nil then
glPushMatrix()
glCallList(drawlist[1])
@@ -581,7 +581,14 @@ end


if showGui then
function widget:DrawScreen()
function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if lockPlayerID ~= nil then
if not guiList then
createGuiList()
@@ -588,7 +588,14 @@ function widget:Shutdown()
DeleteDisplayLists()
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawWorld()
if chobbyInterface then return end

if not hasSelection then return end
local _, cmd, _ = GetActiveCommand()
@@ -218,7 +218,14 @@ local function DrawEtaText(timeLeft,yoffset)
font:End()
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawWorld()
if chobbyInterface then return end
if Spring.IsGUIHidden() == false then
gl.DepthTest(true)

@@ -103,7 +103,14 @@ function widget:Update(dt)
end
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if drawlist[1] ~= nil then
local mx,my = Spring.GetMouseState()
glPushMatrix()
@@ -286,7 +286,14 @@ function widget:DrawScreenEffects() -- using DrawScreenEffects so that guish
drawScreenUnits = {}
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawWorld()
if chobbyInterface then return end
if Spring.IsGUIHidden() then return end
-- untested fix: when you resign, to also show enemy com playernames (because widget:PlayerChanged() isnt called anymore)
if not CheckedForSpec and Spring.GetGameFrame() > 1 then
@@ -801,7 +801,14 @@ end



function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawWorld()
if chobbyInterface then return end
if spIsGUIHidden() then return end

if drawUnitHighlightSkipFPS > 0 and spGetFPS() < drawUnitHighlightSkipFPS then return end
@@ -309,7 +309,14 @@ function DrawWindow()
end


function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if spIsGUIHidden() then return end

-- draw the help
@@ -144,7 +144,14 @@ function widget:Update(dt)

end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
if drawString then
local x, y = Spring.GetMouseState()
font:Begin()
@@ -123,7 +123,14 @@ function widget:GameFrame(n)
end
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end
updatePosition()
if drawlist[1] ~= nil then
glPushMatrix()
@@ -270,7 +270,14 @@ local function DrawUnitFunc(yshift, xshift, damage, textSize, alpha, paralyze)
end
end

function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawWorld()
if chobbyInterface then return end
if Spring.IsGUIHidden() then return end

local theTime = GetGameSeconds()
@@ -301,7 +301,14 @@ end

local TweakAbove

function widget:DrawScreen() --Tweak Mode doesn't work without it
function widget:RecvLuaMsg(msg, playerID)
if msg:sub(1,18) == 'LobbyOverlayActive' then
chobbyInterface = (msg:sub(1,19) == 'LobbyOverlayActive1')
end
end

function widget:DrawScreen()
if chobbyInterface then return end --Tweak Mode doesn't work without it
end
function widget:TweakDrawScreen()
glPushMatrix()

0 comments on commit 606aa30

Please sign in to comment.
You can’t perform that action at this time.