lp:~widelands-dev/widelands/storages_garrisons
Created by
cghislai
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp:widelands
- SirVer: Needs Fixing
-
Diff: 11158 lines (+5369/-2734) (has conflicts)103 files modifiedglobal/militarysites/barracks.empire/conf (+4/-2)
global/militarysites/barrier.barbarians/conf (+5/-3)
global/militarysites/barrier.empire/conf (+5/-3)
global/militarysites/castle.atlanteans/conf (+4/-2)
global/militarysites/castle.empire/conf (+5/-3)
global/militarysites/citadel.barbarians/conf (+5/-3)
global/militarysites/donjon.barbarians/conf (+5/-3)
global/militarysites/fortress.barbarians/conf (+5/-3)
global/militarysites/fortress.empire/conf (+5/-3)
global/militarysites/guardhall.atlanteans/conf (+4/-2)
global/militarysites/guardhouse.atlanteans/conf (+3/-1)
global/militarysites/high_tower.atlanteans/conf (+5/-3)
global/militarysites/outpost.empire/conf (+5/-3)
global/militarysites/sentry.barbarians/conf (+4/-2)
global/militarysites/sentry.empire/conf (+4/-2)
global/militarysites/small_tower.atlanteans/conf (+5/-3)
global/militarysites/stronghold.barbarians/conf (+5/-3)
global/militarysites/tower.atlanteans/conf (+6/-4)
global/militarysites/tower.empire/conf (+5/-4)
src/ai/defaultai.cc (+43/-56)
src/ai/defaultai.h (+1/-1)
src/economy/economy.cc (+69/-70)
src/economy/economy.h (+11/-8)
src/economy/idleworkersupply.cc (+3/-3)
src/economy/idleworkersupply.h (+3/-1)
src/economy/portdock.cc (+2/-2)
src/economy/request.cc (+21/-9)
src/economy/request.h (+10/-3)
src/economy/supply.h (+4/-2)
src/economy/transfer.cc (+1/-0)
src/economy/ware_instance.cc (+11/-11)
src/economy/warehousesupply.h (+0/-76)
src/logic/attackable.h (+0/-84)
src/logic/building.h (+3/-0)
src/logic/findimmovable.cc (+2/-2)
src/logic/game.cc (+2/-1)
src/logic/game.h (+2/-1)
src/logic/garrison.h (+227/-0)
src/logic/garrisonhandler.cc (+925/-0)
src/logic/garrisonhandler.h (+262/-0)
src/logic/item_ware_descr.h (+2/-2)
src/logic/militarysite.cc (+159/-173)
src/logic/militarysite.h (+14/-96)
src/logic/player.cc (+24/-21)
src/logic/player.h (+1/-1)
src/logic/playercommand.cc (+29/-29)
src/logic/playercommand.h (+9/-8)
src/logic/production_program.cc (+12/-5)
src/logic/productionsite.cc (+1/-1)
src/logic/soldier.cc (+35/-20)
src/logic/soldiercontrol.h (+0/-119)
src/logic/storage.h (+195/-0)
src/logic/storagehandler.cc (+1127/-0)
src/logic/storagehandler.h (+247/-0)
src/logic/trainingsite.cc (+97/-220)
src/logic/trainingsite.h (+14/-36)
src/logic/warehouse.cc (+111/-459)
src/logic/warehouse.h (+19/-115)
src/logic/worker.cc (+19/-19)
src/logic/worker.h (+3/-0)
src/map_io/widelands_map_buildingdata_data_packet.cc (+750/-561)
src/map_io/widelands_map_buildingdata_data_packet.h (+18/-0)
src/scripting/lua_game.cc (+13/-18)
src/scripting/lua_map.cc (+219/-72)
src/scripting/lua_map.h (+73/-15)
src/wui/attack_box.h (+0/-1)
src/wui/buildingwindow.cc (+4/-4)
src/wui/fieldaction.cc (+3/-4)
src/wui/garrisonpanel.cc (+137/-0)
src/wui/garrisonpanel.h (+65/-0)
src/wui/military_box.h (+0/-1)
src/wui/militarysitewindow.cc (+4/-2)
src/wui/soldiercapacitycontrol.cc (+10/-40)
src/wui/soldiercapacitycontrol.h (+35/-11)
src/wui/soldierlist.cc (+14/-212)
src/wui/soldierlist.h (+70/-10)
src/wui/stock_menu.cc (+11/-14)
src/wui/trainingsitewindow.cc (+4/-6)
src/wui/warehousewindow.cc (+23/-8)
tribes/atlanteans/castle/conf (+3/-1)
tribes/atlanteans/guardhall/conf (+3/-1)
tribes/atlanteans/guardhouse/conf (+2/-0)
tribes/atlanteans/headquarters/conf (+4/-0)
tribes/atlanteans/high_tower/conf (+6/-4)
tribes/atlanteans/small_tower/conf (+3/-1)
tribes/atlanteans/tower/conf (+5/-3)
tribes/barbarians/barrier/conf (+4/-2)
tribes/barbarians/citadel/conf (+5/-3)
tribes/barbarians/donjon/conf (+5/-3)
tribes/barbarians/fortress/conf (+5/-3)
tribes/barbarians/headquarters/conf (+5/-1)
tribes/barbarians/headquarters_interim/conf (+5/-1)
tribes/barbarians/sentry/conf (+3/-1)
tribes/barbarians/stronghold/conf (+6/-4)
tribes/empire/barracks/conf (+4/-2)
tribes/empire/barrier/conf (+5/-3)
tribes/empire/castle/conf (+5/-3)
tribes/empire/fortress/conf (+5/-3)
tribes/empire/headquarters/conf (+5/-1)
tribes/empire/headquarters_shipwreck/conf (+5/-1)
tribes/empire/outpost/conf (+5/-3)
tribes/empire/sentry/conf (+4/-2)
tribes/empire/tower/conf (+5/-3)
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