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
James Chen
26f1ae813f
[win32] Fixes crash of getSubStringOfUTF8String. ( #16991 )
2016-12-13 11:58:28 +08:00
James Chen
f26cc15373
Avoids function name conflict, and uses ` http://httpbin.org/gzip ` to test gzip functionality since only httpbin.org was added to exception list in Info.plist. ( #16933 )
2016-12-13 11:44:42 +08:00
James Chen
636a253981
[cpp-tests] Reverts code change by mistake. ( #16996 )
...
The mistake was merged in https://github.com/cocos2d/cocos2d-x/pull/7619 .
2016-12-13 11:42:12 +08:00
minggo
93a879bfab
remove unneeded files ( #16990 )
2016-12-12 16:25:58 +08:00
James Chen
a2603d70ef
[android] Catches ‘NumberFormatException’ while invoking Integer.parseInt. ( #16988 )
...
* [android] Catches ‘NumberFormatException’ while invoking Integer.parseInt.
* [android] Catches ‘NullPointerException’ while converting Integer to int in Cocos2dxActivity.hideVirtualButton.
2016-12-12 11:44:31 +08:00
minggo
2c2ed5c5f5
don't let toggle accept focus ( #16982 )
2016-12-12 09:41:53 +08:00
James Chen
91daa7a12a
Fixes NewEventDispatcherTest. ( #16983 )
...
fixed http://punchbox.info:3000/issues/26036
2016-12-12 09:39:20 +08:00
minggo
64994a2471
make it support .luac file too ( #16981 )
2016-12-09 17:52:45 +08:00
CocosRobot
77f5204877
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16972 )
2016-12-09 14:30:01 +08:00
James Chen
951b5174db
[lua-tests] Fixes PhysicsDemoBug5482 crashes. ( #16979 )
...
Fixed http://punchbox.info:3000/issues/26011
2016-12-09 14:12:57 +08:00
minggo
fb3055e98c
remove duplicated codes to fix crash in release mode ( #16978 )
2016-12-09 13:42:16 +08:00
James Chen
e6aa2ace3e
[lua] Fixes AssetsManagerEx test crashes. ( #16977 )
2016-12-09 12:04:38 +08:00
James Chen
a0b67fc99a
Fixes lua action test ‘Issue 1305’ crashes. ( #16974 )
...
* Fixes lua action test ‘Issue 1305’ crashes.
* Removes an unused log.
2016-12-09 10:39:34 +08:00