Commit Graph

547 Commits

Author SHA1 Message Date
minggo 1d3c6d6f5c copy needed resources () 2017-03-30 17:03:19 +08:00
minggo 9d81f16bc5 [ci skip]make android studio work for release mode ()
* release mode of lua test case work with Android Studio

* add missing file

* fix error for debug mode

* make android studio work
2017-03-29 15:56:46 +08:00
pandamicro d25cd8ddf4 [ci skip] Fix QA issues ()
* Fix RenderTexture#clear API inconsistency

* Improve js-tests desktop page

* Fix issues in js test cases
2017-03-27 18:03:20 +08:00
pandamicro 5341f7517e Improve js template and test pages ()
* Improve js template and test pages

* Update web ref
2017-03-27 11:03:51 +08:00
minggo 1366ea1f97 change clear color in onEnter () 2017-03-22 11:51:06 +08:00
minggo ebdae8c2da use different separator on different platforms and make path length short () 2017-03-17 11:54:36 +08:00
pandamicro f0061c3ddc [ci skip] Improve js template and update web ref ()
* Improve js templates

* Update web ref
2017-03-16 09:42:51 +08:00
pandamicro 0eec73ba43 Bindings fix and assets manger ex fix ()
* Fix custom event being discard during event emission

* Fix tilemap black line issue

* Fix auto bindings config

* Adapt websocket to new memory model

* Improve cocos2d_specifics code stability

* Fix issue with get_or_create_js_object function

* Improve memory usage in function wrapper invocation

* Use JS Function bind to avoid memory tracking issues

* Support size parameter to collect total byte size before update process

* Fix download resuming issue on Android

* Remove temporary assets when temporary manifest is invalid or out of date

* Use version compare handle to compare manifests versions

* Support max concurrent tasks setting & download verify callback

* Add Manifest::Asset conversion

* Avoid crash caused by wrappers

* Sync implementation of tested and published AssetsManagerEx from Cocos Creator

* Fix linux compilation issues
2017-03-15 16:09:02 +08:00
Bin Zhang 010a724149 Solve the error when building Android Studio project. () 2017-03-15 15:45:50 +08:00
mogemimi 0a35a8ca10 Fix spelling mistake in test case () 2017-03-15 13:51:37 +08:00
Bin Zhang 769f7830f0 Improve the AndroidStudio configurations of tests & templates ()
* Improve the AndroidStudio configuration of test projects to fit the new implementation of cocos compile.

* Improve the AndroidStudio configuration of templates to fit the new implementation of cocos compile.
2017-03-14 13:41:28 +08:00
mogemimi e293520057 Fix some local variable names in tests () 2017-03-06 10:01:53 +08:00
mogemimi cfbbc65c71 Fix various typos in comments and strings () 2017-02-27 11:12:29 +08:00
mogemimi 0e28e68d45 Fix variable name typo in Sprite3DTest.js () 2017-02-27 10:32:48 +08:00
mogemimi 454fd8518b Fix minor typos in tests () 2017-02-24 12:45:41 +08:00
mogemimi 3937b4d631 Fix minor typos in UI test cases () 2017-02-23 16:14:39 +08:00
Bin Zhang 41014fd54c Update the spine runtime of JS. () 2017-02-22 11:21:37 +08:00
minggo 5ae8a95c6f [ci skip]make all tests and template support Android Studio ()
* make all tests and template support Android Studio

* use grable 2.2.3
2017-02-21 17:58:30 +08:00
James Chen 619e012d9b [WebSocket] Adds support for getting url and server selected protocol ()
* [WebSocket] Adds support for getting url and server selected protocol

* Adds const keyword for getter methods, and make LOGE also works in release mode.
2017-02-20 09:44:20 +08:00
CocosRobot d07794052f Update license to 2017 ()
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
minggo 34d4c65c86 fix crash on Android ()
The crash is caused because of local reference table overflow
2017-02-10 13:51:29 +08:00
minggo c61cd9afe7 fix spine binding codes and test case () 2017-02-10 11:58:23 +08:00
Dale Stammen 9381152ef1 removed support for Windows 8.1 store and phone () 2017-02-08 09:46:47 +08:00
James Chen b1f2a056b2 Refactor WebSocket to support SSL (wss) ()
* Refactors WebSocket:
1. Supports wss protocol
2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
3. Uses lws_create_vhost to create multiple virtual host, different protocols works

* Adds openssl include path to xcode project configuration.

* mac doesn’t depend on curl

