Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests
History
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 		2014-04-25 16:20:24 +08:00
..
Classes Merge branch 'v3' into develop_migrate_math_lib_merge 2014-04-25 16:20:24 +08:00
Resources closed #4783. remove unused comments in shader file 2014-04-14 12:06:42 +08:00
proj.android Solve the error effect of clipping in cpp-tests & lua-tests. 2014-03-28 17:45:28 +08:00
proj.ios remove unused accelerometer 2014-03-20 14:29:05 +08:00
proj.linux Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
proj.mac lua-empty-test, cpp-empty-test work for iOS/Mac 2014-03-11 19:10:36 +08:00
proj.win32 Merge branch 'develop' into perf-callback 2014-04-25 12:07:48 +08:00
proj.wp8-xaml Merge branch 'develop' into perf-callback 2014-04-25 12:07:48 +08:00
Android.mk Merge branch 'develop' into perf-callback 2014-04-25 12:07:48 +08:00
CMakeLists.txt Merge branch 'develop' into perf-callback 2014-04-25 12:07:48 +08:00