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/android
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
..
java removes exe bit from text files 2013-11-08 11:30:50 -08:00
jni Clear NoSuchMethodError Exception when JniHelper fails to find methodID 2013-10-28 18:40:58 +00:00
Android.mk fix xcode compiling error and simplify android.mk 2013-10-18 15:39:09 +08:00
CCApplication.cpp android & ios screen size change support 2013-10-23 12:29:59 +04:00
CCApplication.h android & ios screen size change support 2013-10-23 12:29:59 +04:00
CCCommon.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCDevice.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCEGLView.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime 2013-11-12 20:18:04 +08:00
CCEGLView.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
CCFileUtilsAndroid.cpp Merge branch 'develop' into free_instead_of_delete 2013-11-15 09:44:29 +08:00
CCFileUtilsAndroid.h fix compiling erros on Android 2013-11-07 17:16:31 +08:00
CCGL.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCImage.cpp issue #2970:crash for CCLabelTTF when setting dimension width less than the font height 2013-10-31 16:59:55 +08:00
CCPlatformDefine.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCStdC.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
nativeactivity.cpp Merge pull request #3997 from ondesly/screen_size_change 2013-11-10 23:10:13 -08:00
nativeactivity.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00