axmol/samples/Cpp/TestCpp
Huabing.Xu b2934d32bc Merge branch 'develop' into develop_RenderTextureBug
* develop: (32 commits)
  fix align text error in label
  Update the JS binding code & samples for latest cocos2d engine.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
  Updates nativeactivity.cpp.
  closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead.
  remove other non-functional jenkins scripts
  [AUTO] : updating submodule reference to latest autogenerated bindings
  move ghprb.py to tools/jenkins-scripts/
  issue #2050: commit resources
  add github pull request builder for Jenkins
  Adds an empty LuaEngine::parseConfig function.
  [JSB] Adds trigger bindings for CocoStudio.
  update cocos2d-x version string
  update describe for support translucency on android
  update describe for support translucency on android
  update describe for support translucency on android
  recover java activity on android.
  remove draw increment
  migrate ShaderTestSprite to new renderer
  ...
2013-12-31 14:58:11 +08:00
..
.externalToolBuilders Adding missing eclipse project files 2013-03-07 12:13:50 -08:00
Classes Merge branch 'develop' into develop_RenderTextureBug 2013-12-31 14:58:11 +08:00
Resources Updates spine test. 2013-12-19 21:35:43 +08:00
proj.android update describe for support translucency on android 2013-12-30 18:12:43 +08:00
proj.ios issue #2800:Can not hide status bar on iOS 7 2013-09-13 15:54:58 +08:00
proj.linux Merge folder changes from develop 2013-10-30 23:19:36 -07:00
proj.mac Icons for test projects 2013-10-16 11:55:14 -07:00
proj.win32 fix compiling error in vs project on win7. 2013-12-27 14:38:22 +08:00
.cproject Adding missing eclipse project files 2013-03-07 12:13:50 -08:00
Android.mk Merge branch 'develop' into #3457 2013-12-26 16:56:43 +08:00
CMakeLists.txt Merge branch 'develop' into #3457 2013-12-26 16:56:43 +08:00