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 |
Huabing.Xu
|
7f61639541
|
replace Point with Vector2 in tests, extension folder
|
2014-04-15 18:23:40 +08:00 |
boyu0
|
c98f50026f
|
issue $4771: move PhysicsWorld to layer.
|
2014-04-15 03:21:18 +08:00 |
Dhilan007
|
93511a878b
|
Remove the old implementation of LabelTTF in test case.
|
2014-03-26 23:33:58 +08:00 |
James Chen
|
b88de91a15
|
Renames 'samples' folder to 'tests', ouch....
|
2014-03-11 19:10:34 +08:00 |