Skip to content

Commit

Permalink
some small tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Ruwetuin committed Sep 9, 2018
1 parent ab44235 commit 4978f13
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions commandlist.txt
Expand Up @@ -6,6 +6,7 @@ Widget dependent:
/loscolor "BA LOS colors" Use colors for line-of-sight and radar view.
/comranges_nearbyenemy "Comblast & Dgun Range" Always draw ranges or only when an enemy is near.
/stockpilecount "Stockpiler (dynamic)" usage: /stockpilecount 10 sets default stockpile amount
/chatbackground "Red Console (In-game chat only) Toggles a background behind the chat text"

Spring Engine commands:

Expand Down
6 changes: 3 additions & 3 deletions luaui/Widgets_BA/gui_changelog_info.lua
Expand Up @@ -165,15 +165,15 @@ function DrawSidebar(x,y,width,height)
local fontOffsetX = versionOffsetX

-- background
gl.Color(0.7,0.5,0.15,0.21)
gl.Color(0.7,0.5,0.15,0.14)
RectRound(x,y-height,x+width,y,2.5*widgetScale)

-- version links
versionQuickLinks = {}
if changelogFile then
font:Begin()
font:SetOutlineColor(0.25,0.2,0,0.3)
font:SetTextColor(0.92,0.72,0.15,1)
font:SetOutlineColor(0.2,0.17,0,0.33)
font:SetTextColor(0.8,0.65,0.15,1)
local lineKey = 1
local yOffset = 24
local j = 0
Expand Down
10 changes: 7 additions & 3 deletions luaui/Widgets_BA/gui_options.lua
Expand Up @@ -874,7 +874,7 @@ function widget:DrawScreen()
if options[i].description ~= nil then
description = options[i].description
glText('\255\235\200\125'..options[i].description, screenX+15, screenY-screenHeight+64.5, 16, "no")
glColor(0.6,0.47,0.28,0.32)
glColor(0.46,0.4,0.3,0.4)
glText('/option '..options[i].id, screenX+screenWidth*0.659, screenY-screenHeight+8, 14, "nr")
end
end
Expand Down Expand Up @@ -1878,7 +1878,7 @@ function init()
{id="outline_size", group="gfx", name=widgetOptionColor.." thickness", min=0.8, max=1.5, step=0.05, type="slider", value=1, description='Set the size of the outline'},

{id="xrayshader", group="gfx", widget="XrayShader", name="Unit xray shader", type="bool", value=GetWidgetToggleValue("XrayShader"), description='Highlights all units, highlight effect dissolves on close camera range.\n\nFades out and disables at low fps\nWorks less on dark teamcolors'},
{id="particles", group="gfx", name="Max particles", type="slider", min=5000, max=25000, step=500, value=tonumber(Spring.GetConfigInt("MaxParticles",1) or 10000), description='Particles used for explosions, smoke, fire and missiletrails\n\nSetting a low value will mean that various effects wont show properly'},
{id="particles", group="gfx", name="Max particles", type="slider", min=5000, max=25000, step=1000, value=tonumber(Spring.GetConfigInt("MaxParticles",1) or 10000), description='Particles used for explosions, smoke, fire and missiletrails\n\nSetting a low value will mean that various effects wont show properly'},
{id="nanoparticles", group="gfx", name="Max nano particles", type="slider", min=500, max=5000, step=100, value=tonumber(Spring.GetConfigInt("MaxNanoParticles",1) or 500), description='NOTE: Nano particles are more expensive regarding the CPU'},

{id="iconadjuster", group="gfx", name="Unit icon scale", min=0.8, max=1.2, step=0.05, type="slider", value=1, description='Sets radar/unit icon size\n\n(Used for unit icon distance and minimap icons)'},
Expand Down Expand Up @@ -1919,7 +1919,7 @@ function init()
{id="camera", group="control", name="Camera", type="select", options={'fps','overhead','spring','rot overhead','free'}, value=(tonumber((Spring.GetConfigInt("CamMode",1)+1) or 2))},
{id="camerashake", group="control", widget="CameraShake", name="Camera shake", type="bool", value=GetWidgetToggleValue("CameraShake"), description='Shakes camera on explosions'},
{id="camerasmoothness", group="control", name="Camera smoothing", type="slider", min=0, max=1, step=0.01, value=cameraTransitionTime, description="How smooth should the transitions between camera movement be?"},
{id="lockcamera_transitiontime", group="control", name="Tracking cam smoothing", type="slider", min=0.4, max=1.5, step=0.01, value=(WG['advplayerlist_api']~=nil and WG['advplayerlist_api'].GetLockTransitionTime()), description="When viewing a players camera...\nhow smooth should the transitions between camera movement be?"},
{id="lockcamera_transitiontime", group="control", name="Tracking cam smoothing", type="slider", min=0.4, max=1.5, step=0.01, value=(WG['advplayerlist_api']~=nil and WG['advplayerlist_api'].GetLockTransitionTime~=nil and WG['advplayerlist_api'].GetLockTransitionTime()), description="When viewing a players camera...\nhow smooth should the transitions between camera movement be?"},

{id="scrollspeed", group="control", name="Scroll zoom speed", type="slider", min=1, max=45, step=1, value=math.abs(tonumber(Spring.GetConfigInt("ScrollWheelSpeed",1) or 25)), description=''},
{id="scrollinverse", group="control", name="Scroll inversed", type="bool", value=(tonumber(Spring.GetConfigInt("ScrollWheelSpeed",1) or 25) < 0), description=""},
Expand Down Expand Up @@ -2176,6 +2176,10 @@ function init()
end


if WG['advplayerlist_api']==nil or WG['advplayerlist_api'].GetLockTransitionTime==nil then
options[getOptionByID('lockcamera_transitiontime')] = nil
end

-- disable options when widget isnt availible
if widgetHandler.knownWidgets["Outline"] == nil then
options[getOptionByID('outline')] = nil
Expand Down

0 comments on commit 4978f13

Please sign in to comment.