Commit Graph

21 Commits

Author SHA1 Message Date
pandamicro 0d6bf3263b Improve js templates with noCache and cc.view.setRealPixelResolution docs 2015-11-01 18:33:05 +08:00
pandamicro 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +08:00
zhangbin edb964a673 Remove the performance related config in project.json. 2015-09-11 16:03:07 +08:00
ZhangMenghe f3190206e0 Remove clickAndMove testcase 2015-09-01 14:21:08 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
pandamicro f53ba42b3b Fix test issues and Add audio engine to js templates 2015-07-29 21:22:44 +08:00
pandamicro 6c16a4b990 Add test cases for extended classes in JSB 2015-07-28 18:25:11 +08:00
VisualSj c49053fce4 Moveing ActionTimeline tests 2015-07-25 14:37:44 +08:00
VisualSj 09550ff742 Issue #12997: Add JS test case (ccs.BoneNode) 2015-07-24 15:57:36 +08:00
jianglong0156 c844a77786 add fileUtils writeString,writeValueMap,writeValueVector 2015-07-17 12:04:47 +08:00
kompjoefriek 6eca03fdd2 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
samuele3hu 77c3e9bdde issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 22:00:54 +08:00
pandamicro 3975d44d3b Chain NavMeshTest 2015-06-18 00:58:03 +08:00
joshuastray 712ba4f64c add physics3d auto binding 2015-05-20 10:36:26 +08:00
joshuastray 06846b5b1a added some missing tests 2015-05-18 14:44:33 +08:00
minggo ff3d28e6d7 Merge pull request #11870 from joshuastray/matierial
add material system tests for js
2015-05-18 13:33:30 +08:00
joshuastray 00dd854578 add material system tests for js 2015-05-18 10:44:15 +08:00
VisualSJ 01203a8b1b Increase the VideoPlayer and webview tests 2015-05-15 15:31:03 +08:00
joshuastray 234f4db8a0 add SpritePolygon binding && js tests 2015-05-11 17:04:23 +08:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
WenhaiLin e50b14b7fb Add js-tests 2015-04-16 18:07:35 +08:00