Commit Graph

578 Commits

Author SHA1 Message Date
jianglong0156 9434f63ce0 modify js-test resource 2015-05-18 11:18:19 +08:00
joshuastray 00dd854578 add material system tests for js 2015-05-18 10:44:15 +08:00
WenhaiLin 7caa6bb2fc Update Copyright. 2015-05-18 09:59:50 +08:00
minggo 2dbe375380 Merge pull request #11868 from joshuastray/bullet-preprocessor-macro
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
2015-05-18 09:33:00 +08:00
joshuastray ead74ac89e add CC_ENABLE_BULLET_INTEGRATION=1 to js project 2015-05-17 23:11:17 +08:00
minggo e99b99cc79 Merge pull request #11853 from joshuastray/fix-resource-path
fix resource path for js-tests
2015-05-15 16:53:47 +08:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00
joshuastray 4d0ada1cac fix resource path for js-tests 2015-05-15 16:23:43 +08:00
minggo 8f7a023233 Merge pull request #11848 from VisualSJ/v3-build
Add VideoPlayer and webview tests
2015-05-15 16:19:56 +08:00
VisualSJ 376a3f2866 [ci skip]Fix naming errors 2015-05-15 15:45:37 +08:00
VisualSJ 01203a8b1b Increase the VideoPlayer and webview tests 2015-05-15 15:31:03 +08:00
minggo 0a3e6338f1 Merge pull request #11834 from pandamicro/v3_origin
Sync fixes in Cocos2d-JS
2015-05-14 13:38:18 +08:00
minggo 5e87bd307b Merge pull request #11798 from WenhaiLin/v3-support-vs2015
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
pandamicro 3190d0e5fb Add localStorage.clear test case 2015-05-12 19:02:22 +08:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +08:00
jianglong0156 80326aa40e add webiew jsb code 2015-05-12 10:30:51 +08:00
joshuastray 234f4db8a0 add SpritePolygon binding && js tests 2015-05-11 17:04:23 +08:00
samuele3hu 23e4e0d4e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-07 16:21:03 +08:00
samuele3hu 243da71082 Update the project configure of js-tests and js-template on the win32 platform 2015-05-07 11:38:43 +08:00
samuele3hu f1b5729183 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-05 16:14:57 +08:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
WenhaiLin 5e5cd5faa1 [js-tests]Fixed crash on Win32/Universal. 2015-04-24 17:12:46 +08:00
WenhaiLin 55d3cc1252 Update the js-tests CMake files. 2015-04-23 10:42:44 +08:00
zhangbin f75bf93706 Update the js-tests project files. 2015-04-21 15:30:47 +08:00
WenhaiLin f453235ce3 Add missing resource 2015-04-20 15:38:56 +08:00
Wenhai Lin 7860f57ef0 Fixed compile errors 2015-04-17 14:00:53 +08:00
WenhaiLin e50b14b7fb Add js-tests 2015-04-16 18:07:35 +08:00