From b1c4e29ac8ca8f8945cc5105d3e09d2c5cbfede2 Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Sun, 15 Mar 2015 23:59:48 +0000 Subject: [PATCH] Fixes inconsistencies in spelling of colour/color by preferring "color" (only wxWidgets remains with some API that requires "colour"), fixes #1029. NOTE: requires update-workspaces and may require correction of some modded actors/scenarios This was SVN commit r16438. --- binaries/data/config/default.cfg | 2 +- .../mods/_test.minimal/shaders/water_high.fs | 2 +- .../data/mods/mod/gui/common/modern/setup.xml | 2 +- .../mods/mod/gui/common/modern/styles.xml | 2 +- .../data/mods/public/art/actors/actor.rnc | 2 +- .../data/mods/public/art/actors/actor.rng | 2 +- .../public/art/actors/props/units/cape_hd.xml | 6 +- .../art/actors/props/units/cape_hd_black.xml | 6 +- .../props/units/heads/celt_vercingentorix.xml | 2 +- .../actors/props/units/heads/dudette_head.xml | 10 +-- .../props/units/heads/head_alexander.xml | 2 +- .../props/units/heads/head_britomartus.xml | 2 +- .../actors/props/units/heads/head_caradoc.xml | 2 +- .../actors/props/units/heads/head_celt.xml | 10 +-- .../actors/props/units/heads/head_celt_2.xml | 10 +-- .../props/units/heads/head_celt_boudicca.xml | 2 +- .../props/units/heads/head_celt_brennus.xml | 2 +- .../props/units/heads/head_cunobelin.xml | 2 +- .../props/units/heads/head_female_celt.xml | 6 +- .../actors/props/units/heads/head_hele_a.xml | 8 +-- .../actors/props/units/heads/head_hele_b.xml | 12 ++-- .../actors/props/units/heads/head_hele_e.xml | 8 +-- .../actors/props/units/heads/head_hele_h.xml | 8 +-- .../props/units/heads/head_iber_healer.xml | 2 +- .../props/units/heads/head_kart_fem_1.xml | 2 +- .../props/units/heads/head_kart_priestess.xml | 2 +- .../actors/props/units/heads/head_lime.xml | 10 +-- .../props/units/heads/head_maur_fem.xml | 2 +- .../props/units/heads/head_pers_fem_1.xml | 2 +- .../actors/props/units/heads/head_philip.xml | 2 +- .../props/units/heads/head_ptol_fem.xml | 2 +- .../actors/props/units/heads/head_spart_a.xml | 8 +-- .../actors/props/units/heads/head_spart_e.xml | 8 +-- .../units/heads/rome_head_hero_scipio.xml | 2 +- .../props/units/heads/rome_head_veteran.xml | 12 ++-- .../units/heads/rome_head_veteran_cin.xml | 12 ++-- .../art/actors/props/units/heads/thrac_a.xml | 6 +- .../art/actors/special/pers_ishtar_gate.xml | 2 +- .../units/athenians/cavalry_javelinist_a.xml | 22 +++---- .../units/athenians/cavalry_javelinist_e.xml | 22 +++---- .../units/athenians/cavalry_swordsman_a.xml | 12 ++-- .../units/athenians/cavalry_swordsman_b.xml | 8 +-- .../units/athenians/cavalry_swordsman_e.xml | 12 ++-- .../art/actors/units/athenians/trader_h.xml | 14 ++-- .../carthaginians/cavalry_javelinist_a.xml | 6 +- .../carthaginians/cavalry_javelinist_b.xml | 6 +- .../carthaginians/cavalry_javelinist_e.xml | 6 +- .../carthaginians/cavalry_spearman_a.xml | 8 +-- .../carthaginians/cavalry_spearman_b.xml | 8 +-- .../carthaginians/cavalry_spearman_e.xml | 8 +-- .../carthaginians/cavalry_swordsman_a.xml | 6 +- .../carthaginians/cavalry_swordsman_b.xml | 6 +- .../carthaginians/cavalry_swordsman_e.xml | 6 +- .../units/celts/cavalry_javelinist_a.xml | 12 ++-- .../units/celts/cavalry_javelinist_b.xml | 12 ++-- .../units/celts/cavalry_javelinist_e.xml | 12 ++-- .../actors/units/celts/cavalry_spearman_a.xml | 6 +- .../actors/units/celts/cavalry_spearman_b.xml | 6 +- .../actors/units/celts/cavalry_spearman_e.xml | 6 +- .../units/celts/cavalry_swordsman_a.xml | 12 ++-- .../units/celts/cavalry_swordsman_b.xml | 12 ++-- .../units/celts/cavalry_swordsman_e.xml | 12 ++-- .../actors/units/celts/champion_unit_2.xml | 12 ++-- .../actors/units/celts/champion_unit_4_h.xml | 12 ++-- .../actors/units/celts/champion_unit_4_h2.xml | 12 ++-- .../actors/units/celts/cunobelin_horse.xml | 2 +- .../units/celts/vercingetorix_horse.xml | 2 +- .../art/actors/units/hellenes/alexander.xml | 2 +- .../units/hellenes/cavalry_javelinist_a.xml | 22 +++---- .../units/hellenes/cavalry_javelinist_e.xml | 22 +++---- .../units/hellenes/cavalry_swordsman_a.xml | 12 ++-- .../units/hellenes/cavalry_swordsman_b.xml | 8 +-- .../units/hellenes/cavalry_swordsman_e.xml | 12 ++-- .../actors/units/hellenes/champion_unit_4.xml | 16 ++--- .../art/actors/units/hellenes/trader_h.xml | 14 ++-- .../units/iberians/cavalry_javelinist_a.xml | 8 +-- .../units/iberians/cavalry_javelinist_b.xml | 8 +-- .../units/iberians/cavalry_javelinist_e.xml | 8 +-- .../units/iberians/cavalry_spearman_a.xml | 8 +-- .../units/iberians/cavalry_spearman_b.xml | 8 +-- .../units/iberians/cavalry_spearman_e.xml | 8 +-- .../actors/units/iberians/champion_unit_2.xml | 10 +-- .../units/iberians/hero_indibil_horse.xml | 10 +-- .../actors/units/macedonians/alexander.xml | 2 +- .../macedonians/cavalry_javelinist_a.xml | 22 +++---- .../macedonians/cavalry_javelinist_e.xml | 22 +++---- .../units/macedonians/cavalry_spearman_a.xml | 22 +++---- .../units/macedonians/cavalry_spearman_e.xml | 22 +++---- .../units/macedonians/champion_cavalry.xml | 16 ++--- .../units/macedonians/pyrrhus_horse.xml | 2 +- .../units/mauryans/cavalry_javelinist_a.xml | 8 +-- .../units/mauryans/cavalry_javelinist_b.xml | 8 +-- .../units/mauryans/cavalry_javelinist_e.xml | 8 +-- .../units/mauryans/cavalry_swordsman_a.xml | 8 +-- .../units/mauryans/cavalry_swordsman_b.xml | 8 +-- .../units/mauryans/cavalry_swordsman_e.xml | 8 +-- .../units/persians/cavalry_javelinist_a.xml | 8 +-- .../units/persians/cavalry_javelinist_b.xml | 8 +-- .../units/persians/cavalry_javelinist_e.xml | 8 +-- .../units/persians/cavalry_spearman_a.xml | 8 +-- .../units/persians/cavalry_spearman_b.xml | 8 +-- .../units/persians/cavalry_spearman_e.xml | 8 +-- .../units/persians/cavalry_swordsman_a.xml | 8 +-- .../units/persians/cavalry_swordsman_b.xml | 8 +-- .../units/persians/cavalry_swordsman_e.xml | 8 +-- .../actors/units/persians/champion_unit_2.xml | 8 +-- .../units/persians/champion_unit_2_archer.xml | 8 +-- .../persians/pers_chariot_archer_a_h1.xml | 8 +-- .../persians/pers_chariot_archer_a_h2.xml | 6 +- .../persians/pers_chariot_archer_a_h3.xml | 10 +-- .../persians/pers_chariot_archer_a_h4.xml | 6 +- .../persians/pers_chariot_archer_b_h1.xml | 8 +-- .../persians/pers_chariot_archer_b_h2.xml | 6 +- .../persians/pers_chariot_archer_e_h1.xml | 8 +-- .../persians/pers_chariot_archer_e_h2.xml | 6 +- .../persians/pers_chariot_archer_e_h3.xml | 10 +-- .../persians/pers_chariot_archer_e_h4.xml | 6 +- .../units/ptolemies/cavalry_spearman_a.xml | 22 +++---- .../units/ptolemies/cavalry_spearman_e.xml | 22 +++---- .../units/ptolemies/champion_cavalry.xml | 22 +++---- .../units/romans/cavalry_javelinist_a.xml | 22 +++---- .../units/romans/cavalry_javelinist_e.xml | 22 +++---- .../units/romans/cavalry_spearman_a.xml | 6 +- .../units/romans/cavalry_spearman_b.xml | 6 +- .../units/romans/cavalry_spearman_e.xml | 6 +- .../actors/units/romans/champion_unit_2.xml | 8 +-- .../art/actors/units/romans/trader_h.xml | 14 ++-- .../units/seleucids/cavalry_archer_a.xml | 8 +-- .../units/seleucids/cavalry_archer_b.xml | 8 +-- .../units/seleucids/cavalry_archer_e.xml | 8 +-- .../units/spartans/cavalry_javelinist_a.xml | 22 +++---- .../units/spartans/cavalry_javelinist_e.xml | 22 +++---- .../units/spartans/cavalry_spearman_a.xml | 22 +++---- .../units/spartans/cavalry_spearman_e.xml | 22 +++---- .../art/actors/units/spartans/trader_h.xml | 14 ++-- .../materials/alphatest_ao_parallax_spec.xml | 6 +- .../public/art/materials/basic_specmap.xml | 4 +- .../art/materials/rock_bump_spec_ao_test.xml | 6 +- .../art/materials/rock_bump_spec_test.xml | 6 +- .../data/mods/public/gui/common/colorFades.js | 2 +- .../data/mods/public/gui/common/global.xml | 4 +- .../mods/public/gui/gamesetup/gamesetup.js | 10 +-- .../mods/public/gui/gamesetup/gamesetup.xml | 2 +- binaries/data/mods/public/gui/session/menu.js | 4 +- .../public/gui/session/selection_details.js | 2 +- .../public/gui/session/selection_panels.js | 6 +- .../selection_panels_left/barter_panel.xml | 2 +- .../construction_panel.xml | 2 +- .../selection_panels_right/gate_panel.xml | 2 +- .../selection_panels_right/research_panel.xml | 2 +- .../selection_panels_right/training_panel.xml | 2 +- .../data/mods/public/gui/session/session.js | 2 +- .../mods/public/gui/session/unit_commands.js | 2 +- .../public/gui/session/utility_functions.js | 8 +-- .../data/mods/public/gui/summary/summary.js | 26 ++++---- .../data/mods/public/gui/summary/summary.xml | 4 +- .../mods/public/maps/random/aegean_sea.js | 4 +- .../mods/public/maps/random/alpine_lakes.js | 2 +- .../mods/public/maps/random/alpine_valley.js | 2 +- .../public/maps/random/ardennes_forest.js | 4 +- .../maps/random/cantabrian_highlands.js | 2 +- .../public/maps/random/corinthian_isthmus.js | 6 +- .../data/mods/public/maps/random/corsica.js | 8 +-- .../maps/random/cycladic_archipelago.js | 2 +- .../public/maps/random/english_channel.js | 2 +- .../data/mods/public/maps/random/fortress.js | 2 +- .../public/maps/random/guadalquivir_river.js | 2 +- .../public/maps/random/gulf_of_bothnia.js | 2 +- .../public/maps/random/hyrcanian_shores.js | 2 +- .../data/mods/public/maps/random/kerala.js | 4 +- .../data/mods/public/maps/random/latium.js | 2 +- .../mods/public/maps/random/lorraine_plain.js | 2 +- .../maps/random/neareastern_badlands.js | 2 +- .../public/maps/random/northern_lights.js | 4 +- .../data/mods/public/maps/random/oasis.js | 8 +-- .../public/maps/random/persian_highlands.js | 4 +- .../public/maps/random/pheonician_levant.js | 8 +-- .../public/maps/random/pyrenean_sierra.js | 14 ++-- .../public/maps/random/rhine_marshlands.js | 2 +- .../public/maps/random/rmgen/environment.js | 24 +++---- .../mods/public/maps/random/rmgen/mapgen.js | 8 +-- .../public/maps/random/rmgen/randombiome.js | 26 ++++---- .../mods/public/maps/random/saharan_oases.js | 4 +- .../data/mods/public/maps/random/sahel.js | 4 +- .../maps/random/sahel_watering_holes.js | 2 +- .../mods/public/maps/random/schwarzwald.js | 2 +- .../random/survivalofthefittest_triggers.js | 2 +- .../data/mods/public/maps/random/syria.js | 4 +- .../data/mods/public/maps/random/the_nile.js | 4 +- .../data/mods/public/maps/random/wall_demo.js | 6 +- binaries/data/mods/public/maps/scenario.rnc | 18 +++--- binaries/data/mods/public/maps/scenario.rng | 28 ++++---- .../mods/public/maps/scenarios/Arcadia.xml | 4 +- .../public/maps/scenarios/Azure Coast(2).xml | 4 +- .../public/maps/scenarios/Azure Coast(4).xml | 4 +- .../public/maps/scenarios/Azure Coast.xml | 4 +- .../maps/scenarios/Battle for the Tiber.xml | 4 +- .../maps/scenarios/Belgian_Bog_night.xml | 4 +- .../public/maps/scenarios/Bridge_demo.xml | 4 +- .../Campaign Test Map 2 - heightmap.xml | 4 +- .../maps/scenarios/Campaign Test Map.xml | 4 +- .../public/maps/scenarios/Combat_demo.xml | 4 +- .../maps/scenarios/Combat_demo_(huge).xml | 4 +- .../Death Canyon - Invasion Force.xml | 4 +- .../public/maps/scenarios/Demo_Trading.xml | 4 +- .../public/maps/scenarios/Eire and Albion.xml | 4 +- .../mods/public/maps/scenarios/Fast Oasis.xml | 4 +- .../public/maps/scenarios/Fishing_demo.xml | 4 +- .../public/maps/scenarios/Flight_demo.xml | 4 +- .../public/maps/scenarios/Flight_demo_2.xml | 4 +- .../mods/public/maps/scenarios/Gold_Rush.xml | 4 +- .../data/mods/public/maps/scenarios/Gorge.xml | 4 +- .../Height Map Import - Demo (Fractal).xml | 4 +- .../Height Map Import - Demo (Greece).xml | 4 +- ...eight Map Import - Demo (Greece-Small).xml | 4 +- .../maps/scenarios/Introductory Tutorial.xml | 4 +- .../mods/public/maps/scenarios/Laconia 01.xml | 4 +- .../mods/public/maps/scenarios/Migration.xml | 4 +- .../mods/public/maps/scenarios/Miletus.xml | 4 +- .../maps/scenarios/Multiplayer_demo.xml | 4 +- .../mods/public/maps/scenarios/Necropolis.xml | 4 +- .../maps/scenarios/Pathfinding_demo.xml | 4 +- .../scenarios/Pathfinding_terrain_demo.xml | 4 +- .../public/maps/scenarios/Peloponnese.xml | 4 +- .../mods/public/maps/scenarios/Polynesia.xml | 4 +- .../public/maps/scenarios/Resource_demo.xml | 4 +- .../public/maps/scenarios/Saharan Oases.xml | 4 +- .../data/mods/public/maps/scenarios/Sahel.xml | 4 +- .../maps/scenarios/Sandbox - Athenians.xml | 4 +- .../maps/scenarios/Sandbox - Britons.xml | 4 +- .../scenarios/Sandbox - Carthaginians.xml | 4 +- .../public/maps/scenarios/Sandbox - Gauls.xml | 4 +- .../maps/scenarios/Sandbox - Iberians.xml | 4 +- .../maps/scenarios/Sandbox - Macedonians.xml | 4 +- .../maps/scenarios/Sandbox - Mauryans.xml | 4 +- .../maps/scenarios/Sandbox - Persians.xml | 4 +- .../maps/scenarios/Sandbox - Ptolemies 2.xml | 4 +- .../maps/scenarios/Sandbox - Ptolemies.xml | 4 +- .../maps/scenarios/Sandbox - Romans.xml | 4 +- .../maps/scenarios/Sandbox - Seleucids.xml | 4 +- .../maps/scenarios/Sandbox - Spartans.xml | 4 +- .../public/maps/scenarios/Savanna Ravine.xml | 4 +- .../mods/public/maps/scenarios/Serengeti.xml | 4 +- .../public/maps/scenarios/Ship Formations.xml | 4 +- .../public/maps/scenarios/Sicilia_Nomad.xml | 4 +- .../mods/public/maps/scenarios/Siwa Oasis.xml | 4 +- .../public/maps/scenarios/Territory Demo.xml | 4 +- .../maps/scenarios/The Massacre of Delphi.xml | 4 +- .../maps/scenarios/The Persian Gates.xml | 4 +- .../maps/scenarios/Third Macedonian War.xml | 4 +- .../maps/scenarios/Treasure Islands.xml | 4 +- .../public/maps/scenarios/Triggers_demo.xml | 4 +- .../public/maps/scenarios/Tropical Island.xml | 4 +- .../mods/public/maps/scenarios/Units_demo.xml | 4 +- .../mods/public/maps/scenarios/WallTest.xml | 4 +- .../data/mods/public/maps/scenarios/Walls.xml | 4 +- .../public/maps/scenarios/We are Legion.xml | 4 +- .../mods/public/maps/scenarios/_default.xml | 4 +- .../mods/public/maps/scenarios/reservoir.xml | 4 +- .../mods/public/maps/scenarios/road demo.xml | 4 +- .../public/maps/scenarios/shipattacks.xml | 4 +- .../starting_economy_walkthrough.xml | 4 +- .../public/maps/scenarios/temperate map.xml | 4 +- .../maps/skirmishes/Acropolis Bay (2).xml | 4 +- .../maps/skirmishes/Alpine_Valleys_(2).xml | 4 +- .../public/maps/skirmishes/Bactria (2).xml | 4 +- .../public/maps/skirmishes/Barcania (3).xml | 4 +- .../maps/skirmishes/Belgian Bog (2).xml | 4 +- .../maps/skirmishes/Caspian Sea (2v2).xml | 4 +- .../skirmishes/Corinthian Isthmus (2).xml | 4 +- .../skirmishes/Corinthian Isthmus (4).xml | 4 +- .../skirmishes/Corsica and Sardinia (4).xml | 4 +- .../skirmishes/Cycladic Archipelago (2).xml | 4 +- .../skirmishes/Cycladic Archipelago (3).xml | 4 +- .../maps/skirmishes/Death Canyon (2).xml | 4 +- .../maps/skirmishes/Deccan Plateau (2).xml | 4 +- .../maps/skirmishes/Gallic Fields (3).xml | 4 +- .../maps/skirmishes/Gambia River (3).xml | 4 +- .../maps/skirmishes/Golden Oasis (2).xml | 4 +- .../maps/skirmishes/Greek Acropolis (2).xml | 4 +- .../maps/skirmishes/Greek Acropolis (4).xml | 4 +- .../skirmishes/Greek Acropolis Night (2).xml | 4 +- .../maps/skirmishes/Libyan Oases (4).xml | 4 +- .../maps/skirmishes/Libyan Oasis (2).xml | 4 +- .../maps/skirmishes/Lorraine Plain (2).xml | 4 +- .../maps/skirmishes/Median Oasis (2).xml | 4 +- .../maps/skirmishes/Median Oasis (4).xml | 4 +- .../skirmishes/Mediterranean Cove (2).xml | 4 +- .../skirmishes/Neareastern Badlands (2).xml | 4 +- .../skirmishes/Neareastern Badlands (4).xml | 4 +- .../public/maps/skirmishes/Nile River (4).xml | 4 +- .../maps/skirmishes/Persian Highlands (4).xml | 4 +- .../public/maps/skirmishes/Punbjab (2).xml | 4 +- .../maps/skirmishes/Saharan Oases (4).xml | 4 +- .../mods/public/maps/skirmishes/Sahel (4).xml | 4 +- .../public/maps/skirmishes/Savanna River.xml | 4 +- .../public/maps/skirmishes/Sicilia (2).xml | 4 +- .../public/maps/skirmishes/Siwa Oasis (2).xml | 4 +- .../public/maps/skirmishes/Skirmish Demo.xml | 4 +- .../maps/skirmishes/Sporades Islands (2).xml | 4 +- .../mods/public/maps/skirmishes/Syria (2).xml | 4 +- .../maps/skirmishes/Team Oasis - 2v2.xml | 4 +- .../maps/skirmishes/Thessalian Plains (4).xml | 4 +- .../maps/skirmishes/Tuscan Acropolis (4).xml | 4 +- .../public/maps/skirmishes/Two Seas (6).xml | 4 +- .../maps/skirmishes/Watering Holes (4).xml | 4 +- .../maps/skirmishes/Zagros Mountains (2).xml | 4 +- .../mods/public/shaders/arb/model_common.vp | 2 +- .../mods/public/shaders/arb/terrain_common.fp | 2 +- .../mods/public/shaders/arb/terrain_common.vp | 2 +- .../data/mods/public/shaders/glsl/bloom.fs | 12 ++-- binaries/data/mods/public/shaders/glsl/dof.fs | 12 ++-- binaries/data/mods/public/shaders/glsl/hdr.fs | 18 +++--- .../mods/public/shaders/glsl/model_water.fs | 4 +- .../mods/public/shaders/glsl/water_high.fs | 16 ++--- .../simulation/components/GuiInterface.js | 26 ++++---- .../public/simulation/components/Player.js | 10 +-- .../components/tests/test_GuiInterface.js | 12 ++-- .../simulation/data/player_defaults.json | 18 +++--- .../public/simulation/helpers/Commands.js | 2 +- .../mods/public/simulation/helpers/Player.js | 4 +- .../simulation/templates/other/bench.xml | 2 +- .../simulation/templates/other/fence_long.xml | 2 +- .../templates/other/fence_short.xml | 2 +- .../templates/other/table_rectangle.xml | 2 +- .../templates/other/table_square.xml | 2 +- .../template_gaia_flora_bush_berry.xml | 2 +- .../templates/template_gaia_flora_tree.xml | 2 +- .../templates/template_gaia_geo_mineral.xml | 2 +- .../templates/template_gaia_geo_rock.xml | 2 +- .../templates/template_gaia_ruins.xml | 2 +- .../templates/template_gaia_treasure.xml | 2 +- .../templates/template_structure.xml | 4 +- .../template_structure_resource_field.xml | 2 +- .../templates/template_unit_fauna.xml | 2 +- build/premake/premake4.lua | 2 +- source/graphics/GameView.cpp | 2 +- source/graphics/LOSTexture.cpp | 2 +- source/graphics/MapReader.cpp | 34 +++++----- source/graphics/MapWriter.cpp | 10 +-- source/graphics/Model.cpp | 6 +- source/graphics/Model.h | 2 +- source/graphics/ModelAbstract.h | 2 +- source/graphics/ObjectBase.cpp | 4 +- source/graphics/ObjectEntry.cpp | 2 +- source/graphics/ObjectEntry.h | 6 +- source/graphics/ParticleEmitter.cpp | 2 +- source/graphics/Terrain.cpp | 2 +- source/graphics/Terrain.h | 12 ++-- source/graphics/TerrainTextureEntry.cpp | 6 +- source/graphics/TerritoryTexture.cpp | 2 +- source/graphics/TextureConverter.h | 2 +- source/graphics/TextureManager.cpp | 10 +-- source/graphics/TextureManager.h | 4 +- source/gui/CGUISprite.h | 2 +- source/gui/GUIRenderer.cpp | 10 +-- .../gui/scripting/JSInterface_IGUIObject.cpp | 12 ++-- source/lib/res/graphics/ogl_tex.cpp | 6 +- source/lib/res/graphics/ogl_tex.h | 4 +- source/lib/sysdep/os/win/wcursor.cpp | 6 +- source/lib/tex/tex.cpp | 4 +- source/lib/tex/tex.h | 2 +- source/lib/tex/tex_bmp.cpp | 2 +- source/lib/tex/tex_png.cpp | 20 +++--- source/lib/tex/tex_tga.cpp | 26 ++++---- source/ps/CConsole.cpp | 2 +- source/ps/Game.cpp | 16 ++--- source/ps/Game.h | 12 ++-- source/renderer/OverlayRenderer.cpp | 2 +- source/renderer/PostprocManager.cpp | 22 +++---- source/renderer/PostprocManager.h | 6 +- source/renderer/RenderModifiers.cpp | 2 +- source/renderer/Renderer.cpp | 4 +- source/renderer/SilhouetteRenderer.cpp | 2 +- source/renderer/TerrainOverlay.cpp | 16 ++--- source/renderer/TerrainOverlay.h | 12 ++-- source/renderer/TerrainRenderer.cpp | 2 +- source/simulation2/components/CCmpMinimap.cpp | 38 +++++------ .../components/CCmpObstructionManager.cpp | 12 ++-- .../components/CCmpRallyPointRenderer.cpp | 14 ++-- .../components/CCmpRangeManager.cpp | 16 ++--- .../simulation2/components/CCmpSelectable.cpp | 8 +-- .../components/CCmpTerritoryManager.cpp | 2 +- .../simulation2/components/CCmpUnitMotion.cpp | 8 +-- .../components/CCmpVisualActor.cpp | 4 +- source/simulation2/components/ICmpMinimap.h | 2 +- source/simulation2/components/ICmpPlayer.cpp | 4 +- source/simulation2/components/ICmpPlayer.h | 2 +- source/simulation2/components/ICmpVisual.cpp | 2 +- source/simulation2/components/ICmpVisual.h | 4 +- .../ActorEditor/ActorEditorListCtrl.cpp | 30 ++++----- .../AtlasUI/ActorEditor/ActorEditorListCtrl.h | 2 +- .../CustomControls/Buttons/ToolButton.cpp | 8 +-- .../ColorDialog.cpp} | 36 +++++------ .../ColorDialog.h} | 12 ++-- .../EditableListCtrl/EditableListCtrl.cpp | 6 +- .../EditableListCtrl/EditableListCtrl.h | 2 +- .../EditableListCtrl/FieldEditCtrl.cpp | 26 ++++---- .../EditableListCtrl/FieldEditCtrl.h | 2 +- .../AtlasUI/ScenarioEditor/ScenarioEditor.cpp | 2 +- .../AtlasUI/ScenarioEditor/SectionLayout.cpp | 2 +- .../Sections/Environment/Environment.cpp | 46 ++++++------- .../ScenarioEditor/Sections/Player/Player.cpp | 64 +++++++++---------- .../ScenarioEditor/Sections/Player/Player.h | 2 +- .../Sections/Terrain/Terrain.cpp | 6 +- .../tools/atlas/GameInterface/ActorViewer.cpp | 6 +- .../tools/atlas/GameInterface/ActorViewer.h | 2 +- source/tools/atlas/GameInterface/Brushes.cpp | 2 +- .../Handlers/EnvironmentHandlers.cpp | 44 ++++++------- .../GameInterface/Handlers/MapHandlers.cpp | 2 +- .../GameInterface/Handlers/ObjectHandlers.cpp | 16 ++--- source/tools/atlas/GameInterface/Messages.h | 20 +++--- .../tools/atlas/GameInterface/SharedTypes.h | 8 +-- source/tools/atlas/GameInterface/View.cpp | 6 +- source/tools/atlas/GameInterface/View.h | 4 +- 415 files changed, 1483 insertions(+), 1483 deletions(-) rename source/tools/atlas/AtlasUI/CustomControls/{ColourDialog/ColourDialog.cpp => ColorDialog/ColorDialog.cpp} (59%) rename source/tools/atlas/AtlasUI/CustomControls/{ColourDialog/ColourDialog.h => ColorDialog/ColorDialog.h} (71%) 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 @@