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

12553 Commits

Author SHA1 Message Date
minggo 9d3d869c9d make webview can clean cached data (#17130) 
* make webview can clean cached data

* add implementatoin
 2017-01-10 11:30:11 +08:00
minggo 4574896dbb add some comments for key limitation (#17122) 2017-01-09 09:27:38 +08:00
DavidDeSimone 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
Wilson E. Alvarez 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
kosmosR2 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
CocosRobot#Set 69217f0e8b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-05 01:40:38 +00:00
Ricardo Quesada 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
minggo 93d193dfcc Openssl adjust (#17106) 
* change openssl search path

* copy libopenssl from openssl folder

* update external version
 2017-01-05 09:22:38 +08:00
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
Ricardo Quesada b3279bafa7 implements issue #17069 (#17090) 
implemnts suggestion done by @three0s
 2017-01-03 09:49:22 +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
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
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 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
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
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 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
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
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
James Chen 77cf6de2e5 [label] Fixes shadow is drawn incorrect while also enabling outline. (#17024) 2016-12-16 14:56:36 +08:00
CocosRobot 77d0e8292a [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17016) 2016-12-15 10:03:04 +08:00
Ruud Arentsen 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
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
minggo cdcdaffe98 don't force write depth info for transparent mesh (#17013) 2016-12-14 18:10:08 +08:00
James Chen c0291afad7 Merge branch 'v3.14' into merge-v3.14 2016-12-14 17:03:58 +08:00
minggo 966d47c251 fix crash if create and delete downloader quickly (#17010) 2016-12-14 14:44:36 +08:00
Francesco Capano 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
CocosRobot edca6862b9 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17009) 2016-12-14 09:37:46 +08:00
pandamicro 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
pandamicro a73485a1bc Use %ld instead of %zd 2016-12-13 18:12:50 +08:00
pandamicro d89bde4e8e Fix compilation issues and update web & bindings-generator 2016-12-13 15:37:46 +08:00