Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/Box2D
History
dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 
Conflicts:
	cocos2dx/platform/CCAccelerometer_platform.h
	cocos2dx/platform/CCApplication_platform.h
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/CCEGLView_platform.h
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/platform/CCSAXParser.h
	cocos2dx/platform/CCStdC.h
	tests/AppDelegate.cpp
	tests/tests/Box2DTestBed/Tests/EdgeShapes.h
 		2011-09-29 16:03:37 +08:00
..
Collision modify <cstdio> to <stdio.h> 2011-09-20 12:39:44 +08:00
Common merge bada platform 2010-12-15 18:05:02 +08:00
Dynamics merge bada platform 2010-12-15 18:05:02 +08:00
proj.airplay [airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk 2011-04-04 00:40:39 +08:00
proj.bada modify gameloop method 2011-09-29 02:32:01 +08:00
proj.linux make HelloWorld and tests runs ok on linux 2011-09-27 22:56:06 -07:00
proj.win32 Compile ok on vs2010 2011-06-27 17:02:58 +08:00
proj.wophone [wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone. 2011-03-10 14:24:13 +08:00
Android.mk [android] back to shared library link 2011-06-25 11:21:16 +08:00
Box2D.h 2010-10-12 08:33:07 +00:00