Merge default into minor

Browse Source

--HG--
branch : minor

...

This commit is contained in:

Alex Szpakowski

2017-01-21 12:06:35 -04:00

parent ff336041a9 f45c6a0d74

commit a6669a8bb2

104 changed files with 16 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/libraries/Box2D/Box2D.h

Executable → Regular

src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp

Executable → Regular

src/libraries/Box2D/Collision/Shapes/b2ChainShape.h

Executable → Regular

src/libraries/Box2D/Collision/Shapes/b2CircleShape.cpp

Executable → Regular

src/libraries/Box2D/Collision/Shapes/b2CircleShape.h

Executable → Regular

src/libraries/Box2D/Collision/Shapes/b2EdgeShape.cpp

Executable → Regular

src/libraries/Box2D/Collision/Shapes/b2EdgeShape.h

Executable → Regular

src/libraries/Box2D/Collision/Shapes/b2PolygonShape.cpp

Executable → Regular

src/libraries/Box2D/Collision/Shapes/b2PolygonShape.h

Executable → Regular

src/libraries/Box2D/Collision/Shapes/b2Shape.h

Executable → Regular

src/libraries/Box2D/Collision/b2BroadPhase.cpp

Executable → Regular

src/libraries/Box2D/Collision/b2BroadPhase.h

Executable → Regular

src/libraries/Box2D/Collision/b2CollideCircle.cpp

Executable → Regular

src/libraries/Box2D/Collision/b2CollideEdge.cpp

Executable → Regular

src/libraries/Box2D/Collision/b2CollidePolygon.cpp

Executable → Regular

src/libraries/Box2D/Collision/b2Collision.cpp

Executable → Regular

src/libraries/Box2D/Collision/b2Collision.h

Executable → Regular

src/libraries/Box2D/Collision/b2Distance.cpp

Executable → Regular

src/libraries/Box2D/Collision/b2Distance.h

Executable → Regular

src/libraries/Box2D/Collision/b2DynamicTree.cpp

Executable → Regular

src/libraries/Box2D/Collision/b2DynamicTree.h

Executable → Regular

src/libraries/Box2D/Collision/b2TimeOfImpact.cpp

Executable → Regular

src/libraries/Box2D/Collision/b2TimeOfImpact.h

Executable → Regular

src/libraries/Box2D/Common/b2BlockAllocator.cpp

Executable → Regular

src/libraries/Box2D/Common/b2BlockAllocator.h

Executable → Regular

src/libraries/Box2D/Common/b2Draw.cpp

Executable → Regular

src/libraries/Box2D/Common/b2Draw.h

Executable → Regular

src/libraries/Box2D/Common/b2GrowableStack.h

Executable → Regular

src/libraries/Box2D/Common/b2Math.cpp

Executable → Regular

src/libraries/Box2D/Common/b2Math.h

Executable → Regular

src/libraries/Box2D/Common/b2Settings.cpp

Executable → Regular

src/libraries/Box2D/Common/b2Settings.h

Executable → Regular

src/libraries/Box2D/Common/b2StackAllocator.cpp

Executable → Regular

src/libraries/Box2D/Common/b2StackAllocator.h

Executable → Regular

src/libraries/Box2D/Common/b2Timer.cpp

Executable → Regular

src/libraries/Box2D/Common/b2Timer.h

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2CircleContact.h

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2Contact.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2Contact.h

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2ContactSolver.h

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Contacts/b2PolygonContact.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2DistanceJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2FrictionJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2GearJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2GearJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2Joint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2Joint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2MotorJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2MouseJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2PrismaticJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2PulleyJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2RevoluteJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2RopeJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2WeldJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/Joints/b2WheelJoint.h

Executable → Regular

src/libraries/Box2D/Dynamics/b2Body.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/b2Body.h

Executable → Regular

src/libraries/Box2D/Dynamics/b2ContactManager.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/b2ContactManager.h

Executable → Regular

src/libraries/Box2D/Dynamics/b2Fixture.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/b2Fixture.h

Executable → Regular

src/libraries/Box2D/Dynamics/b2Island.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/b2Island.h

Executable → Regular

src/libraries/Box2D/Dynamics/b2TimeStep.h

Executable → Regular

src/libraries/Box2D/Dynamics/b2World.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/b2World.h

Executable → Regular

src/libraries/Box2D/Dynamics/b2WorldCallbacks.cpp

Executable → Regular

src/libraries/Box2D/Dynamics/b2WorldCallbacks.h

Executable → Regular

src/libraries/Box2D/Rope/b2Rope.cpp

Executable → Regular

src/libraries/Box2D/Rope/b2Rope.h

Executable → Regular

src/libraries/lz4/lz4.c

Executable → Regular

src/libraries/lz4/lz4.h

Executable → Regular

src/libraries/lz4/lz4hc.c

Executable → Regular

src/libraries/lz4/lz4hc.h

Executable → Regular