Commit Graph

2127 Commits

Author SHA1 Message Date
James Chen 5c0c6d2e1e More powerful Uri class, adds unit test for Uri class. Refactors some code in SocketIO & Websocket. (#17472)
* More powerful Uri class, adds unit test for Uri class. Refactores some code in SocketIO & Websocket.

* Adds missing header file stdint.h

* Exports Uri class

* Uri belongs to network group

* Updates the location of group comment

* Removes an unused include.

* Updates Uri comment.
2017-03-09 10:14:39 +08:00
j-jorge 67d16bee98 Prevent unexpected calls to unscheduled selector in long updates. (#17431)
If the delta time dt passed to cocos2d::Timer::update(float) is longer than the
interval of the timer, then the timer will be triggered several times even if
the selector is unscheduled during the call.

This commit adds a flag in cocos2d::Timer stop the update loop if the selector
has been unscheduled.
2017-03-07 11:16:30 +08:00
j-jorge 6cd7314497 cocos2d::Sequence::isDone() checks that the last action is actually done. (#17437) 2017-03-07 09:36:09 +08:00
James Chen bdcacd0031 Some fixes for search paths: (#17435)
* Some fixes for search paths:
1. Adds ‘_originalSearchPaths’ variable, ’getSearchPaths’ returns the original values set by ‘setSearchPaths’  or ‘addSearchPath’.
2. Adds a getter function ‘getDefaultResourceRootPath’.
3. ‘setDefaultResourceRootPath’ should also update search paths and remove file path cache internally.
4. ‘setSearchPaths’  supports to pass self (_originalSearchPath), could be used in ‘setDefaultResourceRootPath’ to update the final ’_searchPathArray’ for searching full path.
5. ‘addSearchPath’ fix, the default resource root path should be the last element in ‘_searchPathArray’.

* Checks whether the parameter ‘searchResolutionOrder’ passed in is the same as ‘_searchResolutionsOrderArray’.

* Don’t break the compatibility, add a new method called ‘FileUtils::getOriginalSearchPaths’.
2017-03-06 16:59:43 +08:00
mogemimi e293520057 Fix some local variable names in tests (#17445) 2017-03-06 10:01:53 +08:00
radman0x c442275c8e 17357: Better encapsulate the definition of mouse buttons (#17358)
* 17357: Better encapsulate the definition of mouse buttons

Move definition of buttons from a list of #define's to an enum class and
make appropriate updates for successful compilation.

* 17357: Better encapsulate the definition of mouse buttons

Updates from code review:
* Removed changes to automatically generated files
* Removed std::ostream& convenience operator

* 17357: Fix mouse tests
2017-03-02 13:39:33 +08:00
mogemimi 454fd8518b Fix minor typos in tests (#17404) 2017-02-24 12:45:41 +08:00
mogemimi 48cbc890c6 Typo fix: Rename `MutiTouchTest` to `MultiTouchTest` (#17399) 2017-02-23 17:05:08 +08:00
mogemimi 3937b4d631 Fix minor typos in UI test cases (#17400) 2017-02-23 16:14:39 +08:00
James Chen 619e012d9b [WebSocket] Adds support for getting url and server selected protocol (#17381)
* [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 (#17362)
* 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
子龙山人 1baad6b962 Fix tizen compilation issue (#17341)
* fix tizen compile issue

* enable websocket test on tizen

* change application id of tizen projects

* improve cpp-tests websockets

* update template app id of tizen

* fix tizen cpp-tests in release mode

* update 3rd deps version

* bump external version to 123
2017-02-13 17:59:48 +08:00
James Chen 4237639dd6 Some fixes for websocket (#17342)
* libwebsockets & curl are dynamic libraries now, modify project configuration for win32.
Updates WebSocketTest.cpp to test wss connection.

* Corrects some logic in WebSocket.cpp. Adds wss test case. WebSocketTest suggests developers to use `WebSocket::closeAsync` method which will not block current thread.

* mutex unlock fix in WebSocket.cpp. Reverts TEST URL.

* Allows self-assign cert.

* Each ws connection will create a virutal host now. Supports self-signed cert and update test case to suggest developer use ‘closeAsync’.

* Updates deps to 123.
2017-02-13 15:15:23 +08:00
newnon f408cbfcca fix rendering font with not null line gap (#17175)
* fix rendering font with not null line gap

* test for line gap fix
2017-02-13 13:58:32 +08:00
James Chen 27e2012cf1 fixed #16871: Material second shader texture will be lost when removeUnusedTextures is invoked. (#16884)
* fixed #16871: Material second shader texture will be lost when removeUnusedTextures is invoked.

* issue #16871: Adds test case for issue #16871.

* issue #16871: Checks whether current texture is the same as which is passed in. And more comments for release stuffs.

* Removes unused nullptr check of _value.tex.texture

CC_SAFE_RETAIN will check it.
And some indention fixes.
2017-02-10 14:01:26 +08:00
mogemimi d160d79d5b Fix typos in comments and strings (#17333) 2017-02-10 10:35:52 +08:00
minggo 8825a091bb update spine to 3.5.35 (#17331)
* update spine to 3.5.35

* fix jsb compiling error

* fix lua compiling error
2017-02-09 16:57:42 +08:00
newnon 88c3fcde67 Full unicode support (#17179)
* Full unicode support

* test for emoji
2017-02-06 16:41:52 +08:00
子龙山人 193518ed8b add opacity support to DrawNode (#17248) 2017-02-06 15:34:14 +08:00
j-jorge 6bbf01537d Allow to unbind asynchronous texture loading callback with a custom key. (#17206)
* 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) (#17241) 2017-01-23 09:25:56 +08:00
minggo 690db56f44 Merge v3.14.1 (#17231)
* update cocos console to fix compiling error with Android Studio projects (#17129) (#17145)

* fix crash if physics3d camera is not set (#17139) (#17144)

* fix linking error with vs2015 (#17146)

* fix issue #17116 & #17119 for v3.14.1

* tests cases

* better documentation

* doc: updates sprite doc

* Fix scale9sprite polygon info (#17161)

* add guard code to Scale9Sprite

* add new test code

* Glfw linux issue (#17166)

* purge glfw3 before installing glfw3.2

* purge glfw3 before installing glfw3.2

* Update web engine ref (#17169)

* update version and release note (#17170)

* issue ##17119 improved v3.14.1 (#17189)

* update version (#17230)
2017-01-20 09:59:30 +08:00
James Chen b1f2a056b2 Refactor WebSocket to support SSL (wss) (#17172)
* 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. (#17205) 2017-01-19 10:28:20 +08:00
Nakhyun Choi 42c77247cc Fixed Scheduler bug occured when unschedule target during update. (#17203) 2017-01-18 16:32:36 +08:00
Aleksey Zolotov 0de81de721 fix #14936 (#17190)
* fix #14936

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

* fix compiling error

* add test case

* fix logic error
2017-01-16 17:37:59 +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. (#17140) 2017-01-13 10:05:46 +08:00
danut007ro 84a3f73ecb Particle set display frame (#17163)
* Fix CCParticleSystemQuad::setDisplayFrame()

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

and sanitizes the code a little bit

* more fixes

* fixes issue #17116

* 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 (#17125)
comment out Bug #15776 because it currently crashes during autotest
2017-01-09 09:36:00 +08:00
minggo a0acaf5972 Merge pull request #17101 from minggo/merge-v314
Merge v314
2017-01-04 11:48:31 +08:00
minggo 79126ea72a make ListView::setGlobalZOrder() work (#17098)
* 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
minggo 46ef933716 fix a bug that inserted text will overlap with title (#17058) 2016-12-26 09:22:49 +08:00
James Chen 77cf6de2e5 [label] Fixes shadow is drawn incorrect while also enabling outline. (#17024) 2016-12-16 14:56:36 +08:00
James Chen effb6f077a [mac, ios] 'ExtAudioFileRead' may return 0 frame while it doesn’t reach the end of very short audio file. (#17011)
* [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 (#17002)
* fix tizen compile issue

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

* set index to 1 before running a test case
2016-12-14 09:28:19 +08:00
minggo 6f58131653 fix bug that localnization can not work correctly (#17001)
* fix bug that localnization can not work correctly

* re-enable other test cases
2016-12-13 16:33:11 +08:00
minggo 80954d392d fix label position (#16998) 2016-12-13 13:38:49 +08:00
James Chen 636a253981 [cpp-tests] Reverts code change by mistake. (#16996)
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 (#16990) 2016-12-12 16:25:58 +08:00
minggo 2c2ed5c5f5 don't let toggle accept focus (#16982) 2016-12-12 09:41:53 +08:00
James Chen 91daa7a12a Fixes NewEventDispatcherTest. (#16983)
fixed http://punchbox.info:3000/issues/26036
2016-12-12 09:39:20 +08:00
James Chen 951b5174db [lua-tests] Fixes PhysicsDemoBug5482 crashes. (#16979)
Fixed http://punchbox.info:3000/issues/26011
2016-12-09 14:12:57 +08:00
David DeSimone 3b7ffcf5d0 unscheduleAll() does not unschedule scheduled with performFunctionInCocosThread. (#16856)
* Fixing issue where Scheduler::unscheduleAll() would not unschedule functions scheduled with Scheduler::performFunctionInCocosThread.

* Removing clear of _functionsToPerform from unscheduleAll, based on code review feedback. Adding a function removeAllFunctionsToBePerfomedInCocosThread, which will remove all pending functions scheduled with performFunctionOnCocosThread.

* Adding test case for Scheduler::removeAllFunctionsToBePerformedInCocosThread

* Adding proper cleanup code to Scheduler test for SchedulerRemoveAllFunctionsToBePerformedInCocosThread
2016-12-08 11:58:58 +08:00
minggo 3db39a27ea Vibrate test (#16966)
* only show vibrate test on iOS and Android device

* vibrate no matter it is silient or not
2016-12-07 11:12:38 +08:00
子龙山人 1b0a6c2c5c Sync editbox improvement from cocos creator (#16965)
* sync the changes from creator

* fix editbox vertical alignment

* improve android editbox multiline text vertical alignment
2016-12-07 09:21:17 +08:00