12 Commits

Author	SHA1	Message	Date
James Chen	225b5e0e4f	Merge pull request #5492 from dumganhar/iss4129-remove-all-listener ... closed #4129: Event listeners used in engine shouldn't be removed by method removeAllEventListeners().	2014-02-28 16:09:54 +08:00
James Chen	7dd75ea2cb	issue #4129: Adds test case for issue 4119.	2014-02-28 15:46:48 +08:00
zhangbin	9a5adc5be5	closed #3684, Optimize the code of TextureAtlas test case.	2014-02-28 11:52:08 +08:00
zhangbin	ddf5957a9c	closed #3684, Set shader program before TextureAtlas is rendered.	2014-02-28 11:43:41 +08:00
James Chen	b363751b1a	Merge pull request #5477 from heliclei/console-upload-file ... CCConsole:support file upload via telnet console	2014-02-27 21:53:57 +08:00
James Chen	4277509966	Merge pull request #5463 from andyque/refactor3877 ... closed #3877. make fadeIn and fadeOut behaviours correct	2014-02-27 21:49:38 +08:00
heliclei	5531cae2ec	Merge remote-tracking branch 'upstream/develop' into console-upload-file	2014-02-27 21:35:53 +08:00
James Chen	a96f44f31d	Adds override for override functions (onEnter, onExit) in cpp-tests.	2014-02-27 21:10:03 +08:00
andyque	32d3bf03bd	fixed #3877. make fadeIn and fadeOut behaviours correct	2014-02-27 21:00:25 +08:00
boyu0	8c536589df	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss4118_physical_performance_improve	2014-02-27 20:04:04 +08:00
zhangbin	03ea69d074	Merge branch 'develop' of https://github.com/natural-law/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-02-27 15:29:31 +08:00
James Chen	c2acfea633	issue #4116: Delete non-scripting files.	2014-02-26 21:17:17 +08:00