Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions lua/pac3/editor/client/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,10 @@ function pace.OpenEditor()

pace.SetLanguage()

local editorWidth = 280

local editor = pace.CreatePanel("editor")
editor:SetSize(240, ScrH())
editor:SetSize(editorWidth, ScrH())
editor:MakePopup()
--editor:SetPos(0, 0)
editor.Close = function()
Expand All @@ -117,7 +119,7 @@ function pace.OpenEditor()
if remember:GetBool() then
local x = cookie.GetNumber("pac_editor_x", 0)

if x < 0 or x + 240 > ScrW() then
if x < 0 or x + editorWidth > ScrW() then
x = 0
end

Expand All @@ -127,9 +129,9 @@ function pace.OpenEditor()
local mode = positionMode:GetInt()

if mode == 1 then
editor:SetPos(ScrW() / 2 - 120, 0)
editor:SetPos(ScrW() / 2 - editorWidth / 2, 0)
elseif mode == 2 then
editor:SetPos(ScrW() - 240, 0)
editor:SetPos(ScrW() - editorWidth, 0)
else
editor:SetPos(0, 0)
end
Expand Down
2 changes: 1 addition & 1 deletion lua/pac3/editor/client/settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ end

concommand.Add("pace_settings", function()
pace.OpenSettings()
end)
end, nil, "Open pac3 settings menu (wear whitelist/blacklist)")
10 changes: 8 additions & 2 deletions lua/pac3/editor/client/wear_filter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -326,16 +326,19 @@ function pace.FillWearSettings(pnl)
mode.form:Remove()
end

-- create form based on selection
if value == "steam friends" then
mode.form = generic_form(L"Only your steam friends can see your worn outfit.")
elseif value == "whitelist" then
mode.form = player_list_form(L"whitelist", "wear_whitelist", L"Only the players in the whitelist can see your worn outfit.")
elseif value == "blacklist" then
mode.form = player_list_form( L"blacklist", "wear_blacklist", L"The players in the blacklist cannot see your worn outfit.")
elseif value == "disabled" then
else -- make sure we stay as one of these options
value = "disabled"
mode.form = generic_form(L"Everyone can see your worn outfit.")
end

-- and set cvar to update filter
GetConVar("pace_wear_filter_mode"):SetString(value:gsub(" ", "_"))

mode.form:SetParent(list)
Expand Down Expand Up @@ -366,16 +369,19 @@ function pace.FillWearSettings(pnl)
mode.form:Remove()
end

-- create form based on selection
if value == "steam friends" then
mode.form = generic_form(L"You will only see outfits from your steam friends.")
elseif value == "whitelist" then
mode.form = player_list_form(L"whitelist", "outfit_whitelist", L"You will only see outfits from the players in the whitelist.")
elseif value == "blacklist" then
mode.form = player_list_form(L"blacklist", "outfit_blacklist", L"You will see outfits from everyone except the players in the blacklist.")
elseif value == "disabled" then
else -- make sure we stay as one of these options
value = "disabled"
mode.form = generic_form(L"You will see everyone's outfits.")
end

-- and set cvar to update filter
GetConVar("pace_outfit_filter_mode"):SetString(value:gsub(" ", "_"))

mode.form:SetParent(list)
Expand Down
Loading