Commit Graph

4845 Commits

Author SHA1 Message Date
j-jorge 6bbf01537d Allow to unbind asynchronous texture loading callback with a custom key. ()
* Allow to unbind asynchronous texture loading callback with a custom key.

In order to unbind the callback passed to
`cocos2d::TextureCache::addImageAsync(path, callback)`, one has to
call `cocos2d::TextureCache::unbindImageAsync(path)`. In the cases
where the loading of the same texture is requested from several sources
simultaneously, then none of the source can unbind its own callback
unambiguously.

This commit adds an overload of the `addImageAsync` function taking an extra
argument identifying the callback, thus allowing to unbind it unambiguously
in cases where the loading of path is requested by several sources
simultaneously.

* Add a test case for TextureCache::addImageAsync with a custom key.
2017-02-04 09:38:54 +08:00
mogemimi 061122514c Fix typo in Sprite (strech -> stretch) () 2017-01-23 09:25:56 +08:00
minggo 690db56f44 Merge v3.14.1 ()
* update cocos console to fix compiling error with Android Studio projects () ()

* fix crash if physics3d camera is not set () ()

* fix linking error with vs2015 ()

* fix issue  &  for v3.14.1

* tests cases

* better documentation

* doc: updates sprite doc

* Fix scale9sprite polygon info ()

* add guard code to Scale9Sprite

* add new test code

* Glfw linux issue ()

* purge glfw3 before installing glfw3.2

* purge glfw3 before installing glfw3.2

* Update web engine ref ()

* update version and release note ()

* issue ##17119 improved v3.14.1 ()

* update version ()
2017-01-20 09:59:30 +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
j-jorge 1278ccfbb2 Prevent the compilation of NavMeshTest if CC_USE_PHYSICS=0. () 2017-01-19 10:28:20 +08:00
Nakhyun Choi 42c77247cc Fixed Scheduler bug occured when unschedule target during update. () 2017-01-18 16:32:36 +08:00
Aleksey Zolotov 0de81de721 fix ()
* fix 

*  testcases
2017-01-17 09:48:30 +08:00
minggo d9637f30b0 remove scheduler in time ()
* remove scheduler in time

* fix compiling error

* add test case

* fix logic error
2017-01-16 17:37:59 +08:00
minggo 1b6c8cc5c1 bind FileUtils:getDataFromFile() to lua () 2017-01-13 13:39:58 +08:00
David DeSimone c258b03f13 Adding async version of common CCFileUtil functions. This will allow engine users to interact with the file system, without blocking the main thread and disrupting rendering. () 2017-01-13 10:05:46 +08:00
danut007ro 84a3f73ecb Particle set display frame ()
* Fix CCParticleSystemQuad::setDisplayFrame()

* Added tests
2017-01-12 11:48:30 +08:00
Ricardo Quesada e100d02dff Sprite fixes: color + polygon ()
* fixes issue 

and sanitizes the code a little bit

* more fixes

* fixes issue 

* restore xcode "none" sign profile

* code is cleaner

add more documentation in CCSprite.h

* missing assets

* anchor point works with batchnodes again
2017-01-10 15:28:47 +08:00
Steve Tranby 3d4d56d83a Update BugsTest.cpp ()
comment out Bug  because it currently crashes during autotest
2017-01-09 09:36:00 +08:00
minggo a0acaf5972 Merge pull request from minggo/merge-v314
Merge v314
2017-01-04 11:48:31 +08:00
minggo 79126ea72a make ListView::setGlobalZOrder() work ()
* make ListView::setGlobalZOrder() work

* revert modification of UIButton

* reset background color

* change global z order to test
2017-01-04 11:06:44 +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
minggo 46ef933716 fix a bug that inserted text will overlap with title () 2016-12-26 09:22:49 +08:00
pandamicro 0496857283 Fix chipmunk test issue 2016-12-26 00:07:17 +08:00
minggo 20d8ef9584 make it work with release mode on arm64 bit () 2016-12-23 16:44:29 +08:00
minggo b57db96f09 don't use Layer () 2016-12-21 13:49:59 +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
James Chen 77cf6de2e5 [label] Fixes shadow is drawn incorrect while also enabling outline. () 2016-12-16 14:56:36 +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
James Chen effb6f077a [mac, ios] 'ExtAudioFileRead' may return 0 frame while it doesn’t reach the end of very short audio file. ()
* [mac, ios] Adds AudioDecoder::readFixedFrames. And uses readFixedFrames to simply code.

* [mac, ios] ‘ExtAudioFileRead’ may return 0 frame while it doesn’t reach the end of very short audio file.

* [mac, ios] Adds test case for small file test.

* [mac, ios] Adds small audio file.

* [mac, ios] Macro ‘BREAK_IF’ logic fix.

* [mac, ios] Returns false of AudioDecoder::open if total frames is 0.
2016-12-15 09:58:47 +08:00
James Chen c0291afad7 Merge branch 'v3.14' into merge-v3.14 2016-12-14 17:03:58 +08:00
子龙山人 3302781dae fix tizen compile issue ()
* fix tizen compile issue

* fix linux compile issue
2016-12-14 11:55:38 +08:00
minggo de670c1913 Lua tests ()
* fix conflict effect

* set index to 1 before running a test case
2016-12-14 09:28:19 +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
minggo 6f58131653 fix bug that localnization can not work correctly ()
* fix bug that localnization can not work correctly

* re-enable other test cases
2016-12-13 16:33:11 +08:00
minggo ba7c977111 use no border policy () 2016-12-13 16:31:31 +08:00
pandamicro e469f4f710 Upgrade test cases 2016-12-13 14:29:24 +08:00
minggo 80954d392d fix label position () 2016-12-13 13:38:49 +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 636a253981 [cpp-tests] Reverts code change by mistake. ()
The mistake was merged in https://github.com/cocos2d/cocos2d-x/pull/7619.
2016-12-13 11:42:12 +08:00
minggo 93a879bfab remove unneeded files () 2016-12-12 16:25:58 +08:00
minggo 2c2ed5c5f5 don't let toggle accept focus () 2016-12-12 09:41:53 +08:00