[colobot] 97/100: Release 0.1.10-alpha: Merge branch 'dev'
Didier Raboud
odyx at moszumanska.debian.org
Thu Jun 1 18:10:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 1dcc70c097030ab5859583c2c227ab39a96c7c3b
Merge: b8d88c9 8269f79
Author: krzys-h <krzys_h at interia.pl>
Date: Wed May 24 14:34:19 2017 +0200
Release 0.1.10-alpha: Merge branch 'dev'
CMakeLists.txt | 11 +-
Doxyfile.in | 4 +-
Jenkinsfile | 105 ++--
README.md | 2 +-
data | 2 +-
po/colobot.pot | 40 ++
po/de.po | 286 ++++++-----
po/fr.po | 93 ++--
po/pl.po | 40 ++
po/ru.po | 55 ++-
src/CBot/CBotCStack.cpp | 6 +-
src/CBot/CBotCallMethode.cpp | 113 -----
src/CBot/CBotCallMethode.h | 88 ----
src/CBot/CBotClass.cpp | 220 +++++----
src/CBot/CBotClass.h | 64 +--
src/CBot/CBotDebug.cpp | 9 +-
src/CBot/CBotDefParam.cpp | 107 +++-
src/CBot/CBotDefParam.h | 9 +
src/CBot/CBotEnums.h | 4 +
src/CBot/CBotExternalCall.cpp | 44 ++
src/CBot/CBotExternalCall.h | 30 ++
src/CBot/CBotInstr/CBotDefClass.cpp | 17 +-
src/CBot/CBotInstr/CBotExprUnaire.cpp | 7 +-
src/CBot/CBotInstr/CBotExprUnaire.h | 11 +-
src/CBot/CBotInstr/CBotExprVar.cpp | 8 +-
src/CBot/CBotInstr/CBotExprVar.h | 13 +-
src/CBot/CBotInstr/CBotFieldExpr.cpp | 5 +-
src/CBot/CBotInstr/CBotFieldExpr.h | 7 +-
src/CBot/CBotInstr/CBotFunction.cpp | 349 ++++++++-----
src/CBot/CBotInstr/CBotFunction.h | 123 ++---
src/CBot/CBotInstr/CBotIf.cpp | 9 +
src/CBot/CBotInstr/CBotIf.h | 8 +
src/CBot/CBotInstr/CBotInstr.cpp | 6 +
src/CBot/CBotInstr/CBotInstr.h | 6 +
src/CBot/CBotInstr/CBotInstrCall.cpp | 2 +
src/CBot/CBotInstr/CBotInstrMethode.cpp | 35 +-
src/CBot/CBotInstr/CBotInstrUtils.h | 2 +-
src/CBot/CBotInstr/CBotLeftExpr.cpp | 5 +-
src/CBot/CBotInstr/CBotLeftExpr.h | 4 +
src/CBot/CBotInstr/CBotListInstr.cpp | 8 +-
src/CBot/CBotInstr/CBotListInstr.h | 7 +
src/CBot/CBotInstr/CBotNew.cpp | 15 +-
src/CBot/CBotInstr/CBotParExpr.cpp | 44 +-
src/CBot/CBotInstr/CBotParExpr.h | 8 +
src/CBot/CBotInstr/CBotReturn.cpp | 5 +
src/CBot/CBotInstr/CBotReturn.h | 6 +
src/CBot/CBotProgram.cpp | 111 ++---
src/CBot/CBotProgram.h | 19 +-
src/CBot/CBotStack.cpp | 33 +-
src/CBot/CBotToken.cpp | 10 +-
src/CBot/CBotTypResult.cpp | 7 +-
src/CBot/CBotVar/CBotVar.cpp | 3 +
src/CBot/CBotVar/CBotVarClass.cpp | 5 +-
src/CBot/CBotVar/CBotVarString.h | 4 +-
src/CBot/CMakeLists.txt | 2 -
src/CBot/stdlib/FileFunctions.cpp | 34 +-
src/CBot/stdlib/StringFunctions.cpp | 10 +-
src/CMakeLists.txt | 6 +
src/app/app.cpp | 11 +-
src/app/app.h | 5 +-
src/app/signal_handlers.cpp | 2 +-
src/common/error.h | 170 ++++---
src/common/event.h | 7 +-
src/common/resources/outputstream.h | 4 +-
src/common/resources/outputstreambuffer.h | 2 +-
src/common/restext.cpp | 14 +
src/common/restext.h | 4 +
src/common/system/system.cpp | 4 +-
src/graphics/core/device.h | 13 +-
src/graphics/core/nulldevice.cpp | 10 +
src/graphics/core/nulldevice.h | 5 +
src/graphics/core/texture.h | 41 --
.../screen_apperance.h => graphics/core/type.cpp} | 56 ++-
.../screen_apperance.h => graphics/core/type.h} | 56 ++-
src/graphics/core/vertex.h | 54 ++
src/graphics/engine/cloud.cpp | 2 -
src/graphics/engine/engine.cpp | 59 ++-
src/graphics/engine/engine.h | 2 +
src/graphics/engine/lightning.cpp | 2 +-
src/graphics/engine/particle.cpp | 74 ++-
src/graphics/engine/particle.h | 3 +
src/graphics/engine/pyro.cpp | 5 +
src/graphics/engine/terrain.cpp | 5 +-
src/graphics/engine/text.cpp | 30 +-
src/graphics/opengl/gl14device.cpp | 338 ++++++++-----
src/graphics/opengl/gl14device.h | 13 +
src/graphics/opengl/gl21device.cpp | 305 +++++++++---
src/graphics/opengl/gl21device.h | 15 +-
src/graphics/opengl/gl33device.cpp | 546 +++++++++++----------
src/graphics/opengl/gl33device.h | 23 +-
src/graphics/opengl/glutil.cpp | 19 +
src/graphics/opengl/glutil.h | 6 +-
src/graphics/opengl/shaders/gl21/fs_normal.glsl | 81 ++-
src/graphics/opengl/shaders/gl21/vs_normal.glsl | 95 +---
src/graphics/opengl/shaders/gl33/fs_normal.glsl | 70 ++-
src/graphics/opengl/shaders/gl33/vs_normal.glsl | 72 +--
src/level/parser/parserparam.cpp | 4 +
src/level/player_profile.cpp | 2 +-
src/level/robotmain.cpp | 509 ++++++++++++-------
src/level/robotmain.h | 208 ++++++--
src/level/scene_conditions.cpp | 137 +++---
src/level/scene_conditions.h | 23 +-
src/level/scoreboard.cpp | 113 +++++
src/level/scoreboard.h | 125 +++++
src/math/all.h | 1 +
src/math/half.cpp | 116 +++++
src/math/half.h | 105 ++++
src/object/auto/autodestroyer.cpp | 2 +-
src/object/auto/autofactory.cpp | 8 +-
src/object/auto/autolabo.cpp | 2 +-
src/object/auto/autoresearch.cpp | 2 +-
src/object/interface/damageable_object.h | 4 +-
src/object/interface/destroyable_object.h | 3 +-
src/object/motion/motionhuman.cpp | 21 +-
src/object/motion/motionhuman.h | 1 +
src/object/motion/motiontoto.cpp | 67 ++-
src/object/motion/motiontoto.h | 2 -
src/object/object.h | 5 +
src/object/object_factory.cpp | 44 ++
src/object/object_manager.cpp | 8 +-
src/object/object_manager.h | 3 +-
src/object/object_type.h | 394 +++++++--------
src/object/old_object.cpp | 73 ++-
src/object/old_object.h | 21 +-
src/object/task/taskgoto.cpp | 40 +-
src/physics/physics.cpp | 17 +-
src/script/scriptfunc.cpp | 32 +-
src/sound/sound_type.cpp | 3 +-
src/sound/sound_type.h | 1 +
src/ui/controls/edit.cpp | 104 +++-
src/ui/controls/edit.h | 2 +
src/ui/controls/map.cpp | 16 +-
src/ui/controls/target.cpp | 2 +-
src/ui/debug_menu.cpp | 61 ++-
src/ui/debug_menu.h | 31 ++
src/ui/mainshort.cpp | 4 +-
src/ui/object_interface.cpp | 22 +-
src/ui/screen/screen_apperance.cpp | 45 +-
src/ui/screen/screen_apperance.h | 3 +
src/ui/screen/screen_player_select.cpp | 4 +
test/unit/CBot/CBotToken_test.cpp | 2 +-
test/unit/CBot/CBot_test.cpp | 381 +++++++++++++-
142 files changed, 4828 insertions(+), 2454 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