exposed AssetsManager to javascript and added multiple-assetsManager support

.gitignore

@@ -94,3 +94,6 @@ tools/jenkins_scripts/mac/android/userconf.ini
 
 # CTags
 tags
+
+# generated js bindings
+scripting/javascript/bindings/generated

cocos2d_libs.xcodeproj/project.pbxproj

@@ -131,6 +131,10 @@
 		1AE019851790023400D574A8 /* SocketIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE019821790023400D574A8 /* SocketIO.cpp */; };
 		1AE019861790023400D574A8 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE019831790023400D574A8 /* SocketIO.h */; };
 		1AE019871790023400D574A8 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE019831790023400D574A8 /* SocketIO.h */; };
+		211AA4DA17D6CA1400A7D5FC /* WebFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 211AA4D817D6CA1400A7D5FC /* WebFile.cpp */; };
+		211AA4DB17D6CA1400A7D5FC /* WebFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 211AA4D817D6CA1400A7D5FC /* WebFile.cpp */; };
+		211AA4DC17D6CA1400A7D5FC /* WebFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 211AA4D917D6CA1400A7D5FC /* WebFile.h */; };
+		211AA4DD17D6CA1400A7D5FC /* WebFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 211AA4D917D6CA1400A7D5FC /* WebFile.h */; };
 		466AF6A017A12298002EE9BB /* CCDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 466AF69E17A12297002EE9BB /* CCDeprecated.cpp */; };
 		466AF6A117A12298002EE9BB /* CCDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 466AF69E17A12297002EE9BB /* CCDeprecated.cpp */; };
 		466AF6A717A23A07002EE9BB /* CCDeprecated-ext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 466AF6A617A23A07002EE9BB /* CCDeprecated-ext.cpp */; };
