lp:~widelands-dev/widelands/market
Created by
SirVer
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- kaputtnik (community): Approve (testing)
- SirVer: Needs Resubmitting
- GunChleoc: Needs Fixing
-
Diff: 1038 lines (+562/-64)33 files modifieddata/tribes/barbarians.lua (+3/-0)
data/tribes/buildings/markets/barbarians/market/helptexts.lua (+28/-0)
data/tribes/buildings/markets/barbarians/market/init.lua (+56/-0)
data/tribes/init.lua (+7/-0)
data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua (+1/-0)
data/tribes/scripting/starting_conditions/barbarians/headquarters.lua (+1/-0)
data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua (+1/-0)
doc/sphinx/extract_rst.py (+2/-0)
regression_test.py (+1/-1)
src/logic/CMakeLists.txt (+2/-0)
src/logic/map_objects/map_object.cc (+2/-0)
src/logic/map_objects/map_object.h (+1/-0)
src/logic/map_objects/tribes/market.cc (+45/-0)
src/logic/map_objects/tribes/market.h (+51/-0)
src/logic/map_objects/tribes/productionsite.cc (+26/-23)
src/logic/map_objects/tribes/productionsite.h (+10/-1)
src/logic/map_objects/tribes/tribes.cc (+7/-0)
src/logic/map_objects/tribes/tribes.h (+4/-0)
src/scripting/lua_map.cc (+116/-26)
src/scripting/lua_map.h (+58/-0)
src/scripting/lua_root.cc (+31/-6)
src/scripting/lua_root.h (+7/-6)
src/website/map_object_info.cc (+3/-0)
src/wui/interactive_gamebase.cc (+1/-0)
test/maps/lua_testsuite.wmf/scripting/tribes_descriptions.lua (+1/-1)
test/maps/market_trading.wmf/elemental (+12/-0)
test/maps/market_trading.wmf/objective (+4/-0)
test/maps/market_trading.wmf/player_names (+16/-0)
test/maps/market_trading.wmf/player_position (+6/-0)
test/maps/market_trading.wmf/port_spaces (+7/-0)
test/maps/market_trading.wmf/scripting/init.lua (+28/-0)
test/maps/market_trading.wmf/scripting/test_market_can_be_build.lua (+13/-0)
test/maps/market_trading.wmf/version (+11/-0)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:widelands