← Back to branch summary

~widelands-dev/widelands/bug-1817550-Statistics-hook-Winconditions

~widelands-dev/widelands/bug-1817550-Statistics-hook-Winconditions

Viewing all changes in revision 9032.

Committer: hessenfarmer
Date: 2019-04-25 06:13:15 UTC
mfrom: (9026.2.52 _widelands_dev_widelands_trunk)
Revision ID: stephan-lutz@gmx.de-20190425061315-tsc1yv7e6vaq41wf

merged trunk again to solve conflict

files added:
data/images/wui/overlays/grid_marker.png

data/shaders/workarea.fp

data/shaders/workarea.vp

src/graphic/gl/workarea_program.cc

src/graphic/gl/workarea_program.h

files removed:
data/images/wui/overlays/workarea1.png

data/images/wui/overlays/workarea12.png

data/images/wui/overlays/workarea2.png

data/images/wui/overlays/workarea23.png

data/images/wui/overlays/workarea3.png

files renamed:
data/images/wui/overlays/workarea123.png => data/images/wui/buildings/toggle_workarea.png

files modified:
data/scripting/win_conditions/territorial_functions.lua

data/scripting/win_conditions/territorial_lord.lua

data/scripting/win_conditions/territorial_time.lua

data/scripting/win_conditions/win_condition_functions.lua

src/editor/editorinteractive.cc

src/graphic/CMakeLists.txt

src/graphic/game_renderer.cc

src/graphic/game_renderer.h

src/graphic/render_queue.cc

src/graphic/render_queue.h

src/logic/widelands_geometry.h

src/wui/buildingwindow.cc

src/wui/interactive_base.cc

src/wui/interactive_base.h

src/wui/interactive_player.cc

src/wui/interactive_player.h

src/wui/interactive_spectator.cc

src/wui/mapview.cc

src/wui/mapview.h

Show diffs side-by-side

added added

removed removed

data/images/wui/overlays/grid_marker.png

data/images/wui/overlays/workarea1.png

data/images/wui/overlays/workarea12.png

data/images/wui/overlays/workarea2.png

data/images/wui/overlays/workarea23.png

data/images/wui/overlays/workarea3.png

data/scripting/win_conditions/territorial_functions.lua

data/scripting/win_conditions/territorial_lord.lua

data/scripting/win_conditions/territorial_time.lua

data/scripting/win_conditions/win_condition_functions.lua

data/shaders/workarea.fp

data/shaders/workarea.vp

src/editor/editorinteractive.cc

src/graphic/CMakeLists.txt

src/graphic/game_renderer.cc

src/graphic/game_renderer.h

src/graphic/gl/workarea_program.cc

src/graphic/gl/workarea_program.h

src/graphic/render_queue.cc

src/graphic/render_queue.h

src/logic/widelands_geometry.h

src/wui/buildingwindow.cc

src/wui/interactive_base.cc

src/wui/interactive_base.h

src/wui/interactive_player.cc

src/wui/interactive_player.h

src/wui/interactive_spectator.cc

src/wui/mapview.cc

src/wui/mapview.h

Older »