[colobot] 47/100: Merge pull request #897 from melex750/dev

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 967fb9e30fd0c868f14ddaacb50fb33d8595aac3
Merge: 8e54f7c 92a8c48
Author: krzys_h <krzys_h at interia.pl>
Date:   Thu Jan 26 18:46:42 2017 +0100

    Merge pull request #897 from melex750/dev
    
    * Fix game crashing related to syntax errors
    * Fix problems with not returning correct value from function
    * Add default values for parameters
    * Fix custom functions not accepting nan
    * Fix 'point' constructor not executing when called with new

 po/colobot.pot                       |   9 ++
 po/de.po                             |   9 ++
 po/fr.po                             |   9 ++
 po/pl.po                             |   9 ++
 po/ru.po                             |   9 ++
 src/CBot/CBotClass.cpp               |  25 ++--
 src/CBot/CBotDefParam.cpp            |  84 +++++++++++---
 src/CBot/CBotDefParam.h              |   9 ++
 src/CBot/CBotEnums.h                 |   3 +
 src/CBot/CBotInstr/CBotFunction.cpp  |  59 ++++++++--
 src/CBot/CBotInstr/CBotFunction.h    |   6 +
 src/CBot/CBotInstr/CBotIf.cpp        |   9 ++
 src/CBot/CBotInstr/CBotIf.h          |   8 ++
 src/CBot/CBotInstr/CBotInstr.cpp     |   7 ++
 src/CBot/CBotInstr/CBotInstr.h       |   6 +
 src/CBot/CBotInstr/CBotListInstr.cpp |   8 +-
 src/CBot/CBotInstr/CBotListInstr.h   |   7 ++
 src/CBot/CBotInstr/CBotNew.cpp       |   2 +-
 src/CBot/CBotInstr/CBotParExpr.cpp   |  10 ++
 src/CBot/CBotInstr/CBotParExpr.h     |   8 ++
 src/CBot/CBotInstr/CBotReturn.cpp    |   5 +
 src/CBot/CBotInstr/CBotReturn.h      |   6 +
 src/CBot/CBotToken.cpp               |   7 ++
 src/common/restext.cpp               |   3 +
 test/unit/CBot/CBotToken_test.cpp    |   2 +-
 test/unit/CBot/CBot_test.cpp         | 219 ++++++++++++++++++++++++++++++++++-
 26 files changed, 495 insertions(+), 43 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git