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

36376 Commits

Author SHA1 Message Date
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
minggo 0a48eec043 update external version (#17020) 2016-12-16 10:23:41 +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
minggo 355a11945c Merge pull request #17014 from dumganhar/merge-v3.14 
Merge v3.14
 2016-12-14 18:09:41 +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
minggo de670c1913 Lua tests (#17005) 
* fix conflict effect

* set index to 1 before running a test case
 2016-12-14 09:28:19 +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 bc4b0c0f1b Fix lua compilation issue 2016-12-13 17:42:26 +08:00
minggo 6f58131653 fix bug that localnization can not work correctly (#17001) 
* fix bug that localnization can not work correctly

* re-enable other test cases
 2016-12-13 16:33:11 +08:00
minggo ba7c977111 use no border policy (#17004) 2016-12-13 16:31:31 +08:00
pandamicro d89bde4e8e Fix compilation issues and update web & bindings-generator 2016-12-13 15:37:46 +08:00
pandamicro 603386d96e Unify function name of Texture2D::releaseTexture 2016-12-13 14:29:25 +08:00
pandamicro bedde74df5 Fix compilation issue when COCOS_DEBUG = 2 2016-12-13 14:29:25 +08:00
pandamicro 00b57c9565 Manual bind EventListeners’ create to avoid memory issue 2016-12-13 14:29:24 +08:00
pandamicro 3d6b1367cd Manually bind EventDispatcher::addCustomEventListener to avoid memory issue 2016-12-13 14:29:24 +08:00
pandamicro e469f4f710 Upgrade test cases 2016-12-13 14:29:24 +08:00
pandamicro 7c0fad53e6 Upgrade web engine 2016-12-13 14:29:24 +08:00
pandamicro 6b25a73a93 Synchronize Scheduler.PRIORITY_NON_SYSTEM const 2016-12-13 14:29:24 +08:00
pandamicro d4618e60ef Synchronize Editbox APIs 2016-12-13 14:29:24 +08:00
pandamicro ae5ccd16f2 Direct log/error for better understanding problems & add sys.now 2016-12-13 14:29:23 +08:00
pandamicro b50ea4afce Support more system languages 2016-12-13 14:29:23 +08:00
pandamicro 197dac204b Fix function wrapper using js object during its gc 2016-12-13 14:29:23 +08:00
pandamicro 7ff5e8858b Add EventDispatcher#hasEventListener (sync from creator) 2016-12-13 14:29:23 +08:00
minggo 80954d392d fix label position (#16998) 2016-12-13 13:38:49 +08:00
James Chen ed72691bc9 [ios/macOS] Fixed a compilation error after enabling ‘CD_USE_STATIC_BUFFERS’. (#16997) 2016-12-13 13:37:31 +08:00