[colobot] 87/390: Merge branch 'dev' into dev-physfs
Didier Raboud
odyx at moszumanska.debian.org
Fri Jun 12 14:21:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit f65b00089ac537f9e37d0d4b7f44881fed4a09f1
Merge: eab300c 9fd6cf5
Author: krzys-h <krzys_h at interia.pl>
Date: Tue Oct 14 15:42:19 2014 +0200
Merge branch 'dev' into dev-physfs
Conflicts:
data
LICENSE-HEADER.txt | 18 +
README.md | 30 +-
data | 2 +-
po/CMakeLists.txt | 5 +-
po/colobot.pot | 83 +-
po/de.po | 2646 +++++++++++--------------
po/fr.po | 2644 +++++++++++--------------
po/pl.po | 2664 +++++++++++---------------
po/ru.po | 2400 +++++++++++------------
src/CBot/CBot.cpp | 33 +-
src/CBot/CBot.h | 33 +-
src/CBot/CBotAddExpr.cpp | 33 +-
src/CBot/CBotClass.cpp | 33 +-
src/CBot/CBotCompExpr.cpp | 33 +-
src/CBot/CBotDll.h | 33 +-
src/CBot/CBotFunction.cpp | 33 +-
src/CBot/CBotIf.cpp | 33 +-
src/CBot/CBotProgram.cpp | 33 +-
src/CBot/CBotStack.cpp | 38 +-
src/CBot/CBotString.cpp | 33 +-
src/CBot/CBotToken.cpp | 33 +-
src/CBot/CBotToken.h | 33 +-
src/CBot/CBotTwoOpExpr.cpp | 33 +-
src/CBot/CBotVar.cpp | 33 +-
src/CBot/CBotWhile.cpp | 33 +-
src/CBot/StringFunctions.cpp | 33 +-
src/CBot/resource.h | 33 +-
src/app/app.cpp | 34 +-
src/app/app.h | 34 +-
src/app/main.cpp | 34 +-
src/app/pausemanager.cpp | 34 +-
src/app/pausemanager.h | 34 +-
src/app/system.cpp | 34 +-
src/app/system.h | 34 +-
src/app/system_linux.cpp | 34 +-
src/app/system_linux.h | 34 +-
src/app/system_macosx.cpp | 34 +-
src/app/system_macosx.h | 34 +-
src/app/system_other.cpp | 34 +-
src/app/system_other.h | 34 +-
src/app/system_windows.cpp | 34 +-
src/app/system_windows.h | 34 +-
src/common/event.cpp | 33 +-
src/common/event.h | 33 +-
src/common/global.h | 33 +-
src/common/image.cpp | 33 +-
src/common/image.h | 33 +-
src/common/iman.cpp | 33 +-
src/common/iman.h | 33 +-
src/common/ioutils.h | 33 +-
src/common/key.h | 33 +-
src/common/logger.cpp | 33 +-
src/common/logger.h | 33 +-
src/common/misc.cpp | 33 +-
src/common/misc.h | 33 +-
src/common/profile.cpp | 33 +-
src/common/profile.h | 33 +-
src/common/restext.cpp | 1396 +++++++-------
src/common/restext.h | 33 +-
src/common/singleton.h | 33 +-
src/common/stringutils.cpp | 33 +-
src/common/stringutils.h | 33 +-
src/graphics/core/color.cpp | 33 +-
src/graphics/core/color.h | 33 +-
src/graphics/core/device.h | 34 +-
src/graphics/core/light.h | 34 +-
src/graphics/core/material.h | 33 +-
src/graphics/core/texture.h | 33 +-
src/graphics/core/vertex.h | 33 +-
src/graphics/engine/camera.cpp | 34 +-
src/graphics/engine/camera.h | 34 +-
src/graphics/engine/cloud.cpp | 34 +-
src/graphics/engine/cloud.h | 34 +-
src/graphics/engine/engine.cpp | 34 +-
src/graphics/engine/engine.h | 34 +-
src/graphics/engine/lightman.cpp | 34 +-
src/graphics/engine/lightman.h | 34 +-
src/graphics/engine/lightning.cpp | 34 +-
src/graphics/engine/lightning.h | 34 +-
src/graphics/engine/modelfile.cpp | 34 +-
src/graphics/engine/modelfile.h | 34 +-
src/graphics/engine/modelmanager.cpp | 34 +-
src/graphics/engine/modelmanager.h | 34 +-
src/graphics/engine/particle.cpp | 34 +-
src/graphics/engine/particle.h | 34 +-
src/graphics/engine/planet.cpp | 34 +-
src/graphics/engine/planet.h | 34 +-
src/graphics/engine/pyro.cpp | 34 +-
src/graphics/engine/pyro.h | 34 +-
src/graphics/engine/terrain.cpp | 34 +-
src/graphics/engine/terrain.h | 34 +-
src/graphics/engine/text.cpp | 34 +-
src/graphics/engine/text.h | 34 +-
src/graphics/engine/water.cpp | 34 +-
src/graphics/engine/water.h | 34 +-
src/graphics/opengl/gldevice.cpp | 33 +-
src/graphics/opengl/gldevice.h | 33 +-
src/math/all.h | 33 +-
src/math/const.h | 33 +-
src/math/func.h | 34 +-
src/math/geometry.h | 34 +-
src/math/intpoint.h | 33 +-
src/math/matrix.h | 33 +-
src/math/point.h | 33 +-
src/math/vector.h | 33 +-
src/object/auto/auto.cpp | 33 +-
src/object/auto/auto.h | 33 +-
src/object/auto/autobase.cpp | 33 +-
src/object/auto/autobase.h | 34 +-
src/object/auto/autoconvert.cpp | 34 +-
src/object/auto/autoconvert.h | 34 +-
src/object/auto/autoderrick.cpp | 34 +-
src/object/auto/autoderrick.h | 34 +-
src/object/auto/autodestroyer.cpp | 34 +-
src/object/auto/autodestroyer.h | 34 +-
src/object/auto/autoegg.cpp | 34 +-
src/object/auto/autoegg.h | 34 +-
src/object/auto/autoenergy.cpp | 34 +-
src/object/auto/autoenergy.h | 34 +-
src/object/auto/autofactory.cpp | 34 +-
src/object/auto/autofactory.h | 34 +-
src/object/auto/autoflag.cpp | 34 +-
src/object/auto/autoflag.h | 34 +-
src/object/auto/autohuston.cpp | 34 +-
src/object/auto/autohuston.h | 34 +-
src/object/auto/autoinfo.cpp | 34 +-
src/object/auto/autoinfo.h | 34 +-
src/object/auto/autojostle.cpp | 34 +-
src/object/auto/autojostle.h | 34 +-
src/object/auto/autokid.cpp | 34 +-
src/object/auto/autokid.h | 34 +-
src/object/auto/autolabo.cpp | 34 +-
src/object/auto/autolabo.h | 34 +-
src/object/auto/automush.cpp | 34 +-
src/object/auto/automush.h | 34 +-
src/object/auto/autonest.cpp | 34 +-
src/object/auto/autonest.h | 34 +-
src/object/auto/autonuclear.cpp | 34 +-
src/object/auto/autonuclear.h | 34 +-
src/object/auto/autopara.cpp | 34 +-
src/object/auto/autopara.h | 34 +-
src/object/auto/autoportico.cpp | 34 +-
src/object/auto/autoportico.h | 34 +-
src/object/auto/autoradar.cpp | 34 +-
src/object/auto/autoradar.h | 34 +-
src/object/auto/autorepair.cpp | 34 +-
src/object/auto/autorepair.h | 34 +-
src/object/auto/autoresearch.cpp | 34 +-
src/object/auto/autoresearch.h | 34 +-
src/object/auto/autoroot.cpp | 33 +-
src/object/auto/autoroot.h | 34 +-
src/object/auto/autosafe.cpp | 34 +-
src/object/auto/autosafe.h | 34 +-
src/object/auto/autostation.cpp | 34 +-
src/object/auto/autostation.h | 34 +-
src/object/auto/autotower.cpp | 34 +-
src/object/auto/autotower.h | 34 +-
src/object/brain.cpp | 33 +-
src/object/brain.h | 33 +-
src/object/mainmovie.cpp | 33 +-
src/object/mainmovie.h | 33 +-
src/object/motion/motion.cpp | 33 +-
src/object/motion/motion.h | 33 +-
src/object/motion/motionant.cpp | 33 +-
src/object/motion/motionant.h | 33 +-
src/object/motion/motionbee.cpp | 33 +-
src/object/motion/motionbee.h | 33 +-
src/object/motion/motiondummy.cpp | 34 +-
src/object/motion/motiondummy.h | 34 +-
src/object/motion/motionhuman.cpp | 33 +-
src/object/motion/motionhuman.h | 33 +-
src/object/motion/motionmother.cpp | 33 +-
src/object/motion/motionmother.h | 33 +-
src/object/motion/motionspider.cpp | 33 +-
src/object/motion/motionspider.h | 33 +-
src/object/motion/motiontoto.cpp | 33 +-
src/object/motion/motiontoto.h | 33 +-
src/object/motion/motionvehicle.cpp | 33 +-
src/object/motion/motionvehicle.h | 33 +-
src/object/motion/motionworm.cpp | 33 +-
src/object/motion/motionworm.h | 33 +-
src/object/object.cpp | 33 +-
src/object/object.h | 33 +-
src/object/objman.cpp | 33 +-
src/object/objman.h | 33 +-
src/object/robotmain.cpp | 33 +-
src/object/robotmain.h | 33 +-
src/object/task/task.cpp | 33 +-
src/object/task/task.h | 33 +-
src/object/task/taskadvance.cpp | 33 +-
src/object/task/taskadvance.h | 33 +-
src/object/task/taskbuild.cpp | 33 +-
src/object/task/taskbuild.h | 33 +-
src/object/task/taskfire.cpp | 33 +-
src/object/task/taskfire.h | 33 +-
src/object/task/taskfireant.cpp | 33 +-
src/object/task/taskfireant.h | 33 +-
src/object/task/taskflag.cpp | 33 +-
src/object/task/taskflag.h | 33 +-
src/object/task/taskgoto.cpp | 33 +-
src/object/task/taskgoto.h | 33 +-
src/object/task/taskgungoal.cpp | 33 +-
src/object/task/taskgungoal.h | 33 +-
src/object/task/taskinfo.cpp | 33 +-
src/object/task/taskinfo.h | 33 +-
src/object/task/taskmanager.cpp | 33 +-
src/object/task/taskmanager.h | 33 +-
src/object/task/taskmanip.cpp | 33 +-
src/object/task/taskmanip.h | 33 +-
src/object/task/taskpen.cpp | 33 +-
src/object/task/taskpen.h | 33 +-
src/object/task/taskrecover.cpp | 33 +-
src/object/task/taskrecover.h | 33 +-
src/object/task/taskreset.cpp | 33 +-
src/object/task/taskreset.h | 33 +-
src/object/task/tasksearch.cpp | 33 +-
src/object/task/tasksearch.h | 33 +-
src/object/task/taskshield.cpp | 33 +-
src/object/task/taskshield.h | 33 +-
src/object/task/taskspiderexplo.cpp | 33 +-
src/object/task/taskspiderexplo.h | 33 +-
src/object/task/tasktake.cpp | 33 +-
src/object/task/tasktake.h | 33 +-
src/object/task/taskterraform.cpp | 33 +-
src/object/task/taskterraform.h | 33 +-
src/object/task/taskturn.cpp | 33 +-
src/object/task/taskturn.h | 33 +-
src/object/task/taskwait.cpp | 33 +-
src/object/task/taskwait.h | 33 +-
src/physics/physics.cpp | 33 +-
src/physics/physics.h | 34 +-
src/script/cbottoken.cpp | 33 +-
src/script/cbottoken.h | 33 +-
src/script/cmdtoken.cpp | 33 +-
src/script/cmdtoken.h | 33 +-
src/script/dd.cpp | 33 +-
src/script/script.cpp | 33 +-
src/script/script.h | 33 +-
src/sound/oalsound/alsound.cpp | 34 +-
src/sound/oalsound/alsound.h | 34 +-
src/sound/oalsound/buffer.cpp | 33 +-
src/sound/oalsound/buffer.h | 33 +-
src/sound/oalsound/channel.cpp | 33 +-
src/sound/oalsound/channel.h | 33 +-
src/sound/oalsound/check.h | 33 +-
src/sound/sound.cpp | 34 +-
src/sound/sound.h | 34 +-
src/tools/convert_model.cpp | 18 +
src/ui/button.cpp | 34 +-
src/ui/button.h | 34 +-
src/ui/check.cpp | 34 +-
src/ui/check.h | 34 +-
src/ui/color.cpp | 34 +-
src/ui/color.h | 34 +-
src/ui/compass.cpp | 34 +-
src/ui/compass.h | 34 +-
src/ui/control.cpp | 34 +-
src/ui/control.h | 34 +-
src/ui/displayinfo.cpp | 34 +-
src/ui/displayinfo.h | 34 +-
src/ui/displaytext.cpp | 34 +-
src/ui/displaytext.h | 34 +-
src/ui/edit.cpp | 34 +-
src/ui/edit.h | 34 +-
src/ui/editvalue.cpp | 34 +-
src/ui/editvalue.h | 34 +-
src/ui/gauge.cpp | 34 +-
src/ui/gauge.h | 34 +-
src/ui/group.cpp | 33 +-
src/ui/group.h | 33 +-
src/ui/image.cpp | 34 +-
src/ui/image.h | 34 +-
src/ui/interface.cpp | 34 +-
src/ui/interface.h | 34 +-
src/ui/key.cpp | 34 +-
src/ui/key.h | 34 +-
src/ui/label.cpp | 34 +-
src/ui/label.h | 34 +-
src/ui/list.cpp | 34 +-
src/ui/list.h | 34 +-
src/ui/maindialog.cpp | 35 +-
src/ui/maindialog.h | 33 +-
src/ui/mainmap.cpp | 34 +-
src/ui/mainmap.h | 34 +-
src/ui/mainshort.cpp | 34 +-
src/ui/mainshort.h | 34 +-
src/ui/map.cpp | 34 +-
src/ui/map.h | 34 +-
src/ui/scroll.cpp | 34 +-
src/ui/scroll.h | 34 +-
src/ui/shortcut.cpp | 34 +-
src/ui/shortcut.h | 34 +-
src/ui/slider.cpp | 34 +-
src/ui/slider.h | 34 +-
src/ui/studio.cpp | 34 +-
src/ui/studio.h | 34 +-
src/ui/target.cpp | 33 +-
src/ui/target.h | 33 +-
src/ui/window.cpp | 34 +-
src/ui/window.h | 34 +-
test/cbot/CBot_console/CBotConsole.cpp | 18 +
test/cbot/CBot_console/CBotConsole.h | 18 +
test/cbot/CBot_console/CBotDoc.cpp | 18 +
test/cbot/CBot_console/CBotDoc.h | 18 +
test/cbot/CBot_console/CClass.cpp | 18 +
test/cbot/CBot_console/CClass.h | 18 +
test/cbot/CBot_console/main.cpp | 18 +
test/cbot/CBot_console/routines.cpp | 33 +-
test/envs/opengl/light_test.cpp | 18 +
test/envs/opengl/model_test.cpp | 18 +
test/envs/opengl/texture_test.cpp | 18 +
test/envs/opengl/transform_test.cpp | 18 +
test/unit/app/app_test.cpp | 18 +
test/unit/app/system_linux_test.cpp | 18 +
test/unit/app/system_mock.h | 18 +
test/unit/app/system_windows_test.cpp | 18 +
test/unit/common/profile_test.cpp | 18 +
test/unit/graphics/core/device_mock.h | 18 +
test/unit/graphics/engine/engine_mock.h | 18 +
test/unit/graphics/engine/lightman_test.cpp | 18 +
test/unit/graphics/engine/modelfile_test.cpp | 18 +
test/unit/main.cpp | 33 +-
test/unit/math/func_test.cpp | 18 +
test/unit/math/geometry_test.cpp | 18 +
test/unit/math/matrix_test.cpp | 18 +
test/unit/math/vector_test.cpp | 18 +
tools/blender-scripts.py | 4 +-
tools/update-license.sh | 12 +
328 files changed, 11097 insertions(+), 11013 deletions(-)
diff --cc data
index afa8038,89158ea..e19711d
--- a/data
+++ b/data
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit afa8038e719ff4ad0a430212ef5e3ce86d07bf75
-Subproject commit 89158ea0b4876e3c75209df2ee1679076ffca7b2
++Subproject commit e19711d1909b43d269e4a725d5a20d916180acfc
--
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