* ca file path should be full path.

* More bug fixes like which in https://github.com/cocos2d/cocos2d-x/pull/6986

* Remove curl dependence for mac

* Updates Andorid.mk

* [win32] Adds wss support for win32, and updates openssl, libcurl, libwebsockets libraries.

* Updates external/config.json to 118.

* [win32] Updates cocos/2d/libcocos2d.vcxproj to fix compilation error while building in release mode.

* Linux support websocket ssl connection.

* Updates external/config.json

* Updates install-deps-linux.sh

* Adds dependence of binutils, print ld version

* Updates travis scripts.

* Updates travis scripts.

* Updates travis script, don’t output log while extracting.

* update before-install.sh

* updates before-install.sh

* updates before-install.sh

* don’t output log for installing software.

* Updates config.json to 120.
2017-01-19 13:55:14 +08:00
minggo f63fad3e27 Merge branch 'v3.14' into merge-v314 2017-01-04 09:49:22 +08:00
pandamicro e16828647c Fix web engine canvas mode issues ()
* Update web ref

* Fix custom event being discard during event emission

* Fix web engine canvas mode issues

* Revert "Fix custom event being discard during event emission"

This reverts commit 3f42273e1e86bc3c977abc61a45d30169d5c35ff.

* Update web ref
2017-01-03 09:40:38 +08:00
子龙山人 163e730849 Fix label disableeffect ()
* add toggle rendering type test

* fix label additional kerning

* only substract additionalKerning when bold is enabled
2016-12-29 13:59:24 +08:00
minggo c15da89c5e use projection 2d () 2016-12-28 18:20:14 +08:00
minggo 279ae9819c Merge pull request from VisualSJ/v3.14
Fixed a bug about LoaderTest
2016-12-27 11:36:04 +08:00
VisualSJ bdf161a99e Fixed a bug about LoaderTest 2016-12-27 10:53:07 +08:00
pandamicro 41abefd082 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
# Conflicts:
#	CHANGELOG
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
2016-12-26 18:53:42 +08:00
pandamicro 8c71531338 Fix test case issues and add change log 2016-12-26 18:36:19 +08:00
子龙山人 6fa331b065 fix js tests description () 2016-12-26 18:15:05 +08:00
pandamicro 0496857283 Fix chipmunk test issue 2016-12-26 00:07:17 +08:00
pandamicro a3d6705b02 Improve cc.formatStr 2016-12-21 11:05:49 +08:00
minggo bd0789e22c sync codes from cpp to js () 2016-12-19 16:00:27 +08:00
pandamicro 24be2acde0 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
# Conflicts:
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
#	cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
#	tests/js-tests/src/SpineTest/SpineTest.js
2016-12-19 12:39:55 +08:00
minggo 3adbc2a116 change button background picture () 2016-12-19 10:44:56 +08:00
minggo 691a0ce8a5 fix the bug that sprite is not hide after trees () 2016-12-16 15:45:34 +08:00
minggo 291307b698 should retain object to be used later () 2016-12-16 15:16:00 +08:00
minggo 7c2bd27d71 unschedule all before exit () 2016-12-16 14:53:15 +08:00
minggo 332ef17d51 use correct spine api () 2016-12-16 11:24:11 +08:00
pandamicro 5823f5792b Synchronize creator engine bug fixes and upgrade web engine ()
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd
2016-12-14 09:27:47 +08:00
pandamicro e469f4f710 Upgrade test cases 2016-12-13 14:29:24 +08:00
James Chen f26cc15373 Avoids function name conflict, and uses `http://httpbin.org/gzip` to test gzip functionality since only httpbin.org was added to exception list in Info.plist. () 2016-12-13 11:44:42 +08:00
James Chen cef013dcc6 Fixes broken of JS AssetsManagerTest. And updates https configuration of cpp-tests, js-tests for macOS. ()
fixed http://punchbox.info:3000/issues/26031
2016-12-08 10:40:22 +08:00
James Chen 46fd7e3d59 Sync JS TerrainTest.js from cpp test. () 2016-12-07 14:17:45 +08:00
子龙山人 f51234c549 fix jsb test inconsistance () 2016-12-06 17:50:26 +08:00
Dale Stammen 8791794f39 updated for v3.14 () 2016-12-01 10:37:04 +08:00
James Chen 51efcb9365 Fixes setScale & setAnchorPoint could not work in js-tests -> webview test . () 2016-11-30 15:32:02 +08:00