[ode] 02/09: Merge tag 'upstream/0.14'

[Leopold Palomo-Avellaneda]

This is an automated email from the git hooks/post-receive script.

lepalom-guest pushed a commit to branch master
in repository ode.

commit 436abb33a473a003ac05287596bc5ded6a5a9e4e
Merge: abfad6c b5757a6
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Wed Apr 27 08:31:46 2016 +0200

    Merge tag 'upstream/0.14'
    
    Upstream version 0.14

 .hg_archival.txt                          |   5 +-
 .hgtags                                   |   2 +
 CHANGELOG.txt                             |  15 ++
 GIMPACT/include/GIMPACT/gim_math.h        |   3 +
 build/premake4.lua                        |   9 +-
 configure.ac                              |  18 +-
 drawstuff/src/drawstuff.cpp               |  28 +--
 include/drawstuff/drawstuff.h             |  12 +-
 include/ode/collision.h                   |  14 +-
 libccd/configure.ac                       |   2 +-
 ode/demo/demo_moving_trimesh.cpp          |  98 +++++++-
 ode/demo/demo_trimesh.cpp                 |  70 +++++-
 ode/src/Makefile.am                       |   6 +-
 ode/src/collision_convex_trimesh.cpp      |  99 ++++++++
 ode/src/collision_cylinder_trimesh.cpp    |  57 ++---
 ode/src/collision_kernel.cpp              |   1 +
 ode/src/collision_libccd.cpp              | 167 ++++++++++++-
 ode/src/collision_libccd.h                |   2 +
 ode/src/collision_std.h                   |  12 +-
 ode/src/collision_trimesh_box.cpp         | 380 +++++++++++++-----------------
 ode/src/collision_trimesh_ccylinder.cpp   |  92 ++------
 ode/src/collision_trimesh_colliders.h     |   1 +
 ode/src/collision_trimesh_disabled.cpp    |   1 -
 ode/src/collision_trimesh_gimpact.cpp     |  34 +--
 ode/src/collision_trimesh_internal.h      | 362 +++++++++++++++++++++++-----
 ode/src/collision_trimesh_plane.cpp       |  35 +--
 ode/src/collision_trimesh_ray.cpp         |  24 +-
 ode/src/collision_trimesh_sphere.cpp      |  63 ++---
 ode/src/collision_trimesh_trimesh.cpp     |   9 +-
 ode/src/collision_trimesh_trimesh_new.cpp |  23 +-
 ode/src/collision_util.h                  |  72 ++++--
 ode/src/convex.cpp                        |  46 ++--
 ode/src/quickstep.cpp                     |  52 ++--
 33 files changed, 1172 insertions(+), 642 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ode.git