9 Commits

Author	SHA1	Message	Date
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
boyu0	f2e18f32a9	fix android compile error	2013-12-25 13:57:17 +08:00
James Chen	2892e8be3f	Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.	2013-12-18 14:58:17 +08:00
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
Huabing.Xu	022b5c7b9a	Merge branch 'develop' into free_instead_of_delete ... # By CaiWenzhi (4) and others # Via minggo (7) and others * develop: fix asynchronize loading bug [AUTO] : updating submodule reference to latest autogenerated bindings fixed #3185 support for html5. fixed bug of widget fixed bugs of widget fixed #3185 ComponentTest and SceneTest NULL to nullptr. Add deprecated functions of class TextureCache fix warning set z order after reorder fixed #3185 replace NULL to nullptr. add "override" fixed #3185 Modify code criterion Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSSceneReader.cpp	2013-11-15 09:44:29 +08:00
minggo	2f7f05d1d7	fix asynchronize loading bug	2013-11-14 18:39:23 +08:00
Huabing.Xu	4894632467	Fix bug: add android, fix android can not compile	2013-11-14 17:14:35 +08:00
minggo	b9b14571ac	fix compiling erros on Android	2013-11-07 17:16:31 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00