Commit Graph

2704 Commits

Author SHA1 Message Date
Ricardo Quesada ac5ffea643 Merge pull request #9101 from super626/v3
Add uv animation test
2014-11-14 14:18:37 -08:00
Ricardo Quesada 2e3b2d9f28 Merge pull request #9080 from vovkasm/cmake-refactoring
Cmake refactorings and fixes
2014-11-13 15:42:47 -08:00
minggo 906316df62 Merge pull request #8985 from samuele3hu/v3_new_spine
Fix error that the type judgment of lua value would parse string —> int or int —> string
2014-11-13 18:59:19 +08:00
samuele3hu 9492a19dcb Add test case for value type judge error 2014-11-13 15:36:43 +08:00
yangxiao e8fbf4d071 remove space line 2014-11-13 14:21:19 +08:00
yangxiao ba51065f3a remove space line 2014-11-13 14:19:51 +08:00
yangxiao 7395fb70f6 refact code style 2014-11-13 14:16:38 +08:00
tangziwen 3381400eec trim uv_test texture's size 2014-11-13 12:06:52 +08:00
tangziwen c33777a45a remove dummy log 2014-11-13 11:57:18 +08:00
tangziwen 85f0b0ec29 fix resource miss 2014-11-12 17:44:19 +08:00
tangziwen 8101b6a94e add UV Animation Test & it's resource 2014-11-12 17:42:45 +08:00
Dhilan007 e071e5c896 Fix Label may display incomplete for multiline text with outline feature enabled. 2014-11-12 17:24:35 +08:00
Vladimir Timofeev 72e59a53a8 cmake: Build application bundles on Mac for test applications (this allow run they from Xcode) 2014-11-11 10:30:48 +03:00
andyque 16d0419136 fix compile error 2014-11-10 16:02:06 +08:00
andyque 5483bc834d fix scale9sprite flip issue 2014-11-07 11:09:22 +08:00
minggo 25053b80bc Merge pull request #8930 from super626/fixsprite
add Sprite3D::getMeshArrayByName and refactor re-skin test
2014-11-05 18:11:51 +08:00
Ricardo Quesada 3a34d6eb9d Performance improvements
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
Ricardo Quesada 2ec1170943 treat warnings as errors in samples 2014-11-04 15:42:29 -08:00
minggo 543c65c7b3 Merge pull request #8970 from super626/v3
refact 3d bundle code and fix sprite
2014-10-31 10:27:16 +08:00
yangxiao 77aebb657d merge cocos 2014-10-30 11:56:20 +08:00
Dale Stammen fa70e066a1 enabled FastTileMap test for WP8 2014-10-29 09:17:31 -07:00
samuele3hu c52f3b972b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-29 09:43:55 +08:00
samuele3hu 9d0c8d97f9 Update vs project setting for lua-empty-test 2014-10-29 09:42:48 +08:00
lvlong bdf10426e2 new axe.c3b (ver 0.4) 2014-10-27 16:12:15 +08:00
minggo baff367c94 Merge pull request #8918 from dumganhar/iss8843-drawpoint
closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-27 11:38:11 +08:00
yangxiao 20decd5a39 refact reskin code 2014-10-25 14:11:32 +08:00
Dale Stammen d4b4452bae copy pch files to template folder 2014-10-24 06:08:20 -07:00
James Chen 13b51f7c73 Small fixes in Sprite3DTest 2014-10-24 12:03:42 +08:00
James Chen 603700179e closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points. 2014-10-24 12:03:11 +08:00
Dale Stammen f42afaa6bb updated project files with new pch files 2014-10-23 19:40:57 -07:00
Dale Stammen 3290d75ab7 removed unused pch files 2014-10-23 19:34:55 -07:00
Dale Stammen f8a00c8605 added project files for windows 8.1 universal apps 2014-10-23 07:41:29 -07:00
Dale Stammen af98442e1f added projects Assets 2014-10-23 07:35:22 -07:00
Dale Stammen fdfc05a823 removed old files 2014-10-23 07:35:19 -07:00
Dale Stammen 96daa12a42 added projects Assets 2014-10-23 07:35:05 -07:00
Dale Stammen 4f01036bc9 removed old files 2014-10-23 07:34:21 -07:00
Dale Stammen 3795d6ac28 removed old files 2014-10-23 07:33:14 -07:00
Dale Stammen 6005ffd89d remove PhoneDirect3DXamlAppComponent namespace refactor 2014-10-23 07:30:13 -07:00
Dale Stammen 068e574090 cocos2d namespace refactor 2014-10-23 07:26:59 -07:00
Dale Stammen d0891a9973 remove PhoneDirect3DXamlAppComponent namesapce refactor 2014-10-23 07:24:23 -07:00
Dale Stammen f2d9fd2746 enabled tests for winrt 2014-10-23 07:23:13 -07:00
Dale Stammen 75d37a9cc4 no mp3 for winrt 2014-10-23 07:22:05 -07:00
Dale Stammen f359c7285e remove PhoneDirect3DXamlAppComponent namespace refactor 2014-10-23 07:21:48 -07:00
samuele3hu 01e44c440c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-22 17:07:18 +08:00
samuele3hu d29388eb30 Fix some lua-tests error 2014-10-22 17:04:18 +08:00
minggo b3288f7c27 Merge pull request #8893 from dabingnn/v3_fixTypo
[ci skip] fix typo
2014-10-22 14:16:07 +08:00
Huabing.Xu ff27c3539d [ci skip] fix typo 2014-10-21 17:37:00 +08:00
minggo 09cc636d82 Merge pull request #8886 from Dhilan007/v3-testcase-android
Replace CCLOG with log in ConfigurationTest
2014-10-21 16:06:23 +08:00
Dhilan007 4e7d03f0e5 Replace CCLOG with log in ConfigurationTest 2014-10-21 15:56:52 +08:00
samuele3hu 2f9dbb7142 Update cocos2d basic lua files and LabelTestNew.lua 2014-10-21 15:56:38 +08:00