Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,584 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

6 Commits

Author SHA1 Message Date
Dale Stammen 50336dca40 updated to latest version of cocos2d 2014-05-12 09:25:37 -07:00
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
Dale Stammen 9cf463bf6a start of input queue support 2014-04-19 09:37:54 -07:00
Dale Stammen d19e898f21 removed ccset.h 2014-04-19 09:26:38 -07:00
Huabing.Xu 63b52dd287 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
Dale Stammen afe561cccc added wp8 and winrt support files and projects 2014-03-28 12:52:16 -07:00