axmol/extensions
Carsten Sandtner b74f1fb161 Merge branch 'master' into XMLHttpRequest_cchttpclient
# By James Chen (23) and others
# Via James Chen (19) and others
* master: (57 commits)
  Update AUTHORS [ci skip]
  fixed #2151: Commenting a log in CCFileUtils::fullPathForFilename.
  Update AUTHORS [ci skip].
  fixed #2105: Refactoring travis build script.
  Assert statement modifies 'mType'.
  fixed #2151: Custom font can't be loaded correctly if using full path of filename.
  fixed #2150: Updating AUTHORS.
  fixed #2150: Adding tests for this issue and fix compilation error of CCScale9Sprite.
  fixed #2150: Updating ccb and ccbi files.
  Update AUTHORS
  fixed #2105: Updating the URL of 'Building Status' for travis.
  fixed #2105: Adding Travis build support. Moving script to 'tools/travis-script'.
  fixed #2149: "const CCSize& CCScrollView::getContentSize()" --> "const CCSize& CCScrollView::getContentSize() const".
  Update AUTHORS
  Update AUTHORS
  Update AUTHORS
  issue #2103 Add more lua test case(Replace encoding error)
  Added const to CCNode::getChildrenCount()
  Fix for wrong alignment using texture format sizes other than 4 bytes. For example RGBA4444 is 2 bytes per pixel. A texture with width of 1 passes the previous power of 2 test, but the alignment value needs to be 2, not 4.
  issue #2103 Add more lua test case(Add  PerformanceSpriteTest of PerformanceTest)
  ...
2013-05-13 17:02:17 +02:00
..
AssetsManager fixed #1489:add namespace to AssetsManager 2013-02-26 16:43:46 +08:00
CCBReader Assert statement modifies 'mType'. 2013-05-13 14:26:56 +03:00
GUI fixed #2150: Adding tests for this issue and fix compilation error of CCScale9Sprite. 2013-05-13 17:57:30 +08:00
LocalStorage fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h. 2013-01-07 18:06:53 +08:00
network Added getter and setter for raw header data 2013-05-13 16:57:07 +02:00
physics_nodes Fix CCPhysicsSprite getPosition variants 2013-04-15 07:35:49 -07:00
proj.blackberry Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
proj.emscripten Remove LOG prefixes from emscripten makefiles 2013-05-06 21:00:38 -07:00
proj.linux issue #2075: Updating extensions project for linux, native client and marmalade. 2013-04-24 14:37:22 +08:00
proj.marmalade issue #2075: Updating extensions project for linux, native client and marmalade. 2013-04-24 14:37:22 +08:00
proj.nacl issue #2075: Updating extensions project for linux, native client and marmalade. 2013-04-24 14:37:22 +08:00
proj.win32 issue #2075: Adding spinetest in TestCpp for win32. 2013-04-24 14:48:39 +08:00
spine Fix warnings. 2013-04-29 16:46:48 -07:00
Android.mk issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
ExtensionMacros.h issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension. 2012-09-25 17:26:09 +08:00
cocos-ext.h Adding spine/spine-cocos2dx.h to cocos-ext.h. 2013-04-24 14:36:11 +08:00