00b9dcd62e
Lua custom handler ( #17211 )
...
* avoid crash if custom handler vector is empty
* simplify codes
2017-01-18 17:05:08 +08:00
42c77247cc
Fixed Scheduler bug occured when unschedule target during update. ( #17203 )
2017-01-18 16:32:36 +08:00
8b9c89f6a9
Fix typos in comments and strings ( #17201 )
2017-01-18 15:41:18 +08:00
efc3e5979b
Fix typo in function name ( #17202 )
2017-01-18 15:40:46 +08:00
0de81de721
fix #14936 ( #17190 )
...
* fix #14936
* #14936 testcases
2017-01-17 09:48:30 +08:00
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
888b985e0e
Fix variable name typo ( #17195 )
2017-01-16 11:21:34 +08:00
21d57bfd39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17185 )
2017-01-16 11:20:39 +08:00
bebd11f853
Correct spelling of "intersect" ( #17194 )
2017-01-16 11:20:07 +08:00
88a1cd73fa
improves fix for issue #17119 (v3) ( #17188 )
2017-01-16 09:30:08 +08:00
59403ad40d
Propagate onTouchCancelled ( #17174 )
2017-01-13 18:09:01 +08:00
61c856679e
getLetter function for Text ( #17178 )
2017-01-13 18:06:01 +08:00
7b430ce7c2
fix child removing from ListView ( #17177 )
2017-01-13 14:38:28 +08:00
15e56c06a4
outline to float ( #17176 )
2017-01-13 14:31:12 +08:00
f2114f36f8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17183 )
2017-01-13 14:04:11 +08:00
1b6c8cc5c1
bind FileUtils:getDataFromFile() to lua ( #17182 )
2017-01-13 13:39:58 +08:00
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
84a3f73ecb
Particle set display frame ( #17163 )
...
* Fix CCParticleSystemQuad::setDisplayFrame()
* Added tests
2017-01-12 11:48:30 +08:00
91beb8db86
Fix incorrect function name for calculateBillboardTransform ( #17164 )
2017-01-12 10:14:04 +08:00
71a82f0f0d
Correct spelling of function name `getAncestorWidget` ( #17158 )
2017-01-11 05:36:13 -08:00
6e8ced6c8c
Fix minor typos in function parameters ( #17157 )
2017-01-11 05:34:57 -08:00
21795b71b4
sprite: doc fixes ( #17154 )
2017-01-11 05:33:41 -08:00
3bcf8fc48a
use std::stable_sort to keep order ( #17156 )
2017-01-11 15:47:36 +08:00
afb55253f1
fix dutch language value and add missing languages ( #17160 )
2017-01-11 14:04:45 +08:00
90e0ab0c2e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17152 )
2017-01-11 10:49:48 +08:00
1d2b73166e
Fix typos in docs ( #17132 )
2017-01-11 09:31:45 +08:00
91ae4b1c03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17143 )
2017-01-10 16:59:15 +08:00
e9a947b02a
updated location of openssl dlls ( #17133 )
2017-01-10 16:50:22 +08:00
733799f4a1
fix crash if physics3d camera is not set ( #17139 )
2017-01-10 15:37:29 +08:00
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
9d3d869c9d
make webview can clean cached data ( #17130 )
...
* make webview can clean cached data
* add implementatoin
2017-01-10 11:30:11 +08:00
4574896dbb
add some comments for key limitation ( #17122 )
2017-01-09 09:27:38 +08:00
54c32fc669
Fix for issue #17114 . Improves the ability to add placeholder color and font for single line text fields on iOS
2017-01-08 16:02:17 -08:00
af503f4a65
Allow velocity to be applied to Chipmunk's kinematic bodies ( #17094 )
...
* Allow velocity to be applied to Chipmunk's kinematic bodies
* Added check for CP_BODY_TYPE_STATIC
Thanks to @minggo for the code review
2017-01-06 09:35:34 +08:00
44fb4ba3bc
To use some HTTP client library those use `send(null)` like `superagent`,`XMLHTTPRequest` should send a empty request instead of abort. ( #16989 )
2017-01-05 16:12:03 +08:00
69217f0e8b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-05 01:40:38 +00:00
ff8e622b7a
Slice9 Sprite with triangles, not quads ( #17105 )
...
* sprites: use triangles instead of quads
uses less memory
* oops, color should be white by default
* works with flipped sprites
* none for xcode
2017-01-05 09:27:13 +08:00
93d193dfcc
Openssl adjust ( #17106 )
...
* change openssl search path
* copy libopenssl from openssl folder
* update external version
2017-01-05 09:22:38 +08:00
f5a90765fc
fix type conversion warnings ( #17061 )
...
* Fix conversion warning
from unsigned int to float
* Fix type conversion warning
* Fix type conversion warning
* change the return type of getOutlineSize to float
* fix typo
2017-01-04 12:01:07 +08:00
8e21738634
fix text input auto correction type ( #17085 )
2017-01-04 12:00:18 +08:00
a0acaf5972
Merge pull request #17101 from minggo/merge-v314
...
Merge v314
2017-01-04 11:48:31 +08:00
61170c69ee
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17103 )
2017-01-04 11:47:58 +08:00
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
f63fad3e27
Merge branch 'v3.14' into merge-v314
2017-01-04 09:49:22 +08:00
b3279bafa7
implements issue #17069 ( #17090 )
...
implemnts suggestion done by @three0s
2017-01-03 09:49:22 +08:00
0564d43478
fix bug, do not add null bones ( #16948 )
2016-12-29 15:44:57 +08:00
e4e872a065
fixed #16849 : Preload many audios may cause crash on devices those use Samsung Exynos CPU. ( #17049 )
...
* fixed #16849 : Preload many audios may cause crash on devices those use Samsung Exynos CPU.
* Adds comment for __SLPlayerMutex variable.
* Fixes wrong comments in AudioDecoder.cpp
2016-12-29 15:41:47 +08:00
ce4685c64f
vec4 operator < seems error ( #17072 )
...
* bug fix
* Vec4 operator <
2016-12-29 15:26:25 +08:00
4c5459660b
Merge pull request #17038 from MrCapone/ui_touch_fixes
...
CheckBox touch fix
2016-12-29 14:20:15 +08:00
163e730849
Fix label disableeffect ( #17075 )
...
* add toggle rendering type test
* fix label additional kerning
* only substract additionalKerning when bold is enabled
2016-12-29 13:59:24 +08:00
208d39151e
Reverts create thread pool code, android doesn't need to create a thread pool in AudioEngine.cpp ( #17081 )
2016-12-29 10:22:45 +08:00
be43c4210f
Fixes crash that playing long audio and then uncacheAll ( #17079 )
...
* Fixes crash of playing long audio then uncacheAll.
* update
* Updates comments in MciPlayer.h
* tab -> 4spaces
* include path fix.
2016-12-29 10:05:13 +08:00
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
88be66218b
Small fix to CallbackWrapper
2016-12-26 00:08:59 +08:00
7c2ea03b00
Improve TrackEntry issue solution with internal unordered_map
2016-12-26 00:08:18 +08:00
c4a20a032f
creator c++ support bug fixes ( #17051 )
...
I need these 2 changes applied to v3.14 in order to
support C++ correctly in Creator.
Thanks!
2016-12-21 16:17:32 +08:00
c071839e85
#17037 cocos/ui/UICheckBox.cpp fix: touch event logic
2016-12-21 13:21:40 +07:00
a715e3169f
Sync issue fixes from creator ( #17041 )
...
* 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
* Separate FinalizeHook for ref objects and non ref objects
* Fix spine TrackEntry recursive conversion issue by using getter
* Fix crash during Wrappers deallocation (possible to have leak)
* Increase default JS heap to 32 mb
* Update engine version
* Add change log of web engine
* Improve cc.formatStr
* Fix chipmunk crash issues when using setDefaultCollisionHandler
* Add change log for JSB and update web engine ref
2016-12-21 13:39:34 +08:00
100c027054
Fix chipmunk crash issues when using setDefaultCollisionHandler
2016-12-21 11:07:18 +08:00
a3d6705b02
Improve cc.formatStr
2016-12-21 11:05:49 +08:00
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
149bdf125e
Update engine version
2016-12-19 12:15:41 +08:00
51a09048bd
Increase default JS heap to 32 mb
2016-12-19 11:51:43 +08:00
a508b7d751
Fix crash during Wrappers deallocation (possible to have leak)
2016-12-19 11:51:23 +08:00
46dbb32fd9
Fix spine TrackEntry recursive conversion issue by using getter
2016-12-19 11:50:52 +08:00
2b6e84e9a2
Separate FinalizeHook for ref objects and non ref objects
2016-12-19 11:50:32 +08:00
57dffa3a12
fix issue #17022 ( #17025 )
...
for branch 3.14
don't re-flip the letters
2016-12-16 17:22:13 +08:00
77cf6de2e5
[label] Fixes shadow is drawn incorrect while also enabling outline. ( #17024 )
2016-12-16 14:56:36 +08:00
77d0e8292a
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17016 )
2016-12-15 10:03:04 +08:00
a66215916e
Added support for larger tilemaps in CCFastTMXTiledMap ( #17006 )
...
* Added option to use 32 bit indices for large maps
* Added option to use 32 bit indices for large maps
2016-12-15 10:01:37 +08:00
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
cdcdaffe98
don't force write depth info for transparent mesh ( #17013 )
2016-12-14 18:10:08 +08:00
c0291afad7
Merge branch 'v3.14' into merge-v3.14
2016-12-14 17:03:58 +08:00
966d47c251
fix crash if create and delete downloader quickly ( #17010 )
2016-12-14 14:44:36 +08:00
9903de8f30
Inform eventdispatcher on node reordering ( fixes #16992 ) ( #17007 )
...
When changing the order of a node associated to the scene graph priority listener, inform eventdispatcher of the change
2016-12-14 14:08:00 +08:00
3302781dae
fix tizen compile issue ( #17002 )
...
* fix tizen compile issue
* fix linux compile issue
2016-12-14 11:55:38 +08:00
edca6862b9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17009 )
2016-12-14 09:37:46 +08:00
5823f5792b
Synchronize creator engine bug fixes and upgrade web engine ( #17003 )
...
* 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
a73485a1bc
Use %ld instead of %zd
2016-12-13 18:12:50 +08:00
d89bde4e8e
Fix compilation issues and update web & bindings-generator
2016-12-13 15:37:46 +08:00
bedde74df5
Fix compilation issue when COCOS_DEBUG = 2
2016-12-13 14:29:25 +08:00
00b57c9565
Manual bind EventListeners’ create to avoid memory issue
2016-12-13 14:29:24 +08:00
3d6b1367cd
Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
2016-12-13 14:29:24 +08:00
6b25a73a93
Synchronize Scheduler.PRIORITY_NON_SYSTEM const
2016-12-13 14:29:24 +08:00
d4618e60ef
Synchronize Editbox APIs
2016-12-13 14:29:24 +08:00
ae5ccd16f2
Direct log/error for better understanding problems & add sys.now
2016-12-13 14:29:23 +08:00
b50ea4afce
Support more system languages
2016-12-13 14:29:23 +08:00
197dac204b
Fix function wrapper using js object during its gc
2016-12-13 14:29:23 +08:00
7ff5e8858b
Add EventDispatcher#hasEventListener (sync from creator)
2016-12-13 14:29:23 +08:00
ed72691bc9
[ios/macOS] Fixed a compilation error after enabling ‘CD_USE_STATIC_BUFFERS’. ( #16997 )
2016-12-13 13:37:31 +08:00
26f1ae813f
[win32] Fixes crash of getSubStringOfUTF8String. ( #16991 )
2016-12-13 11:58:28 +08:00
a2603d70ef
[android] Catches ‘NumberFormatException’ while invoking Integer.parseInt. ( #16988 )
...
* [android] Catches ‘NumberFormatException’ while invoking Integer.parseInt.
* [android] Catches ‘NullPointerException’ while converting Integer to int in Cocos2dxActivity.hideVirtualButton.
2016-12-12 11:44:31 +08:00
64994a2471
make it support .luac file too ( #16981 )
2016-12-09 17:52:45 +08:00
77f5204877
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16972 )
2016-12-09 14:30:01 +08:00
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
b288821bdd
use GLsizei to avoid overflow ( #16962 )
2016-12-06 23:05:56 -08:00
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
5ef072de03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-05 01:43:54 +00:00
84a6ab312c
use correct downloader implementation on mac ( #16955 )
2016-12-05 09:36:35 +08:00
minggo