This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot.
commit b143aa38acb313bd15dbdb2404aa3fcb6341d7d6 Merge: 92a8140 611c353 Author: krzys-h <krzy...@interia.pl> Date: Fri Nov 10 11:01:24 2017 +0100 Release 0.1.11-alpha: Merge branch 'dev' CMakeLists.txt | 4 +- data | 2 +- po/colobot.pot | 37 +++++-- po/de.po | 134 +++++++++++++--------- po/fr.po | 94 ++++++++++++---- po/pl.po | 57 ++++++---- po/ru.po | 94 ++++++++++++---- src/CBot/CBotEnums.h | 6 + src/CBot/CBotInstr/CBotExprLitString.cpp | 144 +++++++++++++++++++++--- src/CBot/CBotInstr/CBotExprLitString.h | 3 + src/CBot/CBotInstr/CBotExprVar.cpp | 4 + src/CBot/CBotInstr/CBotFunction.cpp | 10 +- src/CBot/CBotInstr/CBotLeftExpr.cpp | 2 + src/CBot/CBotInstr/CBotTwoOpExpr.cpp | 13 ++- src/CBot/CBotToken.cpp | 25 ++--- src/CBot/CBotUtils.cpp | 45 ++++++++ src/CBot/CBotUtils.h | 15 +++ src/app/app.cpp | 3 - src/app/input.cpp | 27 ++--- src/app/pathman.cpp | 2 - src/common/config_file.cpp | 3 - src/common/error.h | 1 + src/common/key.h | 12 +- src/common/logger.cpp | 4 - src/common/restext.cpp | 19 ++-- src/common/settings.cpp | 17 ++- src/common/settings.h | 4 + src/common/singleton.h | 1 + src/graphics/engine/engine.cpp | 22 +++- src/graphics/engine/engine.h | 18 ++- src/graphics/engine/planet.cpp | 12 +- src/level/player_profile.cpp | 2 + src/level/robotmain.cpp | 132 +++++++++++++--------- src/level/robotmain.h | 2 + src/object/auto/autofactory.cpp | 4 +- src/object/interface/damageable_object.h | 7 ++ src/object/motion/motionvehicle.cpp | 1 + src/object/object_manager.cpp | 4 - src/object/old_object.cpp | 31 +++++- src/object/old_object.h | 5 + src/object/task/taskgoto.cpp | 7 +- src/object/task/taskrecover.cpp | 2 +- src/object/task/taskterraform.cpp | 111 ++++++++++++++++++- src/object/task/taskturn.cpp | 14 ++- src/object/task/taskturn.h | 1 + src/script/cbottoken.cpp | 5 +- src/script/script.cpp | 58 +++++++++- src/script/scriptfunc.cpp | 183 ++++++++++++++++++++++--------- src/script/scriptfunc.h | 3 +- src/ui/controls/control.h | 3 +- src/ui/controls/edit.cpp | 6 +- src/ui/controls/shortcut.cpp | 21 ++++ src/ui/mainshort.cpp | 1 + src/ui/studio.cpp | 66 +++++++---- src/ui/studio.h | 4 + test/unit/CBot/CBot_test.cpp | 114 +++++++++++++++++++ tools/release.py | 111 ++++++++++++++----- 57 files changed, 1323 insertions(+), 409 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits