5 Commits

Author	SHA1	Message	Date
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