minggo
|
da69dbd133
|
Merge pull request #11388 from xiaofeng11/v3
Reader update
|
2015-04-13 11:20:53 +08:00 |
pipu
|
755134ba3f
|
Update parse animation easing
|
2015-04-10 17:05:55 +08:00 |
minggo
|
698d93a42b
|
Merge pull request #11379 from WenhaiLin/v3-physics-fix
Physics: Fixed position of physics body is wrong when the position of parent node changes
|
2015-04-10 16:45:45 +08:00 |
Wenhai Lin
|
97082cb169
|
Physics: Fixed position of physics body is wrong when the position of parent node changes
|
2015-04-10 15:39:39 +08:00 |
andyque
|
10c90b06aa
|
fix ui::Text outline don't change content size
|
2015-04-10 15:33:48 +08:00 |
pipu
|
7a67b6ccce
|
Test samples
|
2015-04-10 14:52:54 +08:00 |
andyque
|
c8d8a0d220
|
add disableEffect API for ui::Text
|
2015-04-10 14:18:16 +08:00 |
Ricardo Quesada
|
967f35ad82
|
removes warning
warnings are treated as errors on Mac.
Why this was even merged? Do we have a Mac builder? The Mac builder
should fail.
|
2015-04-09 15:15:15 -07:00 |
WenhaiLin
|
b5ae74c52b
|
[ci skip]Update the reference of submodule ccs-res.
|
2015-04-09 17:07:37 +08:00 |
WenhaiLin
|
8b839edfde
|
Test automation support: Fixed may not to restore TestList to the original position.
|
2015-04-09 16:46:35 +08:00 |
WenhaiLin
|
f502c5900b
|
[ci skip]Remove unwanted code.
|
2015-04-09 16:23:29 +08:00 |
WenhaiLin
|
c5ff21f7c6
|
[ci skip]Remove unwanted code.
|
2015-04-09 16:18:24 +08:00 |
WenhaiLin
|
16bce0bfd3
|
Fixed crashes in test case of Scene/Node.
|
2015-04-09 15:43:01 +08:00 |
WenhaiLin
|
2e24f302d6
|
Fixed the test case of BillBoard not respond click event as expected.
|
2015-04-09 15:08:49 +08:00 |
WenhaiLin
|
e5bd611604
|
Test automation support:Make test cases didn't need to care about TestSuite when invoking Director::getInstance()->replaceScene.
|
2015-04-09 14:59:34 +08:00 |
WenhaiLin
|
a378651320
|
Fixed some test cases of action not respond click event as expected.
|
2015-04-09 14:20:59 +08:00 |
minggo
|
c022b7d615
|
Merge pull request #11351 from WenhaiLin/v3-autotest
Test automation support:
|
2015-04-09 13:41:20 +08:00 |
Ricardo Quesada
|
510d502631
|
Merge remote-tracking branch 'cocos2d/v3' into xcode_6_3_tests_compiles
|
2015-04-08 21:59:22 -07:00 |
WenhaiLin
|
57508b3c12
|
Fixed compile errors
|
2015-04-09 12:49:32 +08:00 |
Ricardo Quesada
|
49e2e8964e
|
more compilations issues.
compiles on Android
|
2015-04-08 21:40:39 -07:00 |
Ricardo Quesada
|
23b0d4d2f6
|
more fixes with the namespaces
|
2015-04-08 21:23:47 -07:00 |
WenhaiLin
|
565a79022b
|
Test automation support:
1.TestList support mouse scroll.
2.TestList respond click event in the right response area.
|
2015-04-09 11:56:49 +08:00 |
tangziwen
|
0649f9709c
|
remove unnecessary reload in terrain test
|
2015-04-09 10:20:06 +08:00 |
tangziwen
|
4ca6b559e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
|
2015-04-09 09:40:22 +08:00 |
tangziwen
|
58a9e43c9c
|
update terrain test
|
2015-04-09 09:39:27 +08:00 |
Ricardo Quesada
|
51374eb822
|
tests compiles on xcode 6.3
no more USING_NS in the header files.
it creates conflict with xcode 6.3
|
2015-04-08 17:37:30 -07:00 |
tangziwen
|
0c2c8b072a
|
terrain update terrain test update ,resource update
|
2015-04-08 15:13:24 +08:00 |
minggo
|
8f52d950de
|
Merge pull request #11309 from WenhaiLin/v3-autotest
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-08 09:59:13 +08:00 |
andyque
|
9f5932ceeb
|
resolve the chipmunk compile issue
|
2015-04-07 23:20:02 +08:00 |
WenhaiLin
|
6bcddbc779
|
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-07 16:14:27 +08:00 |
minggo
|
eb928432ce
|
Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor
Label: Fixed shadow color is incorrect.
|
2015-04-07 15:27:19 +08:00 |
minggo
|
b85d26b2f6
|
Merge pull request #11303 from WenhaiLin/v3-autotest
Add missing test
|
2015-04-07 14:28:05 +08:00 |
minggo
|
420ace04e5
|
Merge pull request #11304 from tangziwen/terrain
terrain test update
|
2015-04-07 14:02:01 +08:00 |
tangziwen
|
176f7dd879
|
slightly modified the camera's default position & terrain's Lod distance in the terrain test
|
2015-04-07 11:50:09 +08:00 |
WenhaiLin
|
a6699058a0
|
Add missing test
|
2015-04-07 11:43:02 +08:00 |
WenhaiLin
|
c5c5d3e39d
|
Label: Fixed shadow color is incorrect.
|
2015-04-07 11:17:01 +08:00 |
minggo
|
deaa6a19f0
|
Merge pull request #11257 from super626/terrain
Terrain
|
2015-04-07 09:32:35 +08:00 |
Ricardo Quesada
|
a782eb022d
|
fixes warnings on Xcode 6.3
instead of using `abs()` it uses `std::abs()`
|
2015-04-06 12:08:30 -07:00 |
tangziwen
|
14b94a6aac
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resolve Conflicts:
tests/cpp-tests/Classes/controller.cpp
|
2015-04-03 17:50:08 +08:00 |
tangziwen
|
d79c38e17a
|
add WP8 support
|
2015-04-03 16:50:09 +08:00 |
tangziwen
|
0193420dfc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resovle Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-04-03 15:45:51 +08:00 |
tangziwen
|
ee41c9b3f1
|
add win rt support
|
2015-04-03 14:36:29 +08:00 |
WenhaiLin
|
0d51c13743
|
Make all test cases work fine with new test framework.
|
2015-04-03 14:31:03 +08:00 |
tangziwen
|
8a7b318c1a
|
Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment
|
2015-04-03 13:49:07 +08:00 |
WenhaiLin
|
6f47006324
|
Add new test framework.
|
2015-04-03 11:54:39 +08:00 |
yangxiao
|
cfbfe3b676
|
add to linux
|
2015-04-02 16:57:38 +08:00 |
yangxiao
|
784c68f9a0
|
modify test title
|
2015-04-02 14:18:22 +08:00 |
XiaoYang
|
984babc9c9
|
Merge pull request #281 from tangziwen/terrain
update terrain
|
2015-04-02 10:19:11 +08:00 |
tangziwen
|
6cd1077cb0
|
update terrain
|
2015-04-01 18:24:05 +08:00 |
minggo
|
eefd06415b
|
Merge pull request #11229 from xiaofeng11/v3
Add destroyCocosStudio()
|
2015-04-01 10:49:49 +08:00 |