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
mogemimi