[colobot] 64/74: Release 0.1.9-alpha: Merge branch 'dev'

Didier Raboud odyx at moszumanska.debian.org
Mon Nov 7 07:50:06 UTC 2016


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

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

commit b0e34bbe6ad066cd57c197dc23506463ba5a181f
Merge: 407d855 d435628
Author: krzys-h <krzys_h at interia.pl>
Date:   Wed Nov 2 21:42:22 2016 +0100

    Release 0.1.9-alpha: Merge branch 'dev'

 .gitignore                                         |   3 +
 CMakeLists.txt                                     |  19 +-
 CONTRIBUTING.md                                    |  67 +-
 Doxyfile.in                                        |   2 +-
 INSTALL-MSYS2.md                                   | 161 ++++
 INSTALL.md                                         |   4 +-
 README-dev.md                                      |  99 +++
 data                                               |   2 +-
 docimg/2d_coord.png                                | Bin 0 -> 4983 bytes
 docimg/3d_canonical_coords.png                     | Bin 0 -> 10961 bytes
 docimg/README.txt                                  |   1 +
 po/colobot.pot                                     |   3 +
 po/de.po                                           |   3 +
 po/fr.po                                           |   3 +
 po/pl.po                                           |   3 +
 po/ru.po                                           | 127 ++-
 src/CBot/CBotClass.cpp                             |  65 +-
 src/CBot/CBotClass.h                               |  10 +
 src/CBot/CBotDefParam.cpp                          |   5 +
 src/CBot/CBotEnums.h                               |   1 +
 src/CBot/CBotInstr/CBotDefClass.cpp                |  62 +-
 src/CBot/CBotInstr/CBotDefClass.h                  |   3 +
 src/CBot/CBotInstr/CBotExprRetVar.cpp              | 209 +++++
 src/CBot/CBotInstr/{CBotNew.h => CBotExprRetVar.h} |  28 +-
 src/CBot/CBotInstr/CBotExprVar.cpp                 |   7 +-
 src/CBot/CBotInstr/CBotFieldExpr.cpp               |  53 ++
 src/CBot/CBotInstr/CBotFieldExpr.h                 |  15 +
 src/CBot/CBotInstr/CBotFunction.cpp                | 125 +--
 src/CBot/CBotInstr/CBotFunction.h                  |   3 +-
 src/CBot/CBotInstr/CBotIndexExpr.h                 |   1 +
 src/CBot/CBotInstr/CBotInstrCall.cpp               |  93 +--
 src/CBot/CBotInstr/CBotInstrCall.h                 |   4 +
 src/CBot/CBotInstr/CBotInstrMethode.cpp            |  71 +-
 src/CBot/CBotInstr/CBotInstrMethode.h              |   9 +-
 src/CBot/CBotInstr/CBotInstrUtils.cpp              |  10 +-
 src/CBot/CBotInstr/CBotLeftExpr.cpp                |  15 +-
 src/CBot/CBotInstr/CBotListArray.cpp               |   7 +-
 src/CBot/CBotInstr/CBotNew.cpp                     |  43 +-
 src/CBot/CBotInstr/CBotNew.h                       |   3 +
 src/CBot/CBotProgram.cpp                           |  28 +-
 src/CBot/CBotProgram.h                             |   7 -
 src/CBot/CBotStack.cpp                             |  50 +-
 src/CBot/CBotTypResult.h                           |   2 +-
 src/CBot/CBotVar/CBotVarClass.cpp                  |   5 +-
 src/CBot/CBotVar/CBotVarPointer.cpp                |   4 +-
 src/CBot/CMakeLists.txt                            |   2 +
 src/CBot/stdlib/FileFunctions.cpp                  |  10 +-
 src/CBot/stdlib/stdlib_public.h                    |   2 +-
 src/CMakeLists.txt                                 |  16 +-
 src/app/app.cpp                                    | 108 +--
 src/app/app.h                                      |  43 -
 src/app/main.cpp                                   |  43 +-
 src/app/pathman.cpp                                |  10 +-
 src/app/signal_handlers.cpp                        |   4 +-
 src/common/config_file.cpp                         |   4 +-
 src/common/profiler.cpp                            |  90 +++
 src/common/profiler.h                              |  80 ++
 src/common/resources/outputstream.cpp              |   8 +-
 src/common/resources/outputstream.h                |  17 +-
 src/common/resources/outputstreambuffer.cpp        |   7 +-
 src/common/resources/outputstreambuffer.h          |   8 +-
 src/common/resources/resourcemanager.cpp           |   2 +-
 src/common/restext.cpp                             |   1 +
 src/{app => common/system}/system.cpp              |  17 +-
 src/{app => common/system}/system.h                |   2 +-
 src/{app => common/system}/system_linux.cpp        |   2 +-
 src/{app => common/system}/system_linux.h          |   4 +-
 src/{app => common/system}/system_macosx.cpp       |   2 +-
 src/{app => common/system}/system_macosx.h         |   6 +-
 src/{app => common/system}/system_other.cpp        |   2 +-
 src/{app => common/system}/system_other.h          |   4 +-
 src/{app => common/system}/system_windows.cpp      |   2 +-
 src/{app => common/system}/system_windows.h        |   4 +-
 src/common/thread/resource_owning_thread.h         |  15 +-
 src/common/thread/sdl_cond_wrapper.h               |  12 +
 src/common/thread/sdl_mutex_wrapper.h              |  10 +
 src/common/thread/thread.h                         |  77 ++
 src/common/thread/worker_thread.h                  |  92 +++
 src/graphics/README.txt                            |  45 ++
 src/graphics/engine/engine.cpp                     | 122 +--
 src/graphics/engine/particle.cpp                   |  52 +-
 src/graphics/engine/particle.h                     |  13 +-
 src/graphics/model/README.txt                      |  82 ++
 src/level/robotmain.cpp                            |  11 +-
 src/object/implementation/program_storage_impl.cpp |   1 -
 src/object/implementation/programmable_impl.cpp    |   3 +
 src/object/object_manager.cpp                      |   7 +-
 src/object/old_object.cpp                          |   6 +-
 src/object/old_object.h                            |   6 +-
 src/script/script.cpp                              |  15 +-
 src/script/scriptfunc.cpp                          |  17 +-
 src/sound/oalsound/alsound.cpp                     | 113 ++-
 src/sound/oalsound/alsound.h                       |  11 +-
 src/sound/sound.cpp                                |  28 +-
 src/sound/sound.h                                  |  26 +-
 src/ui/controls/edit.cpp                           | 230 +++---
 src/ui/controls/edit.h                             |  30 +-
 src/ui/controls/editvalue.cpp                      |   6 +-
 src/ui/mainui.cpp                                  |   3 +-
 src/ui/object_interface.cpp                        |   8 +-
 src/ui/object_interface.h                          |  13 +-
 src/ui/screen/screen_io.cpp                        |   9 +-
 src/ui/screen/screen_player_select.cpp             |  22 +-
 src/ui/studio.cpp                                  |  79 +-
 src/ui/studio.h                                    |   2 +-
 test/unit/CBot/CBot_test.cpp                       | 865 +++++++++++++++++++++
 test/unit/CMakeLists.txt                           |   4 +-
 test/unit/app/app_test.cpp                         |   4 +-
 test/unit/common/config_file_test.cpp              |   4 +-
 .../{app => common/system}/system_linux_test.cpp   |   4 +-
 .../{app => common/system}/system_windows_test.cpp |   4 +-
 tools/release.py                                   | 102 +++
 112 files changed, 3184 insertions(+), 904 deletions(-)

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



More information about the Pkg-games-commits mailing list