diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg index 9bffa328a7..d41e941502 100644 --- a/binaries/data/config/default.cfg +++ b/binaries/data/config/default.cfg @@ -125,7 +125,7 @@ materialmgr.PARALLAX_VHQ_DIST.max = 0 ; Replace alpha-blending with alpha-testing, for performance experiments forcealphatest = false -; Colour of the sky (in "r g b" format) +; Color of the sky (in "r g b" format) skycolor = "0 0 0" diff --git a/binaries/data/mods/_test.minimal/shaders/water_high.fs b/binaries/data/mods/_test.minimal/shaders/water_high.fs index 404b9a9cf5..0768ce3a44 100644 --- a/binaries/data/mods/_test.minimal/shaders/water_high.fs +++ b/binaries/data/mods/_test.minimal/shaders/water_high.fs @@ -9,7 +9,7 @@ uniform float shininess; // Blinn-Phong specular strength uniform float specularStrength; // Scaling for specular reflection (specular color is (this,this,this)) uniform float waviness; // "Wildness" of the reflections and refractions; choose based on texture uniform vec3 tint; // Tint for refraction (used to simulate particles in water) -uniform float murkiness; // Amount of tint to blend in with the refracted colour +uniform float murkiness; // Amount of tint to blend in with the refracted color uniform float fullDepth; // Depth at which to use full murkiness (shallower water will be clearer) uniform vec3 reflectionTint; // Tint for reflection (used for really muddy water) uniform float reflectionTintStrength; // Strength of reflection tint (how much of it to mix in) diff --git a/binaries/data/mods/mod/gui/common/modern/setup.xml b/binaries/data/mods/mod/gui/common/modern/setup.xml index 9a85f27316..26a3fcdcc0 100644 --- a/binaries/data/mods/mod/gui/common/modern/setup.xml +++ b/binaries/data/mods/mod/gui/common/modern/setup.xml @@ -27,7 +27,7 @@ font="sans-14" maxwidth="300" offset="16 32" - sprite="colour:255 255 255" + sprite="color:255 255 255" textcolor="0 0 0" /> @@ -34,7 +34,7 @@ diff --git a/binaries/data/mods/public/art/materials/basic_specmap.xml b/binaries/data/mods/public/art/materials/basic_specmap.xml index 42aecac661..58bb437cad 100644 --- a/binaries/data/mods/public/art/materials/basic_specmap.xml +++ b/binaries/data/mods/public/art/materials/basic_specmap.xml @@ -3,10 +3,10 @@ diff --git a/binaries/data/mods/public/art/materials/rock_bump_spec_ao_test.xml b/binaries/data/mods/public/art/materials/rock_bump_spec_ao_test.xml index d42e339541..472e52118f 100644 --- a/binaries/data/mods/public/art/materials/rock_bump_spec_ao_test.xml +++ b/binaries/data/mods/public/art/materials/rock_bump_spec_ao_test.xml @@ -17,10 +17,10 @@ EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. --> @@ -28,7 +28,7 @@ diff --git a/binaries/data/mods/public/art/materials/rock_bump_spec_test.xml b/binaries/data/mods/public/art/materials/rock_bump_spec_test.xml index c8a1c6887e..2fd2460161 100644 --- a/binaries/data/mods/public/art/materials/rock_bump_spec_test.xml +++ b/binaries/data/mods/public/art/materials/rock_bump_spec_test.xml @@ -17,10 +17,10 @@ EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. --> @@ -28,7 +28,7 @@ diff --git a/binaries/data/mods/public/gui/common/colorFades.js b/binaries/data/mods/public/gui/common/colorFades.js index f8fbe0704d..1dee321b31 100644 --- a/binaries/data/mods/public/gui/common/colorFades.js +++ b/binaries/data/mods/public/gui/common/colorFades.js @@ -82,7 +82,7 @@ function fadeColorTick(name) // set new color var rgb = data.rgb; - overlay.sprite="colour: " + rgb.r + " " + rgb.g + " " + rgb.b + " " + rgb.o; + overlay.sprite="color: " + rgb.r + " " + rgb.g + " " + rgb.b + " " + rgb.o; // recusive call, if duration is positive if (!data.stopFade && (data.justStopAtExternCall || data.duration - (data.tickInterval * data.tickCounter) > 0)) diff --git a/binaries/data/mods/public/gui/common/global.xml b/binaries/data/mods/public/gui/common/global.xml index 8d8eb84556..2f6aa18e87 100644 --- a/binaries/data/mods/public/gui/common/global.xml +++ b/binaries/data/mods/public/gui/common/global.xml @@ -23,7 +23,7 @@ ghost="true" hidden="true" hotkey="fps.toggle" - sprite="colour: 0 0 0 200" + sprite="color: 0 0 0 200" font="mono-stroke-10" textcolor="white" size="100%-80 70 100%-10 90" @@ -49,7 +49,7 @@ ghost="true" hidden="true" hotkey="realtime.toggle" - sprite="colour: 0 0 0 200" + sprite="color: 0 0 0 200" font="mono-stroke-10" textcolor="white" size="100%-80 100 100%-10 120" diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js index 1db051c58f..92970ae933 100644 --- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js +++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js @@ -1403,15 +1403,15 @@ function onGameAttributesChange() var pCivText = Engine.GetGUIObjectByName("playerCivText["+i+"]"); var pTeam = Engine.GetGUIObjectByName("playerTeam["+i+"]"); var pTeamText = Engine.GetGUIObjectByName("playerTeamText["+i+"]"); - var pColor = Engine.GetGUIObjectByName("playerColour["+i+"]"); + var pColor = Engine.GetGUIObjectByName("playerColor["+i+"]"); // Player data / defaults var pData = mapSettings.PlayerData ? mapSettings.PlayerData[i] : {}; var pDefs = g_DefaultPlayerData ? g_DefaultPlayerData[i] : {}; // Common to all game types - var color = rgbToGuiColor(getSetting(pData, pDefs, "Colour")); - pColor.sprite = "colour:" + color + " 100"; + var color = rgbToGuiColor(getSetting(pData, pDefs, "Color")); + pColor.sprite = "color:" + color + " 100"; pName.caption = translate(getSetting(pData, pDefs, "Name")); var team = getSetting(pData, pDefs, "Team"); @@ -1711,7 +1711,7 @@ function addChatMessage(msg) if (msg.guid && g_PlayerAssignments[msg.guid] && g_PlayerAssignments[msg.guid].player != -1) { - // Valid player who has been assigned - get player colour + // Valid player who has been assigned - get player color var player = g_PlayerAssignments[msg.guid].player - 1; var mapName = g_GameAttributes.map; var mapData = loadMapData(mapName); @@ -1719,7 +1719,7 @@ function addChatMessage(msg) var pData = mapSettings.PlayerData ? mapSettings.PlayerData[player] : {}; var pDefs = g_DefaultPlayerData ? g_DefaultPlayerData[player] : {}; - color = rgbToGuiColor(getSetting(pData, pDefs, "Colour")); + color = rgbToGuiColor(getSetting(pData, pDefs, "Color")); } var formatted; diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml index 709fccee29..10516642c5 100644 --- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml +++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml @@ -66,7 +66,7 @@