Huabing.Xu
0564d43478
fix bug, do not add null bones ( #16948 )
2016-12-29 15:44:57 +08:00
James Chen
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
niu2x
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
子龙山人
e44b9d5f20
Merge pull request #17082 from CocosRobot/update_lua_bindings_1482978657
...
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-29 13:51:52 +08:00
CocosRobot#Set
7950719e83
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-29 02:31:01 +00:00
James Chen
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
James Chen
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
minggo
c15da89c5e
use projection 2d ( #17078 )
2016-12-28 18:20:14 +08:00
pandamicro
1234e88046
Update web ref ( #17073 )
2016-12-28 10:47:42 +08:00
Bin Zhang
3656c999da
Update the reference of submodule cocos2d-console. ( #17074 )
...
Changes: Keep the ndk module paths without relative path.
2016-12-27 18:30:05 +08:00
minggo
279ae9819c
Merge pull request #17071 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
minggo
acabd11668
Merge pull request #17067 from pandamicro/v3.14
...
Fix QA reported issues in v3.14
2016-12-27 09:30:08 +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
895e3137b9
Update web engine ref
2016-12-26 18:45:24 +08:00
pandamicro
8c71531338
Fix test case issues and add change log
2016-12-26 18:36:19 +08:00
pandamicro
864c277a2f
AssetsManagerEx: Fix failure to decompress when sub directory is not created
2016-12-26 18:29:07 +08:00
子龙山人
6fa331b065
fix js tests description ( #17065 )
2016-12-26 18:15:05 +08:00
minggo
46ef933716
fix a bug that inserted text will overlap with title ( #17058 )
2016-12-26 09:22:49 +08:00
pandamicro
88be66218b
Small fix to CallbackWrapper
2016-12-26 00:08:59 +08:00
pandamicro
7c2ea03b00
Improve TrackEntry issue solution with internal unordered_map
2016-12-26 00:08:18 +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 ( #17057 )
2016-12-23 16:44:29 +08:00
minggo
fe2b2a4fbb
[ci skip]Update changelog releasenote ( #17056 )
...
* update changelog
* update changelog and release note for v3.14
* update top content of doc
* add chinese release note
2016-12-23 11:25:20 +08:00
Ricardo Quesada
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
Dmitry
c071839e85
#17037 cocos/ui/UICheckBox.cpp fix: touch event logic
2016-12-21 13:21:40 +07:00
minggo
b57db96f09
don't use Layer ( #17048 )
2016-12-21 13:49:59 +08:00
minggo
9e57d6b7d4
[ci skip]Update changelog releasenote ( #17050 )
...
* update changelog
* update changelog and release note for v3.14
* update top content of doc
2016-12-21 13:49:44 +08:00
pandamicro
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
pandamicro
3dd8271241
Add change log for JSB and update web engine ref
2016-12-21 11:10:48 +08:00
pandamicro
100c027054
Fix chipmunk crash issues when using setDefaultCollisionHandler
2016-12-21 11:07:18 +08:00
pandamicro
a3d6705b02
Improve cc.formatStr
2016-12-21 11:05:49 +08:00
Wilson E. Alvarez
035aab2e1c
Make COCOS2D_DEBUG span throughout libcocos2d in Linux ( #17033 )
...
CCASSERT and other macros that are affected by COCOS2D_DEBUG will now be
properly defined for debugging builds in Linux.
2016-12-20 09:32:51 +08:00
pandamicro
6c159654df
Add change log of web engine
2016-12-20 01:05:57 +08:00
minggo
bd0789e22c
sync codes from cpp to js ( #17042 )
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
pandamicro
149bdf125e
Update engine version
2016-12-19 12:15:41 +08:00
pandamicro
51a09048bd
Increase default JS heap to 32 mb
2016-12-19 11:51:43 +08:00
pandamicro
a508b7d751
Fix crash during Wrappers deallocation (possible to have leak)
2016-12-19 11:51:23 +08:00
pandamicro
46dbb32fd9
Fix spine TrackEntry recursive conversion issue by using getter
2016-12-19 11:50:52 +08:00
pandamicro
2b6e84e9a2
Separate FinalizeHook for ref objects and non ref objects
2016-12-19 11:50:32 +08:00
minggo
3adbc2a116
change button background picture ( #17040 )
2016-12-19 10:44:56 +08:00
Ricardo Quesada
57dffa3a12
fix issue #17022 ( #17025 )
...
for branch 3.14
don't re-flip the letters
2016-12-16 17:22:13 +08:00
minggo
691a0ce8a5
fix the bug that sprite is not hide after trees ( #17028 )
2016-12-16 15:45:34 +08:00
minggo
291307b698
should retain object to be used later ( #17027 )
2016-12-16 15:16:00 +08:00
James Chen
77cf6de2e5
[label] Fixes shadow is drawn incorrect while also enabling outline. ( #17024 )
2016-12-16 14:56:36 +08:00
minggo
7c2bd27d71
unschedule all before exit ( #17026 )
2016-12-16 14:53:15 +08:00
minggo
332ef17d51
use correct spine api ( #17023 )
2016-12-16 11:24:11 +08:00