[colobot] 142/145: Merge tag 'upstream/0.1.8' into debian/master
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:26 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 1b0b51dce752ca8ea30a12e423a1645d02ad6b57
Merge: 6ef1c81 407d855
Author: Didier Raboud <odyx at debian.org>
Date: Mon Jul 11 09:50:42 2016 +0200
Merge tag 'upstream/0.1.8' into debian/master
CMakeLists.txt | 9 +-
Jenkinsfile | 50 ++
cmake/FindGettext.cmake | 218 -----
data | 2 +-
desktop/CMakeLists.txt | 68 +-
desktop/colobot.ini | 2 +-
desktop/colobot.svg | 1 +
desktop/create_desktop_file.sh | 2 +-
desktop/po/colobot-desktop.pot | 8 +-
desktop/po/fr.po | 10 +-
po/CMakeLists.txt | 35 +-
po/colobot.pot | 138 ++--
po/de.po | 225 ++---
po/fr.po | 245 +++---
po/pl.po | 269 +++---
po/ru.po | 222 ++---
src/CBot/CBotClass.cpp | 85 +-
src/CBot/CBotEnums.h | 1 +
src/CBot/CBotInstr/CBotDefArray.cpp | 46 +-
src/CBot/CBotInstr/CBotDefBoolean.cpp | 13 +-
src/CBot/CBotInstr/CBotDefClass.cpp | 16 +-
src/CBot/CBotInstr/CBotDefFloat.cpp | 13 +-
src/CBot/CBotInstr/CBotDefInt.cpp | 25 +-
src/CBot/CBotInstr/CBotDefString.cpp | 27 +-
src/CBot/CBotInstr/CBotExpression.cpp | 23 +-
src/CBot/CBotInstr/CBotFunction.cpp | 4 +-
src/CBot/CBotInstr/CBotInstrMethode.cpp | 14 +-
src/CBot/CBotInstr/CBotInstrUtils.cpp | 6 +-
src/CBot/CBotInstr/CBotInstrUtils.h | 8 +-
src/CBot/CBotInstr/CBotLeftExprVar.cpp | 6 +
src/CBot/CBotInstr/CBotListArray.cpp | 60 +-
src/CBot/CBotInstr/CBotListArray.h | 2 +-
src/CBot/CBotInstr/CBotNew.cpp | 6 +-
src/CBot/CBotInstr/CBotTwoOpExpr.cpp | 16 +-
src/CBot/CBotProgram.cpp | 2 +
src/CBot/CBotProgram.h | 4 +-
src/CBot/CBotStack.cpp | 14 +
src/CBot/CBotStack.h | 2 +-
src/CBot/CBotVar/CBotVar.cpp | 51 +-
src/CBot/CBotVar/CBotVar.h | 13 +
src/CBot/CBotVar/CBotVarBoolean.cpp | 118 +--
src/CBot/CBotVar/CBotVarBoolean.h | 24 +-
src/CBot/CBotVar/CBotVarClass.cpp | 7 +-
src/CBot/CBotVar/CBotVarFloat.cpp | 196 -----
src/CBot/CBotVar/CBotVarFloat.h | 39 +-
src/CBot/CBotVar/CBotVarInt.cpp | 237 +-----
src/CBot/CBotVar/CBotVarInt.h | 36 +-
src/CBot/CBotVar/CBotVarString.cpp | 98 +--
src/CBot/CBotVar/CBotVarString.h | 58 +-
src/CBot/CBotVar/CBotVarValue.h | 196 +++++
src/CBot/CMakeLists.txt | 93 ++-
src/CMakeLists.txt | 328 +++++++-
src/app/app.cpp | 16 +-
src/app/input.cpp | 119 +--
src/app/input.h | 10 +-
src/{common => app}/pathman.cpp | 3 +-
src/{common => app}/pathman.h | 2 +-
src/app/pausemanager.cpp | 16 +-
src/app/pausemanager.h | 1 +
src/app/signal_handlers.cpp | 4 +-
src/common/config_file.h | 4 +-
src/common/event.cpp | 14 +-
src/common/event.h | 74 +-
src/common/key.h | 14 +-
src/common/misc.cpp | 261 ------
src/common/misc.h | 40 -
src/common/resources/resourcemanager.cpp | 49 +-
src/common/resources/resourcemanager.h | 2 -
src/common/restext.cpp | 86 +-
src/common/settings.cpp | 4 +
src/graphics/core/device.h | 3 -
src/graphics/core/nulldevice.cpp | 7 -
src/graphics/core/nulldevice.h | 12 -
src/graphics/engine/camera.cpp | 767 ++++++-----------
src/graphics/engine/camera.h | 273 +++---
src/graphics/engine/engine.cpp | 555 ++++++++++---
src/graphics/engine/engine.h | 95 +--
src/graphics/engine/lightning.cpp | 59 +-
src/graphics/engine/lightning.h | 3 +
src/graphics/engine/particle.cpp | 60 +-
src/graphics/engine/particle.h | 18 +-
src/graphics/engine/terrain.cpp | 36 +-
src/graphics/engine/terrain.h | 2 +
src/graphics/engine/text.cpp | 245 +++---
src/graphics/engine/text.h | 16 +-
.../opengl/{gldevice.cpp => gl14device.cpp} | 194 ++---
src/graphics/opengl/{gldevice.h => gl14device.h} | 15 +-
src/graphics/opengl/gl21device.cpp | 44 +-
src/graphics/opengl/gl21device.h | 3 +-
src/graphics/opengl/gl33device.cpp | 7 +-
src/graphics/opengl/gl33device.h | 1 -
src/graphics/opengl/glutil.cpp | 18 +-
src/level/level_category.cpp | 4 -
src/level/level_category.h | 5 -
src/level/mainmovie.cpp | 8 +-
src/level/parser/parserparam.cpp | 2 +-
src/level/parser/parserparam.h | 2 +-
src/level/player_profile.cpp | 55 +-
src/level/player_profile.h | 1 +
src/level/robotmain.cpp | 911 +++++++++------------
src/level/robotmain.h | 54 +-
src/level/scene_conditions.h | 1 +
src/math/func.h | 9 +
src/math/intpoint.h | 96 +++
src/math/point.h | 4 +-
src/object/auto/autobase.cpp | 81 +-
src/object/auto/autohouston.cpp | 66 +-
src/object/auto/autolabo.cpp | 1 -
src/object/auto/autoportico.cpp | 29 +-
src/object/auto/autotower.cpp | 6 +-
src/object/interface/controllable_object.h | 4 -
src/object/object.cpp | 3 +-
src/object/old_object.cpp | 19 +-
src/object/old_object.h | 9 +-
src/object/task/taskgoto.cpp | 66 +-
src/object/task/taskgoto.h | 1 +
src/object/task/taskshield.cpp | 13 +-
src/physics/physics.cpp | 9 +-
src/script/script.cpp | 140 ++--
src/script/script.h | 15 +-
src/script/scriptfunc.cpp | 2 +-
src/sound/oalsound/alsound.cpp | 7 +-
src/sound/sound.cpp | 2 -
src/ui/controls/button.cpp | 1 -
src/ui/controls/check.cpp | 1 -
src/ui/controls/color.cpp | 1 -
src/ui/controls/edit.cpp | 74 +-
src/ui/controls/edit.h | 1 -
src/ui/controls/editvalue.cpp | 2 +-
src/ui/controls/group.cpp | 1 -
src/ui/controls/image.cpp | 1 -
src/ui/controls/list.cpp | 2 +-
src/ui/controls/scroll.cpp | 2 +-
src/ui/controls/shortcut.cpp | 1 -
src/ui/controls/slider.cpp | 2 +-
src/ui/controls/target.cpp | 3 +-
src/ui/debug_menu.cpp | 430 ++++++++++
src/ui/debug_menu.h | 71 ++
src/ui/displayinfo.cpp | 7 +-
src/ui/displayinfo.h | 4 +-
src/ui/mainui.cpp | 2 +-
src/ui/object_interface.cpp | 85 +-
src/ui/screen/screen_apperance.cpp | 19 +-
src/ui/screen/screen_io.cpp | 3 +-
src/ui/screen/screen_level_list.cpp | 10 -
src/ui/screen/screen_level_list.h | 1 -
src/ui/screen/screen_main_menu.cpp | 8 +-
src/ui/screen/screen_player_select.cpp | 29 +-
src/ui/screen/screen_setup.cpp | 2 -
src/ui/screen/screen_setup_controls.cpp | 193 ++---
src/ui/screen/screen_setup_graphics.cpp | 18 +
src/ui/studio.cpp | 29 +-
test/unit/CBot/CBot_test.cpp | 164 +++-
tools/check-levels.sh | 2 +-
154 files changed, 4898 insertions(+), 4439 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