[colobot] 196/390: Merge branch 'dev-physfs-save' into dev

[Didier Raboud]

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

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit fca746fdb47d1a2f11cac798059fbfd60a8e846a
Merge: a952e0e 759b987
Author: krzys-h <krzys_h at interia.pl>
Date:   Mon Nov 10 19:39:56 2014 +0100

    Merge branch 'dev-physfs-save' into dev

 src/app/app.cpp                          |   4 +-
 src/common/resources/resourcemanager.cpp |  24 +-
 src/common/resources/resourcemanager.h   |   6 +
 src/object/auto/auto.cpp                 |  38 +--
 src/object/auto/auto.h                   |   5 +-
 src/object/auto/autoconvert.cpp          |  34 +--
 src/object/auto/autoconvert.h            |   4 +-
 src/object/auto/autoderrick.cpp          |  36 +--
 src/object/auto/autoderrick.h            |   4 +-
 src/object/auto/autodestroyer.cpp        |  36 +--
 src/object/auto/autodestroyer.h          |   4 +-
 src/object/auto/autoegg.cpp              |  54 ++--
 src/object/auto/autoegg.h                |   4 +-
 src/object/auto/autoenergy.cpp           |  36 +--
 src/object/auto/autoenergy.h             |   4 +-
 src/object/auto/autofactory.cpp          |  35 +--
 src/object/auto/autofactory.h            |   4 +-
 src/object/auto/autoinfo.cpp             |  38 ++-
 src/object/auto/autoinfo.h               |   4 +-
 src/object/auto/autolabo.cpp             |  44 +--
 src/object/auto/autolabo.h               |   4 +-
 src/object/auto/automush.cpp             |  41 +--
 src/object/auto/automush.h               |   4 +-
 src/object/auto/autonest.cpp             |  41 +--
 src/object/auto/autonest.h               |   4 +-
 src/object/auto/autonuclear.cpp          |  36 +--
 src/object/auto/autonuclear.h            |   4 +-
 src/object/auto/autopara.cpp             |  36 +--
 src/object/auto/autopara.h               |   4 +-
 src/object/auto/autorepair.cpp           |  36 +--
 src/object/auto/autorepair.h             |   4 +-
 src/object/auto/autoresearch.cpp         |  41 +--
 src/object/auto/autoresearch.h           |   4 +-
 src/object/auto/autosafe.cpp             |  35 +--
 src/object/auto/autosafe.h               |   4 +-
 src/object/auto/autotower.cpp            |  66 ++---
 src/object/auto/autotower.h              |   4 +-
 src/object/brain.cpp                     |  13 +-
 src/object/brain.h                       |   5 +-
 src/object/level/parser.cpp              |  18 +-
 src/object/level/parser.h                |   3 +-
 src/object/level/parserline.cpp          |  10 +-
 src/object/level/parserline.h            |   4 +-
 src/object/level/parserparam.cpp         |  66 ++++-
 src/object/level/parserparam.h           |   2 +
 src/object/motion/motion.cpp             |  27 +-
 src/object/motion/motion.h               |   5 +-
 src/object/object.cpp                    | 258 +++++++----------
 src/object/object.h                      |   5 +-
 src/object/robotmain.cpp                 | 414 +++++++++++-----------------
 src/object/robotmain.h                   |  11 +-
 src/physics/physics.cpp                  |  24 +-
 src/physics/physics.h                    |   5 +-
 src/ui/maindialog.cpp                    | 459 ++++++++++---------------------
 src/ui/maindialog.h                      |  10 +-
 src/ui/studio.cpp                        |  51 ++--
 src/ui/studio.h                          |   2 +-
 57 files changed, 879 insertions(+), 1299 deletions(-)


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