Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/2d/platform
History
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
..
android Merge branch 'develop' into free_instead_of_delete 2013-11-15 09:44:29 +08:00
apple issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ios Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime 2013-11-12 20:18:04 +08:00
linux issue #2770: fix some warning 2013-11-13 11:22:34 +08:00
mac removes exe bit from text files 2013-11-08 11:30:50 -08:00
win32 Fix bug: add android, fix android can not compile 2013-11-14 17:14:35 +08:00
CCApplicationProtocol.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCCommon.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCDevice.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCEGLViewProtocol.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into fix_touch_retain 2013-11-12 19:24:09 +08:00
CCEGLViewProtocol.h Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
CCFileUtils.cpp replaces `delete[]` with `free()` in C-based API 2013-11-11 18:09:47 -08:00
CCFileUtils.h replaces `delete[]` with `free()` in C-based API 2013-11-11 18:09:47 -08:00
CCImage.h Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
CCImageCommon_cpp.h Fix bug: use free() in imageCommon_cpp.h 2013-11-14 14:48:16 +08:00
CCSAXParser.cpp replaces `delete[]` with `free()` in C-based API 2013-11-11 18:09:47 -08:00
CCSAXParser.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCThread.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCThread.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00