Commit Graph

1362 Commits

Author SHA1 Message Date
WenhaiLin 0e1338f6f8 Add test case for issue#10773 2015-04-30 16:11:59 +08:00
WenhaiLin ce7e36f76e Fixed warns and crash on Win32. 2015-04-28 20:10:56 +08:00
WuHao 2b245e0318 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6 2015-04-28 15:19:52 +08:00
WuHao 9d46c5413d added performance test for SpritePolygon 2015-04-28 15:18:40 +08:00
minggo 7ddbc59c95 Merge pull request #11622 from MSOpenTech/v3.6-winrt-fix
Use TextBMFont when text is updated from slider for faster performance
2015-04-28 11:55:33 +08:00
Dale Stammen 4d7e6567ea Use TextBMFont when text is updated from slider for faster performance 2015-04-27 19:48:15 -07:00
minggo 1ac0c8c0b1 Merge pull request #11616 from WenhaiLin/v3.6
TransitionsTests:Fixed Transition not work when switch between test cases
2015-04-28 09:35:45 +08:00
WuHao 597d2289c0 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6 2015-04-27 17:31:50 +08:00
WuHao a046f74c4d fix anchor point bug 2015-04-27 17:30:38 +08:00
WenhaiLin 70a641e2b3 TransitionsTests:Fixed Transition not work when switch between test cases. 2015-04-27 17:22:20 +08:00
minggo c9bacd58e8 Merge pull request #11591 from Wu-Hao/v3.6
V3.6
2015-04-27 14:22:21 +08:00
WuHao 9f2ea5fbb9 fixed some SpritePolygon create, added more tests 2015-04-27 13:34:47 +08:00
minggo 0a8f533e80 Merge pull request #11590 from super626/v3
Animate3D Quality control
2015-04-27 10:58:10 +08:00
WuHao c1d10ffa1c fixed poly2tri creation method, added testCase 2015-04-24 18:28:28 +08:00
WuHao 5620da1adf fixed anchor point issue, removed rect rotated property 2015-04-24 18:17:12 +08:00
WuHao 0e318dd8dc fixed UV issue, also taking account of contentScaleFactor, made test case better 2015-04-24 17:39:43 +08:00
lvlong 59dc646c17 modify test 2015-04-24 14:12:24 +08:00
lvlong 8e51a561b1 modify some about animate3D quality! 2015-04-24 11:49:28 +08:00
WuHao 07349ff588 initial cpp test 2015-04-23 18:03:03 +08:00
samuele3hu 8d9064b4e4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
Conflicts:
	tests/cpp-tests/Classes/AppDelegate.cpp
2015-04-22 10:31:39 +08:00
samuele3hu 47e2698986 Fix the cocos3.6beta0 bugs 2015-04-22 10:20:21 +08:00
Dale Stammen 6c7ecf0b18 removed CC_PLATFORM_WINRT messagebox code 2015-04-20 10:32:11 -07:00
Dale Stammen aae82c24f9 removed CC_PLATFORM_WP8 2015-04-19 16:28:54 -07:00
minggo 3c7d5afce2 Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix
Fix crash when play streamed MP4 file.
2015-04-16 18:16:28 +08:00
WenhaiLin fc75f46abb Fix crash when play streamed MP4 file. 2015-04-16 16:27:09 +08:00
andyque 8a9f420735 fix side effect of ui::button clone 2015-04-16 14:38:00 +08:00
minggo d54ddbd010 Merge pull request #11440 from WenhaiLin/v3-TextFieldTTFDefaultTest
TextFieldTTFDefaultTest: Fixed can't take input from the keyboard.
2015-04-14 22:36:32 +08:00
WenhaiLin 5f4fd20b06 TextFieldTTFDefaultTest: Fixed can't take input from the keyboard. 2015-04-14 18:04:35 +08:00
andyque 3c3d76fd9e remove listview focus test 2015-04-14 17:48:43 +08:00
minggo fbb1c578a2 Merge pull request #11430 from minggo/update-spine
update spine runtime to v2.1.25
2015-04-14 17:01:11 +08:00
minggo cdd7acc537 add spine test case 2015-04-14 16:14:51 +08:00
yangxiao 8c8058a9be merge cocos resolve conflict 2015-04-14 13:56:05 +08:00
zhukaixy 6684491249 1: update cube texture for sky box
2: add mouse-controled camera for test case (skybox)
2015-04-14 01:39:23 +08:00
minggo da69dbd133 Merge pull request #11388 from xiaofeng11/v3
Reader update
2015-04-13 11:20:53 +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 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