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 |
James Chen
|
ec40dda7f3
|
Adds performance test for callbacks: 1) std::function,
2) (target->*selector)(), 3) simulate new api of Scheduler
|
2014-04-16 10:35:58 +08:00 |
Huabing.Xu
|
7f61639541
|
replace Point with Vector2 in tests, extension folder
|
2014-04-15 18:23:40 +08:00 |
Dhilan007
|
05b8123803
|
Label:Makes the create functions of Label just do one thing.
|
2014-04-09 23:31:05 +08:00 |
Dhilan007
|
67652357e1
|
1.Makes the create functions of Label clear.
|
2014-04-09 21:35:08 +08:00 |
Dhilan007
|
93511a878b
|
Remove the old implementation of LabelTTF in test case.
|
2014-03-26 23:33:58 +08:00 |
andyque
|
7ab639ec0f
|
fix lots compile warnings
|
2014-03-20 16:24:55 +08:00 |
James Chen
|
b88de91a15
|
Renames 'samples' folder to 'tests', ouch....
|
2014-03-11 19:10:34 +08:00 |