Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Issue #373 #376

Closed
wants to merge 433 commits into from
Closed

Fixes Issue #373 #376

wants to merge 433 commits into from

Conversation

flyover
Copy link
Contributor

@flyover flyover commented Dec 11, 2015

Fixes Issue #373.

I've tested building on Windows 7 and Windows 10 using Visual Studio Express 2013, OS X using Xcode 7 and Ubuntu 14.04. It uses the example implementation included in the imgui project, so it probably wouldn't be too difficult to get it working for the other implementations.

I've also cleaned up the debug rendering a bit using imgui. With imgui, each test could add it's own widgets to the Test window in the Step callback.

erincatto@gmail.com added 30 commits June 26, 2011 23:03
Former-commit-id: 4432d62
…eds some more testing.

- Fixed XCode warnings.


Former-commit-id: 9a28b7f
…eds some more testing.

- Fixed XCode warnings.
- Fixed Issue 221: Rotated static edge collisions. There was a bug in the math library.

Former-commit-id: dc9d9e0
- Fixed Issue 221: Rotated static edge collisions. There was a bug in the math library.
…generated documentation since it is out of date.

Former-commit-id: 671dd1b
…generated documentation since it is out of date.
Former-commit-id: 062889c
… can be pasted into the Testbed.

Fixed body angle access.

Former-commit-id: 84e0f34
erincatto and others added 28 commits March 17, 2015 08:10
Too big for Github, 100MB limit per file


Former-commit-id: b509c2cbf42d2299e7f09aea8f41858b7d1daefb [formerly fc5ed0acb3fc1915a15f1ec1e842365d5c24f3aa]
Former-commit-id: 226876ebbf7fefb4ccdb68078a5355d0e2241092
Former-commit-id: ded267292b9dad2bd32554d23b70ffef9da57d92
Former-commit-id: ba0b62931e98c574db2930b4135812b34222a763
Conflicts:
	Box2D/Box2D/Dynamics/Joints/b2WheelJoint.cpp
	Box2D/Box2D/Dynamics/Joints/b2WheelJoint.h
	Box2D/Box2D/Dynamics/b2Body.cpp
	Box2D/Box2D/Dynamics/b2Body.h
	Box2D/Box2D/Dynamics/b2World.cpp
	README.md
add glfw and imgui as submodules
use imgui instead of RenderGL to draw test info, frame time and text in scene
remove old build files
@flyover flyover closed this Dec 13, 2015
@flyover flyover deleted the upstream-#373 branch December 13, 2015 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants