[box2d] 26/31: Merge tag 'upstream/2.0.1+dfsg1'

Markus Koschany apo-guest at moszumanska.debian.org
Fri Mar 13 17:28:32 UTC 2015


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

apo-guest pushed a commit to branch master
in repository box2d.

commit 4e578c23bb5fdd57b5dea9d20b5f677f391c8d55
Merge: e958d46 e1d1e57
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Mar 13 18:18:12 2015 +0100

    Merge tag 'upstream/2.0.1+dfsg1'
    
    Upstream version 2.0.1+dfsg1
    
    # gpg: Signature made Fri 13 Mar 2015 18:18:08 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 Build/CodeBlocks/Box2D.workspace                   |   16 +
 Build/CodeBlocks/Engine.cbp                        |  104 ++
 Build/CodeBlocks/FreeGLUT.cbp                      |  126 ++
 Build/CodeBlocks/GLUI.cbp                          |   92 ++
 Build/CodeBlocks/HelloWorld.cbp                    |   46 +
 Build/CodeBlocks/TestBed.cbp                       |   91 ++
 Build/VC8/Box2D.sln                                |   51 +
 Build/VC8/Box2D.vcproj                             |  425 +++++++
 Build/VC8/HelloWorld.vcproj                        |  183 +++
 Build/VC8/TestBed.vcproj                           |  352 ++++++
 Build/VC8/freeglut.vcproj                          |  275 +++++
 Build/VC8/glui.vcproj                              |  308 +++++
 Build/Xcode/Box2D.xcodeproj/project.pbxproj        | 1223 ++++++++++++++++++
 Build/Xcode/Box2DProj.xcconfig                     |    8 +
 Build/Xcode/Box2DTarget.xcconfig                   |   12 +
 Build/Xcode/Box2D_Prefix.pch                       |   13 +
 Build/Xcode/TestBed App-Info.plist                 |   26 +
 Build/Xcode/TestBed.icns                           |  Bin 0 -> 24132 bytes
 Clean.bat                                          |   16 +
 Contrib/Box2D.Net/AABB.cpp                         |   32 +
 Contrib/Box2D.Net/AssemblyInfo.cpp                 |   40 +
 Contrib/Box2D.Net/Body.cpp                         |  243 ++++
 Contrib/Box2D.Net/BodyDef.cpp                      |  168 +++
 Contrib/Box2D.Net/Box2D.Net.vcproj                 |  291 +++++
 Contrib/Box2D.Net/Contact.cpp                      |   53 +
 Contrib/Box2D.Net/Delegates.cpp                    |   28 +
 Contrib/Box2D.Net/Joint.cpp                        |  106 ++
 Contrib/Box2D.Net/JointDef.cpp                     |  178 +++
 Contrib/Box2D.Net/Manifold.cpp                     |   44 +
 Contrib/Box2D.Net/ManifoldPoint.cpp                |  100 ++
 Contrib/Box2D.Net/MassData.cpp                     |   64 +
 Contrib/Box2D.Net/Matrix.cpp                       |   94 ++
 Contrib/Box2D.Net/RevoluteJoint.cpp                |  190 +++
 Contrib/Box2D.Net/Shape.cpp                        |  153 +++
 Contrib/Box2D.Net/Shape.h                          |  125 ++
 Contrib/Box2D.Net/ShapeDef.cpp                     |  202 +++
 Contrib/Box2D.Net/ShapeType.cpp                    |   18 +
 Contrib/Box2D.Net/Stdafx.h                         |    8 +
 Contrib/Box2D.Net/VariousImplementations.cpp       |   16 +
 Contrib/Box2D.Net/Vector.cpp                       |   81 ++
 Contrib/Box2D.Net/World.cpp                        |  162 +++
 Contrib/Box2D.Net/XForm.cpp                        |   47 +
 Contrib/TestBed.Net/MainWindow.Designer.cs         |  220 ++++
 Contrib/TestBed.Net/MainWindow.cs                  |  132 ++
 Contrib/TestBed.Net/MainWindow.resx                |  123 ++
 Contrib/TestBed.Net/Program.cs                     |   30 +
 Contrib/TestBed.Net/Properties/AssemblyInfo.cs     |   33 +
 Contrib/TestBed.Net/Renderer.cs                    |  176 +++
 Contrib/TestBed.Net/Settings.cs                    |   20 +
 Contrib/TestBed.Net/Test.cs                        |  179 +++
 Contrib/TestBed.Net/TestBed.Net.csproj             |   74 ++
 Contrib/TestBed.Net/Tests/Bridge.cs                |   59 +
 Documentation/API.chm                              |  Bin 0 -> 192712 bytes
 Documentation/docbook.bat                          |    1 +
 Documentation/images/bodyOrigin.gif                |  Bin 0 -> 912 bytes
 Documentation/images/convex_concave.gif            |  Bin 0 -> 2303 bytes
 Documentation/images/debugDraw.gif                 |  Bin 0 -> 19299 bytes
 Documentation/images/distanceJoint.gif             |  Bin 0 -> 2358 bytes
 Documentation/images/gearJoint.gif                 |  Bin 0 -> 2119 bytes
 Documentation/images/prismaticJoint.gif            |  Bin 0 -> 2298 bytes
 Documentation/images/pulleyJoint.gif               |  Bin 0 -> 3526 bytes
 Documentation/images/revoluteJoint.gif             |  Bin 0 -> 1920 bytes
 Documentation/images/testbed.gif                   |  Bin 0 -> 17206 bytes
 Documentation/latex/Makefile                       |   39 +
 Documentation/manual.css                           |   75 ++
 Documentation/manual.html                          |  447 +++++++
 Documentation/manual.xml                           | 1297 ++++++++++++++++++++
 Documentation/manual.xsl                           |    8 +
 Examples/HelloWorld/HelloWorld.cpp                 |  110 ++
 Examples/TestBed/Framework/Main.cpp                |  357 ++++++
 Examples/TestBed/Framework/Render.cpp              |  204 +++
 Examples/TestBed/Framework/Render.h                |   50 +
 Examples/TestBed/Framework/Test.cpp                |  353 ++++++
 Examples/TestBed/Framework/Test.h                  |  169 +++
 Examples/TestBed/Makefile                          |   61 +
 Examples/TestBed/Tests/ApplyForce.h                |  123 ++
 Examples/TestBed/Tests/Biped.cpp                   |  187 +++
 Examples/TestBed/Tests/Biped.h                     |   25 +
 Examples/TestBed/Tests/BipedDef.cpp                |  478 ++++++++
 Examples/TestBed/Tests/BipedDef.h                  |   51 +
 Examples/TestBed/Tests/BipedTest.h                 |   87 ++
 Examples/TestBed/Tests/Bridge.h                    |   76 ++
 Examples/TestBed/Tests/BroadPhaseTest.cpp          |  307 +++++
 Examples/TestBed/Tests/BroadPhaseTest.h            |   87 ++
 Examples/TestBed/Tests/CCDTest.h                   |  231 ++++
 Examples/TestBed/Tests/Car.h                       |  215 ++++
 Examples/TestBed/Tests/Chain.h                     |   72 ++
 Examples/TestBed/Tests/CollisionFiltering.h        |  145 +++
 Examples/TestBed/Tests/CollisionProcessing.h       |  176 +++
 Examples/TestBed/Tests/CompoundShapes.h            |  149 +++
 Examples/TestBed/Tests/ContactCallbackTest.h       |  260 ++++
 Examples/TestBed/Tests/DistanceTest.h              |  169 +++
 Examples/TestBed/Tests/Dominos.h                   |  215 ++++
 Examples/TestBed/Tests/ElasticBody.h               |  465 +++++++
 Examples/TestBed/Tests/Gears.h                     |  145 +++
 Examples/TestBed/Tests/MotorsAndLimits.h           |  148 +++
 Examples/TestBed/Tests/PolyCollision.h             |  119 ++
 Examples/TestBed/Tests/PolyShapes.h                |  176 +++
 Examples/TestBed/Tests/Pulleys.h                   |   98 ++
 Examples/TestBed/Tests/Pyramid.h                   |   74 ++
 Examples/TestBed/Tests/SensorTest.h                |  121 ++
 Examples/TestBed/Tests/ShapeEditing.h              |   99 ++
 Examples/TestBed/Tests/SliderCrank.h               |  139 +++
 Examples/TestBed/Tests/TestEntries.cpp             |   90 ++
 Examples/TestBed/Tests/TheoJansen.h                |  239 ++++
 Examples/TestBed/Tests/TimeOfImpact.h              |  117 ++
 Examples/TestBed/Tests/VaryingFriction.h           |  122 ++
 Examples/TestBed/Tests/VaryingRestitution.h        |   66 +
 Examples/TestBed/Tests/VerticalStack.h             |  121 ++
 Examples/TestBed/Tests/Web.h                       |  215 ++++
 Include/Box2D.h                                    |   52 +
 License.txt                                        |   18 +
 Makefile                                           |   28 +
 Readme.txt                                         |   19 +
 Source/Collision/Shapes/b2CircleShape.cpp          |  120 ++
 Source/Collision/Shapes/b2CircleShape.h            |   92 ++
 Source/Collision/Shapes/b2PolygonShape.cpp         |  449 +++++++
 Source/Collision/Shapes/b2PolygonShape.h           |  163 +++
 Source/Collision/Shapes/b2Shape.cpp                |  167 +++
 Source/Collision/Shapes/b2Shape.h                  |  285 +++++
 Source/Collision/b2BroadPhase.cpp                  |  667 ++++++++++
 Source/Collision/b2BroadPhase.h                    |  146 +++
 Source/Collision/b2CollideCircle.cpp               |  168 +++
 Source/Collision/b2CollidePoly.cpp                 |  352 ++++++
 Source/Collision/b2Collision.cpp                   |   72 ++
 Source/Collision/b2Collision.h                     |  154 +++
 Source/Collision/b2Distance.cpp                    |  364 ++++++
 Source/Collision/b2PairManager.cpp                 |  396 ++++++
 Source/Collision/b2PairManager.h                   |  121 ++
 Source/Collision/b2TimeOfImpact.cpp                |  112 ++
 Source/Common/Fixed.h                              |  477 +++++++
 Source/Common/b2BlockAllocator.cpp                 |  205 ++++
 Source/Common/b2BlockAllocator.h                   |   59 +
 Source/Common/b2Math.cpp                           |   54 +
 Source/Common/b2Math.h                             |  636 ++++++++++
 Source/Common/b2Settings.cpp                       |   51 +
 Source/Common/b2Settings.h                         |  176 +++
 Source/Common/b2StackAllocator.cpp                 |   83 ++
 Source/Common/b2StackAllocator.h                   |   60 +
 Source/Common/jtypes.h                             |  139 +++
 Source/Dynamics/Contacts/b2CircleContact.cpp       |  121 ++
 Source/Dynamics/Contacts/b2CircleContact.h         |   46 +
 Source/Dynamics/Contacts/b2Contact.cpp             |  172 +++
 Source/Dynamics/Contacts/b2Contact.h               |  183 +++
 Source/Dynamics/Contacts/b2ContactSolver.cpp       |  360 ++++++
 Source/Dynamics/Contacts/b2ContactSolver.h         |   77 ++
 Source/Dynamics/Contacts/b2NullContact.h           |   33 +
 .../Dynamics/Contacts/b2PolyAndCircleContact.cpp   |  157 +++
 Source/Dynamics/Contacts/b2PolyAndCircleContact.h  |   44 +
 Source/Dynamics/Contacts/b2PolyContact.cpp         |  156 +++
 Source/Dynamics/Contacts/b2PolyContact.h           |   44 +
 Source/Dynamics/Joints/b2DistanceJoint.cpp         |  206 ++++
 Source/Dynamics/Joints/b2DistanceJoint.h           |   96 ++
 Source/Dynamics/Joints/b2GearJoint.cpp             |  253 ++++
 Source/Dynamics/Joints/b2GearJoint.h               |  109 ++
 Source/Dynamics/Joints/b2Joint.cpp                 |  134 ++
 Source/Dynamics/Joints/b2Joint.h                   |  219 ++++
 Source/Dynamics/Joints/b2MouseJoint.cpp            |  146 +++
 Source/Dynamics/Joints/b2MouseJoint.h              |  102 ++
 Source/Dynamics/Joints/b2PrismaticJoint.cpp        |  478 ++++++++
 Source/Dynamics/Joints/b2PrismaticJoint.h          |  176 +++
 Source/Dynamics/Joints/b2PulleyJoint.cpp           |  430 +++++++
 Source/Dynamics/Joints/b2PulleyJoint.h             |  153 +++
 Source/Dynamics/Joints/b2RevoluteJoint.cpp         |  399 ++++++
 Source/Dynamics/Joints/b2RevoluteJoint.h           |  172 +++
 Source/Dynamics/b2Body.cpp                         |  394 ++++++
 Source/Dynamics/b2Body.h                           |  587 +++++++++
 Source/Dynamics/b2ContactManager.cpp               |  240 ++++
 Source/Dynamics/b2ContactManager.h                 |   54 +
 Source/Dynamics/b2Island.cpp                       |  420 +++++++
 Source/Dynamics/b2Island.h                         |   88 ++
 Source/Dynamics/b2World.cpp                        | 1064 ++++++++++++++++
 Source/Dynamics/b2World.h                          |  253 ++++
 Source/Dynamics/b2WorldCallbacks.cpp               |   63 +
 Source/Dynamics/b2WorldCallbacks.h                 |  172 +++
 Source/Makefile                                    |  134 ++
 TODO.txt                                           |  157 +++
 177 files changed, 29611 insertions(+)

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



More information about the Pkg-games-commits mailing list