@@ -1936,6 +1940,8 @@
 		1A94D34C16C2014900D79D09 /* libwebp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebp.a; path = ../platform/third_party/mac/libraries/libwebp.a; sourceTree = "<group>"; };
 		1AE019821790023400D574A8 /* SocketIO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketIO.cpp; sourceTree = "<group>"; };
 		1AE019831790023400D574A8 /* SocketIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketIO.h; sourceTree = "<group>"; };
+		211AA4D817D6CA1400A7D5FC /* WebFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFile.cpp; sourceTree = "<group>"; };
+		211AA4D917D6CA1400A7D5FC /* WebFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFile.h; sourceTree = "<group>"; };
 		466AF689179FCBBB002EE9BB /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawPrimitives.lua; sourceTree = "<group>"; };
 		466AF69E17A12297002EE9BB /* CCDeprecated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCDeprecated.cpp; sourceTree = "<group>"; };
 		466AF6A617A23A07002EE9BB /* CCDeprecated-ext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "CCDeprecated-ext.cpp"; sourceTree = "<group>"; };
@@ -4440,6 +4446,8 @@
 		A03F309C178145F3006731B9 /* network */ = {
 			isa = PBXGroup;
 			children = (
+				211AA4D817D6CA1400A7D5FC /* WebFile.cpp */,
+				211AA4D917D6CA1400A7D5FC /* WebFile.h */,
 				A03F309D178145F3006731B9 /* HttpClient.cpp */,
 				A03F309E178145F3006731B9 /* HttpClient.h */,
 				A03F309F178145F3006731B9 /* HttpRequest.h */,
@@ -5444,6 +5452,7 @@
 				A03F31E1178145F3006731B9 /* spine.h in Headers */,
 				1AE019861790023400D574A8 /* SocketIO.h in Headers */,
 				1A50FEA517A0C89300A422C8 /* CCDeprecated-ext.h in Headers */,
+				211AA4DC17D6CA1400A7D5FC /* WebFile.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5870,6 +5879,7 @@
 				A07A4EF81783867C0073F6A7 /* spine.h in Headers */,
 				1AE019871790023400D574A8 /* SocketIO.h in Headers */,
 				1A50FEA617A0C89300A422C8 /* CCDeprecated-ext.h in Headers */,
+				211AA4DD17D6CA1400A7D5FC /* WebFile.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6763,6 +6773,7 @@
 				A03F31DF178145F3006731B9 /* spine-cocos2dx.cpp in Sources */,
 				1AE019841790023400D574A8 /* SocketIO.cpp in Sources */,
 				466AF6A717A23A07002EE9BB /* CCDeprecated-ext.cpp in Sources */,
+				211AA4DA17D6CA1400A7D5FC /* WebFile.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -7049,6 +7060,7 @@
 				A07A4E7A1783867C0073F6A7 /* spine-cocos2dx.cpp in Sources */,
 				1AE019851790023400D574A8 /* SocketIO.cpp in Sources */,
 				466AF6A817A23A07002EE9BB /* CCDeprecated-ext.cpp in Sources */,
+				211AA4DB17D6CA1400A7D5FC /* WebFile.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

extensions/Android.mk

@@ -1,134 +1,135 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := cocos_extension_static
-
-LOCAL_MODULE_FILENAME := libextension
-
-LOCAL_SRC_FILES := AssetsManager/AssetsManager.cpp \
-CCArmature/CCArmature.cpp \
-CCArmature/CCBone.cpp \
-CCArmature/animation/CCArmatureAnimation.cpp \
-CCArmature/animation/CCProcessBase.cpp \
-CCArmature/animation/CCTween.cpp \
-CCArmature/datas/CCDatas.cpp \
-CCArmature/display/CCBatchNode.cpp \
-CCArmature/display/CCDecorativeDisplay.cpp \
-CCArmature/display/CCDisplayFactory.cpp \
-CCArmature/display/CCDisplayManager.cpp \
-CCArmature/display/CCShaderNode.cpp \
-CCArmature/display/CCSkin.cpp \
-CCArmature/external_tool/GLES-Render.cpp \
-CCArmature/external_tool/Json/CSContentJsonDictionary.cpp \
-CCArmature/external_tool/Json/lib_json/json_value.cpp \
-CCArmature/external_tool/Json/lib_json/json_reader.cpp \
-CCArmature/external_tool/Json/lib_json/json_writer.cpp \
-CCArmature/physics/CCColliderDetector.cpp \
-CCArmature/physics/CCPhysicsWorld.cpp \
-CCArmature/utils/CCArmatureDataManager.cpp \
-CCArmature/utils/CCDataReaderHelper.cpp \
-CCArmature/utils/CCSpriteFrameCacheHelper.cpp \
-CCArmature/utils/CCTransformHelp.cpp \
-CCArmature/utils/CCTweenFunction.cpp \
-CCArmature/utils/CCUtilMath.cpp \
-CCBReader/CCBFileLoader.cpp \
-CCBReader/CCBReader.cpp \
-CCBReader/CCControlButtonLoader.cpp \
-CCBReader/CCControlLoader.cpp \
-CCBReader/CCLabelBMFontLoader.cpp \
-CCBReader/CCLabelTTFLoader.cpp \
-CCBReader/CCLayerColorLoader.cpp \
-CCBReader/CCLayerGradientLoader.cpp \
-CCBReader/CCLayerLoader.cpp \
-CCBReader/CCMenuItemImageLoader.cpp \
-CCBReader/CCMenuItemLoader.cpp \
-CCBReader/CCNodeLoader.cpp \
-CCBReader/CCNodeLoaderLibrary.cpp \
-CCBReader/CCParticleSystemQuadLoader.cpp \
-CCBReader/CCScale9SpriteLoader.cpp \
-CCBReader/CCScrollViewLoader.cpp \
-CCBReader/CCSpriteLoader.cpp \
-CCBReader/CCBAnimationManager.cpp \
-CCBReader/CCBKeyframe.cpp \
-CCBReader/CCBSequence.cpp \
-CCBReader/CCBSequenceProperty.cpp \
-CCBReader/CCBValue.cpp \
-CCBReader/CCNode+CCBRelativePositioning.cpp \
-Components/CCComAttribute.cpp \
-Components/CCComAudio.cpp \
-Components/CCComController.cpp \
-Components/CCInputDelegate.cpp \
-GUI/CCControlExtension/CCControl.cpp \
-GUI/CCControlExtension/CCControlButton.cpp \
-GUI/CCControlExtension/CCControlColourPicker.cpp \
-GUI/CCControlExtension/CCControlHuePicker.cpp \
-GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \
-GUI/CCControlExtension/CCControlSlider.cpp \
-GUI/CCControlExtension/CCControlSwitch.cpp \
-GUI/CCControlExtension/CCControlUtils.cpp \
-GUI/CCControlExtension/CCInvocation.cpp \
-GUI/CCControlExtension/CCScale9Sprite.cpp \
-GUI/CCControlExtension/CCControlPotentiometer.cpp \
-GUI/CCControlExtension/CCControlStepper.cpp \
-GUI/CCScrollView/CCScrollView.cpp \
-GUI/CCScrollView/CCTableView.cpp \
-GUI/CCScrollView/CCTableViewCell.cpp \
-GUI/CCScrollView/CCSorting.cpp \
-GUI/CCEditBox/CCEditBox.cpp \
-GUI/CCEditBox/CCEditBoxImplAndroid.cpp \
-network/HttpClient.cpp \
-network/WebSocket.cpp \
-network/SocketIO.cpp \
-physics_nodes/CCPhysicsDebugNode.cpp \
-physics_nodes/CCPhysicsSprite.cpp \
-LocalStorage/LocalStorageAndroid.cpp \
-spine/Animation.cpp \
-spine/AnimationState.cpp \
-spine/AnimationStateData.cpp \
-spine/Atlas.cpp \
-spine/AtlasAttachmentLoader.cpp \
-spine/Attachment.cpp \
-spine/AttachmentLoader.cpp \
-spine/Bone.cpp \
-spine/BoneData.cpp \
-spine/Json.cpp \
-spine/RegionAttachment.cpp \
-spine/Skeleton.cpp \
-spine/SkeletonData.cpp \
-spine/SkeletonJson.cpp \
-spine/Skin.cpp \
-spine/Slot.cpp \
-spine/SlotData.cpp \
-spine/extension.cpp \
-spine/CCSkeletonAnimation.cpp \
-spine/CCSkeleton.cpp \
-spine/spine-cocos2dx.cpp \
-CCDeprecated-ext.cpp
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static
-LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
-LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
-LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static
-
-LOCAL_CXXFLAGS += -fexceptions
-
-LOCAL_CFLAGS += -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-LOCAL_EXPORT_CFLAGS += -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
-                           $(LOCAL_PATH)/CCBReader \
-                           $(LOCAL_PATH)/GUI/CCControlExtension \
-                           $(LOCAL_PATH)/GUI/CCScrollView \
-                           $(LOCAL_PATH)/network \
-                           $(LOCAL_PATH)/LocalStorage 
-
-include $(BUILD_STATIC_LIBRARY)
-
-$(call import-module,cocos2dx)
-$(call import-module,CocosDenshion/android)
-$(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
-$(call import-module,external/Box2D)
-$(call import-module,external/chipmunk)
-$(call import-module,external/libwebsockets/android)
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := cocos_extension_static
+
+LOCAL_MODULE_FILENAME := libextension
+
+LOCAL_SRC_FILES := AssetsManager/AssetsManager.cpp \
+CCArmature/CCArmature.cpp \
+CCArmature/CCBone.cpp \
+CCArmature/animation/CCArmatureAnimation.cpp \
+CCArmature/animation/CCProcessBase.cpp \
+CCArmature/animation/CCTween.cpp \
+CCArmature/datas/CCDatas.cpp \
+CCArmature/display/CCBatchNode.cpp \
+CCArmature/display/CCDecorativeDisplay.cpp \
+CCArmature/display/CCDisplayFactory.cpp \
+CCArmature/display/CCDisplayManager.cpp \
+CCArmature/display/CCShaderNode.cpp \
+CCArmature/display/CCSkin.cpp \
+CCArmature/external_tool/GLES-Render.cpp \
+CCArmature/external_tool/Json/CSContentJsonDictionary.cpp \
+CCArmature/external_tool/Json/lib_json/json_value.cpp \
+CCArmature/external_tool/Json/lib_json/json_reader.cpp \
+CCArmature/external_tool/Json/lib_json/json_writer.cpp \
+CCArmature/physics/CCColliderDetector.cpp \
+CCArmature/physics/CCPhysicsWorld.cpp \
+CCArmature/utils/CCArmatureDataManager.cpp \
+CCArmature/utils/CCDataReaderHelper.cpp \
+CCArmature/utils/CCSpriteFrameCacheHelper.cpp \
+CCArmature/utils/CCTransformHelp.cpp \
+CCArmature/utils/CCTweenFunction.cpp \
+CCArmature/utils/CCUtilMath.cpp \
+CCBReader/CCBFileLoader.cpp \
+CCBReader/CCBReader.cpp \
+CCBReader/CCControlButtonLoader.cpp \
+CCBReader/CCControlLoader.cpp \
+CCBReader/CCLabelBMFontLoader.cpp \
+CCBReader/CCLabelTTFLoader.cpp \
+CCBReader/CCLayerColorLoader.cpp \
+CCBReader/CCLayerGradientLoader.cpp \
+CCBReader/CCLayerLoader.cpp \
+CCBReader/CCMenuItemImageLoader.cpp \
+CCBReader/CCMenuItemLoader.cpp \
+CCBReader/CCNodeLoader.cpp \
+CCBReader/CCNodeLoaderLibrary.cpp \
+CCBReader/CCParticleSystemQuadLoader.cpp \
+CCBReader/CCScale9SpriteLoader.cpp \
+CCBReader/CCScrollViewLoader.cpp \
+CCBReader/CCSpriteLoader.cpp \
+CCBReader/CCBAnimationManager.cpp \
+CCBReader/CCBKeyframe.cpp \
+CCBReader/CCBSequence.cpp \
+CCBReader/CCBSequenceProperty.cpp \
+CCBReader/CCBValue.cpp \
+CCBReader/CCNode+CCBRelativePositioning.cpp \
+Components/CCComAttribute.cpp \
+Components/CCComAudio.cpp \
+Components/CCComController.cpp \
+Components/CCInputDelegate.cpp \
+GUI/CCControlExtension/CCControl.cpp \
+GUI/CCControlExtension/CCControlButton.cpp \
+GUI/CCControlExtension/CCControlColourPicker.cpp \
+GUI/CCControlExtension/CCControlHuePicker.cpp \
+GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \
+GUI/CCControlExtension/CCControlSlider.cpp \
+GUI/CCControlExtension/CCControlSwitch.cpp \
+GUI/CCControlExtension/CCControlUtils.cpp \
+GUI/CCControlExtension/CCInvocation.cpp \
+GUI/CCControlExtension/CCScale9Sprite.cpp \
+GUI/CCControlExtension/CCControlPotentiometer.cpp \
+GUI/CCControlExtension/CCControlStepper.cpp \
+GUI/CCScrollView/CCScrollView.cpp \
+GUI/CCScrollView/CCTableView.cpp \
+GUI/CCScrollView/CCTableViewCell.cpp \
+GUI/CCScrollView/CCSorting.cpp \
+GUI/CCEditBox/CCEditBox.cpp \
+GUI/CCEditBox/CCEditBoxImplAndroid.cpp \
+network/HttpClient.cpp \
+network/WebSocket.cpp \
+network/WebFile.cpp \
+network/SocketIO.cpp \
+physics_nodes/CCPhysicsDebugNode.cpp \
+physics_nodes/CCPhysicsSprite.cpp \
+LocalStorage/LocalStorageAndroid.cpp \
+spine/Animation.cpp \
+spine/AnimationState.cpp \
+spine/AnimationStateData.cpp \
+spine/Atlas.cpp \
+spine/AtlasAttachmentLoader.cpp \
+spine/Attachment.cpp \
+spine/AttachmentLoader.cpp \
+spine/Bone.cpp \
+spine/BoneData.cpp \
+spine/Json.cpp \
+spine/RegionAttachment.cpp \
+spine/Skeleton.cpp \
+spine/SkeletonData.cpp \
+spine/SkeletonJson.cpp \
+spine/Skin.cpp \
+spine/Slot.cpp \
+spine/SlotData.cpp \
+spine/extension.cpp \
+spine/CCSkeletonAnimation.cpp \
+spine/CCSkeleton.cpp \
+spine/spine-cocos2dx.cpp \
+CCDeprecated-ext.cpp
+
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static
+LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
+LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
+LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static
+
+LOCAL_CXXFLAGS += -fexceptions
+
+LOCAL_CFLAGS += -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
+LOCAL_EXPORT_CFLAGS += -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
+                           $(LOCAL_PATH)/CCBReader \
+                           $(LOCAL_PATH)/GUI/CCControlExtension \
+                           $(LOCAL_PATH)/GUI/CCScrollView \
+                           $(LOCAL_PATH)/network \
+                           $(LOCAL_PATH)/LocalStorage 
+
+include $(BUILD_STATIC_LIBRARY)
+
+$(call import-module,cocos2dx)
+$(call import-module,CocosDenshion/android)
+$(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
+$(call import-module,external/Box2D)
+$(call import-module,external/chipmunk)
+$(call import-module,external/libwebsockets/android)