Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,967 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

35967 Commits

Author SHA1 Message Date
effolkronium 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
minggo a0acaf5972 Merge pull request #17101 from minggo/merge-v314 
Merge v314
 2017-01-04 11:48:31 +08:00
CocosRobot 61170c69ee [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17103) 2017-01-04 11:47:58 +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 e5e431eeba update chinese release note 2017-01-03 09:54:16 +08:00
Ricardo Quesada b3279bafa7 implements issue #17069 (#17090) 
implemnts suggestion done by @three0s
 2017-01-03 09:49:22 +08:00
pandamicro e16828647c Fix web engine canvas mode issues (#17095) 
* 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
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