lp:~widelands-dev/widelands/market1
Created by
SirVer
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- SirVer: Needs Resubmitting
- TiborB: Approve
-
Diff: 1398 lines (+786/-64)32 files modifieddata/tribes/buildings/markets/barbarians/market/init.lua (+1/-3)
src/economy/request.h (+2/-5)
src/economy/ware_instance.cc (+2/-1)
src/game_io/game_class_packet.cc (+2/-0)
src/logic/CMakeLists.txt (+7/-6)
src/logic/game.cc (+82/-0)
src/logic/game.h (+10/-0)
src/logic/map_objects/bob.cc (+4/-0)
src/logic/map_objects/bob.h (+1/-0)
src/logic/map_objects/tribes/market.cc (+222/-1)
src/logic/map_objects/tribes/market.h (+48/-1)
src/logic/map_objects/tribes/productionsite.cc (+5/-2)
src/logic/map_objects/tribes/productionsite.h (+0/-7)
src/logic/map_objects/tribes/tribes.cc (+1/-0)
src/logic/map_objects/tribes/tribes.h (+0/-1)
src/logic/map_objects/tribes/worker.cc (+83/-0)
src/logic/map_objects/tribes/worker.h (+5/-0)
src/logic/message.h (+2/-1)
src/logic/playercommand.cc (+93/-1)
src/logic/playercommand.h (+23/-0)
src/logic/queue_cmd_factory.cc (+2/-0)
src/logic/queue_cmd_ids.h (+2/-1)
src/logic/trade_agreement.h (+54/-0)
src/map_io/map_buildingdata_packet.cc (+1/-0)
src/scripting/lua_map.cc (+76/-27)
src/scripting/lua_map.h (+2/-0)
src/wui/game_message_menu.cc (+2/-0)
src/wui/ware_statistics_menu.cc (+1/-2)
src/wui/ware_statistics_menu.h (+0/-1)
test/maps/market_trading.wmf/scripting/init.lua (+12/-2)
test/maps/market_trading.wmf/scripting/test_market_can_be_built.lua (+2/-2)
test/maps/market_trading.wmf/scripting/test_simple_trade.lua (+39/-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