[colobot] 21/145: Merge branch 'dev-0.1.8' into dev
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:13 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 64fef98bd78e74fd3c58e35d852dc2bfd7d438ee
Merge: 1c5f477 427bbfa
Author: krzys-h <krzys_h at interia.pl>
Date: Tue Mar 29 16:16:20 2016 +0200
Merge branch 'dev-0.1.8' into dev
src/CMakeLists.txt | 1 +
src/app/app.cpp | 2 +-
src/app/input.cpp | 20 +-
src/common/config_file.h | 4 +-
src/common/event.cpp | 2 +
src/common/event.h | 31 ++-
src/graphics/core/nulldevice.cpp | 3 -
src/graphics/core/nulldevice.h | 11 -
src/graphics/engine/engine.cpp | 151 ++++++++++++--
src/graphics/engine/engine.h | 28 ++-
src/graphics/engine/lightning.cpp | 59 +++---
src/graphics/engine/lightning.h | 3 +
src/graphics/engine/particle.cpp | 12 +-
src/graphics/engine/particle.h | 3 -
src/graphics/engine/terrain.cpp | 36 ++--
src/graphics/engine/terrain.h | 2 +
src/level/robotmain.cpp | 240 ++++++++++-----------
src/level/robotmain.h | 15 +-
src/object/auto/autohouston.cpp | 64 +++---
src/object/task/taskgoto.cpp | 66 +++++-
src/object/task/taskgoto.h | 1 +
src/ui/controls/target.cpp | 3 +-
src/ui/debug_menu.cpp | 429 ++++++++++++++++++++++++++++++++++++++
src/ui/debug_menu.h | 70 +++++++
24 files changed, 977 insertions(+), 279 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