add m_fDeltaTime getter function
add cpp function
Added compatible functions for HTML5 multi resources preloading.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge pull request #3 from cocos2d/master

merge from cocos2d-x
fix CCScale9Sprite bugs when parsing rotated spriteframe from plist file that texture packer generate.
Workaround for some problems due to UITextField of CCEditBoxImplIOS is attached as a view above OpenGL view. It has a topmost touch priority higher than any other CCNode objects, and also cannot be veiled by any other CCNode objects.
In this change, UITextField is visible only when the CCEditBox is in edit mode. And in non-edit mode, UITextField is hidden and CCLabelTTF is shown instead with all same attributes at the same place.
Comment out 'setVisible()'
Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AppDelegate.cpp
[Linux] add cache for font family -> font path mapping

As FcFontMach is quite an expensive call the results of getFontFile() are
now cached in an std::map if either a ttf file is packed with the app or
if a font file has been found by using fontconfig
Fix warning in linux build.

Also, define _DEBUG rather then DEBUG in linux and nacl makefiles
by default, and limit the command line definions that are used
when building Box2D.
Merge pull request #2149 from fape/jsb_update

Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AssetsManagerTest and CocosPlayer
Merge pull request #2151 from sbc100/fix_warning

Fix warning in linux build.
Merge pull request #2114 from linshun/master

Added compatible function for multi secene resouces preloading.
Merge pull request #2069 from jxhgzs/cocos2dx_getDeltaTime

add m_fDeltaTime getter function
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2152 from CocosRobot/updategeneratedsubmodule_1363147492

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
fix: can't generate CCNode.h's document with doxygen 1.8.3
issue #1803:refactor lua codes
Merge https://github.com/cocos2d/cocos2d-x into iss1803-spritetest-lua