Commit Graph

3270 Commits

Author SHA1 Message Date
samuele3hu 2a59180da3 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1 2015-04-28 11:30:01 +08:00
samuele3hu c801d1868c Update Sprite3DTest and VideoPlayerTest about Lua 2015-04-28 11:27:50 +08:00
andyque 854fcdf2bf fix spritepolygon 2015-04-28 11:26:21 +08: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
minggo ce9f40fb9a Merge pull request #11619 from samuele3hu/v3.6_test1
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygon
2015-04-28 09:32:30 +08:00
samuele3hu dc765aee25 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1 2015-04-28 09:19:03 +08:00
samuele3hu 51bcac9e84 Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest 2015-04-28 09:17:00 +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
samuele3hu bd5ca083e9 Fix the compile error of SpritePolygonTest on the win32 and wp8.1 2015-04-26 23:08:14 +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
lvlong d7fc85eb97 remove model ~~ !!! 2015-04-23 16:10:01 +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 e4ae0f9c2c disable INCREMENTAL for ARM builds. Fixes lnk2013 error 2015-04-21 08:50:43 -07:00
lvlong 4f96037e15 1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3
2. fix bug: memory leak!
2015-04-21 19:38:38 +08:00
Dale Stammen 6c7ecf0b18 removed CC_PLATFORM_WINRT messagebox code 2015-04-20 10:32:11 -07:00
Dale Stammen e00b0dfbd9 Merge branch 'v3' into v3-winrt-backbutton 2015-04-20 08:17:16 -07:00
samuele3hu 067ad6ad60 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
	cocos/scripting/lua-bindings/proj.android/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
2015-04-20 10:05:02 +08:00
Dale Stammen e3e79475f7 added ExitApp() for winrt 2015-04-19 16:30:51 -07:00
Dale Stammen aae82c24f9 removed CC_PLATFORM_WP8 2015-04-19 16:28:54 -07:00
samuele3hu b72034a3f6 Add Lua bindings for WebView and related test case 2015-04-17 14:08:47 +08: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
minggo 408d164fea Merge pull request #11458 from andyque/fix-a-side-effect-of-button-memory-optimization
fix side effect of ui::button clone
2015-04-16 16:15:25 +08:00
andyque 8a9f420735 fix side effect of ui::button clone 2015-04-16 14:38:00 +08:00
Dale Stammen b700798287 removed WP8 project files 2015-04-15 07:13:54 -07: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 0559b96a8e Merge pull request #11428 from samuele3hu/v3_studio2
[ci skip]Remove useless classes configuration for Lua binding and fix two minor bugs.
2015-04-14 16:38:05 +08:00
minggo cdd7acc537 add spine test case 2015-04-14 16:14:51 +08:00
samuele3hu dd3b6ced34 Fix the bugs that title and button disappeared because of camera setting 2015-04-14 15:40:12 +08:00
XiaoYang 5ed65e13c9 Merge pull request #303 from zhukaixy/texturecube
bugfix for cubemap
2015-04-14 14:25:35 +08:00
zhukaixy 451a560200 bugfix for cubemap 2015-04-14 14:20:31 +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
samuele3hu 24654a4847 synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests 2015-04-13 16:29:44 +08:00
minggo da69dbd133 Merge pull request #11388 from xiaofeng11/v3
Reader update
2015-04-13 11:20:53 +08:00
samuele3hu 8896190d9b Fix the bindings-generator error and add related Action Timeline test case. 2015-04-12 22:20:53 +08:00