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

7 Commits

Author SHA1 Message Date
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 467ededeff enabled console for wp8 2014-04-19 10:08:01 -07:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
koowolf b5433f05c1 replace LabelTTF with Label 2014-04-10 16:51:25 +08:00
Dhilan007 93511a878b Remove the old implementation of LabelTTF in test case. 2014-03-26 23:33:58 +08:00
Dale Stammen 2a13bbccc9 disabled network tests for wp8/winrt until networking code is added 2014-03-22 06:15:18 -07:00
James Chen b88de91a15 Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00