lp:~widelands-dev/widelands/unify-program-parsers
Created by
GunChleoc
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp:widelands
- Notabilis: Approve
-
Diff: 4800 lines (+1466/-1837)52 files modifieddata/tribes/immovables/shipconstruction_atlanteans/init.lua (+1/-1)
data/tribes/immovables/shipconstruction_barbarians/init.lua (+1/-1)
data/tribes/immovables/shipconstruction_empire/init.lua (+1/-1)
data/tribes/immovables/shipconstruction_frisians/init.lua (+1/-1)
data/tribes/workers/empire/stonemason/init.lua (+1/-1)
src/CMakeLists.txt (+0/-10)
src/editor/editorinteractive.cc (+1/-2)
src/editor/ui_menus/main_menu_new_map.cc (+1/-2)
src/editor/ui_menus/main_menu_random_map.cc (+1/-2)
src/helper.cc (+0/-55)
src/helper.h (+0/-44)
src/logic/editor_game_base.cc (+49/-55)
src/logic/editor_game_base.h (+2/-1)
src/logic/map_objects/CMakeLists.txt (+3/-1)
src/logic/map_objects/bob.cc (+3/-3)
src/logic/map_objects/bob.h (+5/-15)
src/logic/map_objects/immovable.cc (+15/-474)
src/logic/map_objects/immovable_program.cc (+344/-0)
src/logic/map_objects/immovable_program.h (+27/-39)
src/logic/map_objects/map_object.h (+1/-0)
src/logic/map_objects/map_object_program.cc (+125/-0)
src/logic/map_objects/map_object_program.h (+98/-0)
src/logic/map_objects/tribes/production_program.cc (+503/-790)
src/logic/map_objects/tribes/production_program.h (+34/-40)
src/logic/map_objects/tribes/productionsite.cc (+20/-4)
src/logic/map_objects/tribes/productionsite.h (+9/-0)
src/logic/map_objects/tribes/soldier.cc (+0/-1)
src/logic/map_objects/tribes/trainingsite.cc (+0/-1)
src/logic/map_objects/tribes/tribes.cc (+35/-10)
src/logic/map_objects/tribes/tribes.h (+1/-4)
src/logic/map_objects/tribes/worker.cc (+1/-2)
src/logic/map_objects/tribes/worker.h (+1/-1)
src/logic/map_objects/tribes/worker_descr.cc (+9/-10)
src/logic/map_objects/tribes/worker_program.cc (+151/-210)
src/logic/map_objects/tribes/worker_program.h (+3/-11)
src/logic/map_objects/world/critter.cc (+9/-15)
src/logic/map_objects/world/critter.h (+6/-3)
src/logic/map_objects/world/critter_program.h (+4/-11)
src/logic/map_objects/world/resource_description.cc (+0/-1)
src/network/CMakeLists.txt (+0/-1)
src/network/gameclient.cc (+0/-1)
src/network/gamehost.cc (+0/-1)
src/scripting/CMakeLists.txt (+0/-1)
src/scripting/lua_path.cc (+0/-1)
src/sound/CMakeLists.txt (+0/-1)
src/sound/fxset.cc (+0/-1)
src/sound/songset.cc (+0/-1)
src/ui_fsmenu/CMakeLists.txt (+0/-2)
src/ui_fsmenu/launch_spg.cc (+0/-1)
src/ui_fsmenu/options.cc (+0/-1)
src/wui/CMakeLists.txt (+0/-1)
src/wui/load_or_save_game.cc (+0/-2)
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