[ode] 04/14: Merge tag 'upstream/0.13.1_git20150309'
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Wed Sep 9 11:17:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch master
in repository ode.
commit 71be7af28e17f9a4eb889d7e4134fd86ca2a4939
Merge: ee26387 ba277f8
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date: Thu Apr 23 08:54:12 2015 +0200
Merge tag 'upstream/0.13.1_git20150309'
Upstream version 0.13.1~git20150309
.hg_archival.txt | 5 +
.hgignore | 49 +
.hgtags | 12 +
CHANGELOG.txt | 29 +
GIMPACT/Makefile.in | 624 -
GIMPACT/include/GIMPACT/Makefile.in | 516 -
GIMPACT/include/Makefile.in | 623 -
GIMPACT/src/Makefile.in | 622 -
LICENSE-BSD.TXT | 34 +
Makefile.am | 2 +
Makefile.in | 922 -
OPCODE/Ice/Makefile.in | 644 -
OPCODE/Makefile.in | 791 -
OPCODE/Opcode.dsp | 470 +
OPCODE/Opcode.dsw | 29 +
OPCODE/StdAfx.cpp | 10 +
aclocal.m4 | 1155 -
bindings/Makefile.am~ | 0
bindings/Makefile.in | 645 -
bindings/python/setup.py | 4 +-
bindings/swig/Makefile.am~ | 28 -
bindings/swig/Makefile.in | 747 -
bindings/swig/ode.i~ | 66 -
bootstrap | 9 +-
build/premake4.lua | 2 +-
build/premake4.lua~ | 560 -
compile | 347 -
config.guess | 1558 --
config.sub | 1788 --
configure | 20809 -------------------
configure.ac | 43 +-
contrib/BreakableJoints/README.txt | 110 +
contrib/BreakableJoints/common.h | 337 +
contrib/BreakableJoints/diff/common.h.diff | 21 +
contrib/BreakableJoints/diff/joint.cpp.diff | 148 +
contrib/BreakableJoints/diff/joint.h.diff | 18 +
contrib/BreakableJoints/diff/objects.h.diff | 13 +
contrib/BreakableJoints/diff/ode.cpp.diff | 28 +
contrib/BreakableJoints/diff/step.cpp.diff | 130 +
contrib/BreakableJoints/diff/stepfast.cpp.diff | 143 +
contrib/BreakableJoints/diff/test_buggy.cpp.diff | 16 +
contrib/BreakableJoints/joint.cpp | 2803 +++
contrib/BreakableJoints/joint.h | 282 +
contrib/BreakableJoints/objects.h | 252 +
contrib/BreakableJoints/ode.cpp | 1404 ++
contrib/BreakableJoints/step.cpp | 1170 ++
contrib/BreakableJoints/stepfast.cpp | 1212 ++
contrib/BreakableJoints/test_breakable.cpp | 416 +
contrib/BreakableJoints/test_buggy.cpp | 327 +
contrib/DotNetManaged/AssemblyInfo.cpp | 58 +
contrib/DotNetManaged/Body.cpp | 322 +
contrib/DotNetManaged/Body.h | 76 +
contrib/DotNetManaged/CommonMgd.h | 43 +
contrib/DotNetManaged/DotNetManaged.sln | 21 +
contrib/DotNetManaged/DotNetManaged.vcproj | 379 +
contrib/DotNetManaged/Geom.cpp | 219 +
contrib/DotNetManaged/Geom.h | 75 +
contrib/DotNetManaged/Joint.cpp | 35 +
contrib/DotNetManaged/Joint.h | 21 +
contrib/DotNetManaged/JointAMotor.cpp | 162 +
contrib/DotNetManaged/JointAMotor.h | 62 +
contrib/DotNetManaged/JointBall.cpp | 79 +
contrib/DotNetManaged/JointBall.h | 38 +
contrib/DotNetManaged/JointFixed.cpp | 67 +
contrib/DotNetManaged/JointFixed.h | 37 +
contrib/DotNetManaged/JointGroup.cpp | 53 +
contrib/DotNetManaged/JointGroup.h | 33 +
contrib/DotNetManaged/JointHinge.cpp | 121 +
contrib/DotNetManaged/JointHinge.h | 195 +
contrib/DotNetManaged/JointHinge2.cpp | 133 +
contrib/DotNetManaged/JointHinge2.h | 48 +
contrib/DotNetManaged/JointSlider.cpp | 102 +
contrib/DotNetManaged/JointSlider.h | 158 +
contrib/DotNetManaged/Release/ode.dll | Bin 0 -> 196608 bytes
contrib/DotNetManaged/Space.cpp | 53 +
contrib/DotNetManaged/Space.h | 33 +
contrib/DotNetManaged/Stdafx.cpp | 5 +
contrib/DotNetManaged/Stdafx.h | 12 +
contrib/DotNetManaged/TEST.h | 17 +
contrib/DotNetManaged/World.cpp | 74 +
contrib/DotNetManaged/World.h | 67 +
contrib/GeomTransformGroup/GeomTransformGroup.cpp | 218 +
contrib/GeomTransformGroup/GeomTransformGroup.h | 29 +
contrib/GeomTransformGroup/README.txt | 148 +
contrib/InteractiveCollisions/AUTHORS | 1 +
contrib/InteractiveCollisions/COPYING | 674 +
contrib/InteractiveCollisions/ChangeLog | 1 +
contrib/InteractiveCollisions/INSTALL | 365 +
contrib/InteractiveCollisions/Makefile.am | 5 +
contrib/InteractiveCollisions/NEWS | 1 +
contrib/InteractiveCollisions/README | 8 +
contrib/InteractiveCollisions/bootstrap | 7 +
contrib/InteractiveCollisions/configure.ac | 49 +
.../deps/AntTweakBar/AntTweakBar_Doc.url | 3 +
.../deps/AntTweakBar/ChangeLog.txt | 178 +
.../deps/AntTweakBar/License.txt | 24 +
.../deps/AntTweakBar/Makefile.am | 4 +
.../deps/AntTweakBar/Readme.txt | 15 +
.../deps/AntTweakBar/bootstrap | 6 +
.../deps/AntTweakBar/configure.ac | 41 +
.../deps/AntTweakBar/include/AntTweakBar.h | 370 +
.../deps/AntTweakBar/include/Makefile.am | 2 +
.../deps/AntTweakBar/src/AntPerfTimer.h | 56 +
.../deps/AntTweakBar/src/LoadOGL.cpp | 531 +
.../deps/AntTweakBar/src/LoadOGL.h | 397 +
.../deps/AntTweakBar/src/LoadOGLCore.cpp | 489 +
.../deps/AntTweakBar/src/LoadOGLCore.h | 349 +
.../deps/AntTweakBar/src/Makefile.am | 34 +
.../deps/AntTweakBar/src/MiniGLFW.h | 109 +
.../deps/AntTweakBar/src/MiniGLUT.h | 142 +
.../deps/AntTweakBar/src/MiniSDL12.h | 339 +
.../deps/AntTweakBar/src/MiniSDL13.h | 428 +
.../deps/AntTweakBar/src/MiniSFML16.h | 220 +
.../deps/AntTweakBar/src/TwBar.cpp | 7756 +++++++
.../deps/AntTweakBar/src/TwBar.h | 437 +
.../deps/AntTweakBar/src/TwColors.cpp | 153 +
.../deps/AntTweakBar/src/TwColors.h | 80 +
.../deps/AntTweakBar/src/TwDirect3D10.cpp | 1291 ++
.../deps/AntTweakBar/src/TwDirect3D10.h | 108 +
.../deps/AntTweakBar/src/TwDirect3D11.cpp | 1653 ++
.../deps/AntTweakBar/src/TwDirect3D11.h | 117 +
.../deps/AntTweakBar/src/TwDirect3D11.hlsl | 83 +
.../deps/AntTweakBar/src/TwDirect3D9.cpp | 631 +
.../deps/AntTweakBar/src/TwDirect3D9.h | 90 +
.../deps/AntTweakBar/src/TwEventGLFW.c | 212 +
.../deps/AntTweakBar/src/TwEventGLUT.c | 150 +
.../deps/AntTweakBar/src/TwEventSDL.c | 43 +
.../deps/AntTweakBar/src/TwEventSDL12.c | 71 +
.../deps/AntTweakBar/src/TwEventSDL13.c | 129 +
.../deps/AntTweakBar/src/TwEventSFML.cpp | 173 +
.../deps/AntTweakBar/src/TwEventWin.c | 256 +
.../deps/AntTweakBar/src/TwFonts.cpp | 3944 ++++
.../deps/AntTweakBar/src/TwFonts.h | 65 +
.../deps/AntTweakBar/src/TwGraph.h | 58 +
.../deps/AntTweakBar/src/TwMgr.cpp | 6626 ++++++
.../deps/AntTweakBar/src/TwMgr.h | 514 +
.../deps/AntTweakBar/src/TwOpenGL.cpp | 851 +
.../deps/AntTweakBar/src/TwOpenGL.h | 96 +
.../deps/AntTweakBar/src/TwOpenGLCore.cpp | 744 +
.../deps/AntTweakBar/src/TwOpenGLCore.h | 96 +
.../deps/AntTweakBar/src/TwPrecomp.cpp | 1 +
.../deps/AntTweakBar/src/TwPrecomp.h | 91 +
.../deps/AntTweakBar/src/d3d10vs2003.h | 46 +
.../deps/AntTweakBar/src/res/FontChars.txt | 232 +
.../deps/AntTweakBar/src/res/FontLargeAA.pgm | 1197 ++
.../deps/AntTweakBar/src/res/FontNormal.pgm | 895 +
.../deps/AntTweakBar/src/res/FontNormalAA.pgm | 1012 +
.../deps/AntTweakBar/src/res/FontSmall.pgm | 603 +
.../deps/AntTweakBar/src/res/TwXCursors.h | 908 +
.../deps/AntTweakBar/src/res/cur00000.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00001.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00002.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00003.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00004.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00005.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00006.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00007.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00008.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00009.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00010.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00011.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00012.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/cur00013.cur | Bin 0 -> 326 bytes
.../deps/AntTweakBar/src/res/curs00.pbm | 32 +
.../deps/AntTweakBar/src/res/curs01.pbm | 32 +
.../deps/AntTweakBar/src/res/curs02.pbm | 32 +
.../deps/AntTweakBar/src/res/curs03.pbm | 32 +
.../deps/AntTweakBar/src/res/curs04.pbm | 32 +
.../deps/AntTweakBar/src/res/curs05.pbm | 32 +
.../deps/AntTweakBar/src/res/curs06.pbm | 32 +
.../deps/AntTweakBar/src/res/curs07.pbm | 32 +
.../deps/AntTweakBar/src/res/curs08.pbm | 32 +
.../deps/AntTweakBar/src/res/curs09.pbm | 32 +
.../deps/AntTweakBar/src/res/curs10.pbm | 32 +
.../deps/AntTweakBar/src/res/curs11.pbm | 32 +
.../deps/AntTweakBar/src/res/curs12.pbm | 32 +
.../deps/AntTweakBar/src/res/curs13.pbm | 32 +
.../deps/AntTweakBar/src/res/mask00.pbm | 32 +
.../deps/AntTweakBar/src/res/mask01.pbm | 32 +
.../deps/AntTweakBar/src/res/mask02.pbm | 32 +
.../deps/AntTweakBar/src/res/mask03.pbm | 32 +
.../deps/AntTweakBar/src/res/mask04.pbm | 32 +
.../deps/AntTweakBar/src/res/mask05.pbm | 32 +
.../deps/AntTweakBar/src/res/mask06.pbm | 32 +
.../deps/AntTweakBar/src/res/mask07.pbm | 32 +
.../deps/AntTweakBar/src/res/mask08.pbm | 32 +
.../deps/AntTweakBar/src/res/mask09.pbm | 32 +
.../deps/AntTweakBar/src/res/mask10.pbm | 32 +
.../deps/AntTweakBar/src/res/mask11.pbm | 32 +
.../deps/AntTweakBar/src/res/mask12.pbm | 32 +
.../deps/AntTweakBar/src/res/mask13.pbm | 32 +
.../deps/AntTweakBar/src/resource.h | 29 +
contrib/InteractiveCollisions/deps/Makefile.am | 2 +
contrib/InteractiveCollisions/src/Makefile.am | 17 +
contrib/InteractiveCollisions/src/camera.cpp | 222 +
contrib/InteractiveCollisions/src/camera.hpp | 47 +
contrib/InteractiveCollisions/src/main.cpp | 979 +
contrib/Mac_CFMCarbon/CW7_projects.sit.bin | Bin 0 -> 46592 bytes
contrib/Mac_CFMCarbon/README.txt | 95 +
contrib/Mac_CFMCarbon/mac_source/CommonPrefix.h | 6 +
contrib/Mac_CFMCarbon/mac_source/DSPrefix.h | 6 +
contrib/Mac_CFMCarbon/mac_source/DebugPrefix.h | 10 +
contrib/Mac_CFMCarbon/mac_source/ExamplesPrefix.h | 13 +
contrib/Mac_CFMCarbon/mac_source/ODETestPrefix.h | 13 +
contrib/Mac_CFMCarbon/mac_source/ReleasePrefix.h | 6 +
.../mac_source/drawstuff/src/mac_glut_carbon.cpp | 284 +
contrib/Mac_CFMCarbon/mac_source/include/GL/gl.h | 2 +
contrib/Mac_CFMCarbon/mac_source/include/GL/glu.h | 2 +
.../Mac_CFMCarbon/mac_source/include/ode/config.h | 52 +
.../mac_source/ode/test/test_stability1.cpp | 289 +
.../mac_source/ode/test/test_stacktest.c | 197 +
contrib/Ode.NET/Drawstuff/AssemblyInfo.cs | 18 +
contrib/Ode.NET/Drawstuff/Drawstuff.cs | 58 +
contrib/Ode.NET/Drawstuff/premake.lua | 19 +
contrib/Ode.NET/Ode/AssemblyInfo.cs | 18 +
contrib/Ode.NET/Ode/Ode.cs | 1870 ++
contrib/Ode.NET/Ode/premake.lua | 31 +
contrib/Ode.NET/README.TXT | 68 +
contrib/Ode.NET/Tests/BoxStack.cs | 261 +
contrib/Ode.NET/Tests/premake.lua | 27 +
contrib/Ode.NET/premake.lua | 29 +
contrib/OdeModelProcessor/LICENSE-BSD.TXT | 37 +
contrib/OdeModelProcessor/LICENSE.TXT | 502 +
contrib/OdeModelProcessor/OdeModelProcessor.sln | 20 +
.../OdeModelProcessor/OdeModelProcessor.cs | 354 +
.../OdeModelProcessor/OdeModelProcessor.csproj | 69 +
.../OdeModelProcessor/Properties/AssemblyInfo.cs | 35 +
.../Properties/Settings.Designer.cs | 26 +
.../OdeModelProcessor/Properties/Settings.settings | 6 +
contrib/OdeModelProcessor/README.TXT | 78 +
contrib/README | 19 +
contrib/TerrainAndCone/collision_std_internal.h | 100 +
contrib/TerrainAndCone/dCone.cpp | 504 +
contrib/TerrainAndCone/dTerrainY.cpp | 662 +
contrib/TerrainAndCone/dTerrainZ.cpp | 659 +
contrib/TerrainAndCone/readme.txt | 322 +
contrib/TerrainAndCone/test_boxstackb.cpp | 1375 ++
contrib/dCylinder/dCylinder.cpp | 1445 ++
contrib/dCylinder/dCylinder.h | 14 +
contrib/dCylinder/readme.txt | 62 +
contrib/dRay/Include/dRay.h | 15 +
contrib/dRay/README.txt | 16 +
contrib/dRay/Test/test_ray.cpp | 1372 ++
contrib/dRay/dRay.cpp | 119 +
contrib/dRay/dRay_Box.cpp | 134 +
contrib/dRay/dRay_CCylinder.cpp | 199 +
contrib/dRay/dRay_Plane.cpp | 35 +
contrib/dRay/dRay_Sphere.cpp | 95 +
contrib/dRay/dxRay.h | 32 +
depcomp | 791 -
drawstuff/Makefile.in | 624 -
drawstuff/dstest/Makefile.in | 598 -
drawstuff/src/Makefile.in | 639 -
include/Makefile.in | 623 -
include/drawstuff/Makefile.in | 511 -
include/ode/Makefile.in | 625 -
include/ode/misc.h | 11 +-
include/ode/objects.h | 674 +-
include/ode/precision.h | 16 -
include/ode/version.h | 6 -
install-sh | 527 -
libccd/Makefile.in | 789 -
libccd/aclocal.m4 | 9762 ---------
libccd/configure | 18260 ----------------
libccd/src/Makefile.in | 729 -
libccd/src/Makefile.include | 100 +
libccd/src/config.h.in | 98 -
libccd/src/testsuites/Makefile.in | 740 -
libccd/src/testsuites/cu/Makefile.in | 573 -
libccd/src/testsuites/cu/check-regressions | 413 +
libccd/src/testsuites/cu/latest.sh | 17 +
libccd/src/testsuites/regressions/TSBoxBox.err | 12 +
libccd/src/testsuites/regressions/TSBoxBox.out | 44 +
libccd/src/testsuites/regressions/TSBoxCyl.out | 32 +
libccd/src/testsuites/regressions/TSCylCyl.err | 6 +
libccd/src/testsuites/regressions/TSCylCyl.out | 24 +
libccd/src/testsuites/regressions/TSMPRBoxBox.err | 6 +
libccd/src/testsuites/regressions/TSMPRBoxBox.out | 40 +
libccd/src/testsuites/regressions/TSMPRBoxCyl.out | 32 +
libccd/src/testsuites/regressions/TSMPRCylCyl.err | 6 +
libccd/src/testsuites/regressions/TSMPRCylCyl.out | 24 +
libccd/src/testsuites/regressions/TSPt.err | 39 +
ltmain.sh | 9675 ---------
m4/libtool.m4 | 8008 -------
m4/ltoptions.m4 | 384 -
m4/ltsugar.m4 | 123 -
m4/ltversion.m4 | 23 -
m4/lt~obsolete.m4 | 98 -
missing | 215 -
ode/Makefile.am | 4 +-
ode/Makefile.in | 625 -
ode/demo/Makefile.in | 1104 -
ode/demo/demo_gyroscopic.cpp | 4 +-
ode/demo/demo_plane2d.cpp | 117 +-
ode/doc/Doxyfile | 1521 --
ode/doc/Doxyfile.in | 2331 +++
ode/doc/Makefile.am | 11 +
ode/src/Makefile.am | 11 +-
ode/src/Makefile.in | 1056 -
ode/src/collision_util.cpp | 9 +
ode/src/config.h.in | 324 -
ode/src/joints/Makefile.in | 653 -
ode/src/joints/dball.cpp | 9 +
ode/src/lcp.cpp | 1 +
ode/src/misc.cpp | 2 +-
ode/src/odeou.h | 2 +
ode/src/quickstep.cpp | 4818 +++--
ode/src/ray.cpp | 85 +-
ode/src/scrapbook.cpp_deprecated | 485 +
ode/src/stack.cpp_deprecated | 114 +
ode/src/stack.h_deprecated | 138 +
ode/src/step.cpp | 116 +-
ode/src/threading_base.cpp | 18 +
ode/src/threading_base.h | 4 +
ode/src/threading_impl_posix.h | 1184 +-
ode/src/threadingutils.h | 30 +-
ou/Makefile.in | 788 -
ou/aclocal.m4 | 9762 ---------
ou/configure | 20023 ------------------
ou/include/ou/Makefile.in | 441 -
ou/include/ou/assert.h | 4 +-
ou/include/ou/platform.h | 2 +-
ou/src/ou/Makefile.in | 584 -
ou/test/Makefile.in | 575 -
ou/test/vs2005/outest.vcproj | 420 +
ou/test/vs6/outest.dsp | 105 +
py-compile | 170 -
test-driver | 127 -
tests/Makefile.am | 2 +-
tests/Makefile.in | 1099 -
tests/UnitTest++/Makefile.in | 627 -
tests/UnitTest++/Makefile.ori | 93 +
tests/UnitTest++/TestUnitTest++.vsnet2003.vcproj | 168 +
tests/UnitTest++/TestUnitTest++.vsnet2005.vcproj | 248 +
tests/UnitTest++/UnitTest++.vsnet2003.sln | 30 +
tests/UnitTest++/UnitTest++.vsnet2003.vcproj | 217 +
tests/UnitTest++/UnitTest++.vsnet2005.sln | 29 +
tests/UnitTest++/UnitTest++.vsnet2005.vcproj | 306 +
tests/UnitTest++/src/Makefile.in | 768 -
tests/UnitTest++/src/Posix/Makefile.in | 611 -
tests/UnitTest++/src/Win32/Makefile.in | 608 -
tests/UnitTest++/src/tests/Main.cpp | 8 +
tests/UnitTest++/src/tests/RecordingReporter.h | 92 +
tests/UnitTest++/src/tests/TestAssertHandler.cpp | 44 +
tests/UnitTest++/src/tests/TestCheckMacros.cpp | 710 +
tests/UnitTest++/src/tests/TestChecks.cpp | 290 +
.../src/tests/TestDeferredTestReporter.cpp | 104 +
tests/UnitTest++/src/tests/TestMemoryOutStream.cpp | 150 +
tests/UnitTest++/src/tests/TestTest.cpp | 97 +
tests/UnitTest++/src/tests/TestTestList.cpp | 50 +
tests/UnitTest++/src/tests/TestTestMacros.cpp | 171 +
tests/UnitTest++/src/tests/TestTestResults.cpp | 111 +
tests/UnitTest++/src/tests/TestTestRunner.cpp | 233 +
tests/UnitTest++/src/tests/TestTestSuite.cpp | 13 +
tests/UnitTest++/src/tests/TestTimeConstraint.cpp | 57 +
.../src/tests/TestTimeConstraintMacro.cpp | 29 +
tests/UnitTest++/src/tests/TestUnitTest++.cpp | 137 +
tests/UnitTest++/src/tests/TestXmlTestReporter.cpp | 183 +
tests/joints/Makefile.am | 3 +
tests/joints/Makefile.in | 616 -
tests/joints/dball.cpp | 81 +
web/ODElogo.png | Bin 0 -> 70911 bytes
362 files changed, 75200 insertions(+), 131777 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ode.git
More information about the Pkg-games-commits
mailing list