Public Git Hosting - 0ad.git/commit

commit	fce2f519d9585e1e8af485207dbb785ee16da8ac
author	elexis <elexis@3db68df2-c116-0410-a063-a993310a9797>
	Sat, 19 Nov 2016 14:29:45 +0000 (19 14:29 +0000)
committer	elexis <elexis@3db68df2-c116-0410-a063-a993310a9797>
	Sat, 19 Nov 2016 14:29:45 +0000 (19 14:29 +0000)
tree	657ddb46eca539bb6cd5c9a0b80817890a0e9e33	tree \| snapshot (tar.gz zip)
parent	cfbff38d59b0e4181a1679cbba75e53323ce59b3	commit \| diff

Merge resource agnostic branch by s0600204, fixes #3934.

Remove all occurances of hardcoded resources in the simulation, GUI and AI code by
specifying resources as JSON files in a new simulation subdirectory and
accessing them through a globally defined prototype.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@18964 3db68df2-c116-0410-a063-a993310a9797

60 files changed:

binaries/data/mods/public/globalscripts/Resources.js	[new file with mode: 0644]	blob
binaries/data/mods/public/globalscripts/Templates.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/common/functions_utility.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/common/l10n.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/common/tooltips.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/session/diplomacy_window.xml		diff \| blob \| blame \| history
binaries/data/mods/public/gui/session/menu.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/session/selection_details.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/session/selection_panels.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/session/selection_panels_helpers.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml		diff \| blob \| blame \| history
binaries/data/mods/public/gui/session/session.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/session/top_panel/resource_food.xml	[deleted file]	blob \| blame \| history
binaries/data/mods/public/gui/session/top_panel/resource_metal.xml	[deleted file]	blob \| blame \| history
binaries/data/mods/public/gui/session/top_panel/resource_population.xml		diff \| blob \| blame \| history
binaries/data/mods/public/gui/session/top_panel/resource_stone.xml	[deleted file]	blob \| blame \| history
binaries/data/mods/public/gui/session/top_panel/resource_wood.xml	[deleted file]	blob \| blame \| history
binaries/data/mods/public/gui/session/top_panel/resources.xml	[new file with mode: 0644]	blob
binaries/data/mods/public/gui/session/trade_window.xml		diff \| blob \| blame \| history
binaries/data/mods/public/gui/structree/draw.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/structree/helper.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/structree/load.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/structree/rows.xml		diff \| blob \| blame \| history
binaries/data/mods/public/gui/structree/structree.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/structree/structree.xml		diff \| blob \| blame \| history
binaries/data/mods/public/gui/summary/counters.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/summary/layout.js		diff \| blob \| blame \| history
binaries/data/mods/public/gui/summary/summary.js		diff \| blob \| blame \| history
binaries/data/mods/public/l10n/messages.json		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/ai/common-api/resources.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/ai/common-api/shared.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/ai/petra/baseManager.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/ai/petra/chatHelper.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/ai/petra/config.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/ai/petra/headquarters.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/ai/petra/queueManager.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/ai/petra/researchManager.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/Barter.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/Cost.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/GuiInterface.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/Loot.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/Looter.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/Player.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/ProductionQueue.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/ResourceDropsite.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/ResourceGatherer.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/ResourceSupply.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/ResourceTrickle.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/StatisticsTracker.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/Trader.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/Upgrade.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/components/tests/test_Player.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/data/resources/food.json	[new file with mode: 0644]	blob
binaries/data/mods/public/simulation/data/resources/metal.json	[new file with mode: 0644]	blob
binaries/data/mods/public/simulation/data/resources/stone.json	[new file with mode: 0644]	blob
binaries/data/mods/public/simulation/data/resources/wood.json	[new file with mode: 0644]	blob
binaries/data/mods/public/simulation/helpers/Cheat.js		diff \| blob \| blame \| history
binaries/data/mods/public/simulation/helpers/Resources.js	[new file with mode: 0644]	blob

A free, open-source game of ancient warfare

RSS Atom