lp://staging/~widelands-dev/widelands/overlapping_workareas
Created by
Benedikt Straub
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- GunChleoc: Approve
- Toni Förster: Approve
-
Diff: 761 lines (+347/-127)14 files modifiedsrc/graphic/color.cc (+7/-0)
src/graphic/color.h (+1/-0)
src/graphic/gl/workarea_program.cc (+38/-36)
src/logic/map.cc (+26/-0)
src/logic/map.h (+8/-0)
src/logic/map_objects/tribes/tribes.cc (+11/-1)
src/logic/map_objects/tribes/tribes.h (+4/-0)
src/logic/map_objects/tribes/workarea_info.h (+27/-0)
src/logic/widelands_geometry.h (+1/-4)
src/wui/actionconfirm.cc (+1/-1)
src/wui/buildingwindow.cc (+1/-1)
src/wui/fieldaction.cc (+92/-5)
src/wui/interactive_base.cc (+115/-74)
src/wui/interactive_base.h (+15/-5)
Related bugs
Related blueprints
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://staging/widelands