← Back to branch summary

~widelands-dev/widelands/frisian_music

~widelands-dev/widelands/frisian_music

Viewing all changes in revision 8764.

Committer: Nordfriese
Date: 2019-02-28 18:04:14 UTC
mfrom: (8758.1.242 _widelands_dev_widelands_trunk)
Revision ID: nordfriese-20190228180414-ba72oo5659kgnudb

Merged trunk

files added:
src/logic/map_objects/draw_text.h

files modified:
data/txts/developers.json

debian/widelands.appdata.xml

debian/widelands.appdata.xml.stub

src/economy/flag.h

src/economy/portdock.cc

src/economy/portdock.h

src/economy/road.h

src/editor/editorinteractive.cc

src/graphic/graphic.cc

src/logic/CMakeLists.txt

src/logic/map_objects/bob.cc

src/logic/map_objects/bob.h

src/logic/map_objects/immovable.cc

src/logic/map_objects/immovable.h

src/logic/map_objects/map_object.cc

src/logic/map_objects/map_object.h

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building.h

src/logic/map_objects/tribes/constructionsite.cc

src/logic/map_objects/tribes/constructionsite.h

src/logic/map_objects/tribes/dismantlesite.cc

src/logic/map_objects/tribes/dismantlesite.h

src/logic/map_objects/tribes/ship.cc

src/logic/map_objects/tribes/ship.h

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/soldier.h

src/logic/map_objects/tribes/worker.cc

src/logic/map_objects/tribes/worker.h

src/wui/interactive_base.cc

src/wui/interactive_base.h

src/wui/interactive_gamebase.cc

src/wui/interactive_gamebase.h

src/wui/interactive_player.cc

src/wui/interactive_spectator.cc

src/wui/transport_draw.cc

Show diffs side-by-side

added added

removed removed

data/txts/developers.json

debian/widelands.appdata.xml

debian/widelands.appdata.xml.stub

src/economy/flag.h

src/economy/portdock.cc

src/economy/portdock.h

src/economy/road.h

src/editor/editorinteractive.cc

src/graphic/graphic.cc

src/logic/CMakeLists.txt

src/logic/map_objects/bob.cc

src/logic/map_objects/bob.h

src/logic/map_objects/draw_text.h

src/logic/map_objects/immovable.cc

src/logic/map_objects/immovable.h

src/logic/map_objects/map_object.cc

src/logic/map_objects/map_object.h

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building.h

src/logic/map_objects/tribes/constructionsite.cc

src/logic/map_objects/tribes/constructionsite.h

src/logic/map_objects/tribes/dismantlesite.cc

src/logic/map_objects/tribes/dismantlesite.h

src/logic/map_objects/tribes/ship.cc

src/logic/map_objects/tribes/ship.h

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/soldier.h

src/logic/map_objects/tribes/worker.cc

src/logic/map_objects/tribes/worker.h

src/wui/interactive_base.cc

src/wui/interactive_base.h

src/wui/interactive_gamebase.cc

src/wui/interactive_gamebase.h

src/wui/interactive_player.cc

src/wui/interactive_spectator.cc

src/wui/transport_draw.cc

Older »