Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3

This commit is contained in:
honghui 2014-10-08 17:11:19 +08:00
parent 91901c16cb 6648884d5e
commit de9a52892c
5 changed files with 529 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -21,6 +21,7 @@ cocos2d-x-3.3-beta1
[FIX] New audio: can not play audio after playing some times on Android
[FIX] Node: macro scheduler_selector() superseded by CC_SCHEDULER_SELECTOR(). The same is true for the other schedule_ macros
[FIX] Node: unscheduleAllSelectors() deprecated in favor of unscheudleAllCallbacks()
[FIX] Node: crashed if remove/add child too quickly when using integrated physics
[FIX] TextFieldTTF: will get wrong characters if using Chinese input method on WP8
cocos2d-x-3.3-beta0 Sep.20 2014

24
cocos/2d/CCNode.cpp
View File

@ -1100,6 +1100,19 @@ void Node::removeAllChildren()
this->removeAllChildrenWithCleanup(true);
}
void Node::removeFromPhysicsWorld()
{
if (_physicsBody != nullptr)
{
_physicsBody->removeFromWorld();
}
for (auto child : _children)
{
child->removeFromPhysicsWorld();
}
}
void Node::removeAllChildrenWithCleanup(bool cleanup)
{
// not using detachChild improves speed here
@ -1115,10 +1128,7 @@ void Node::removeAllChildrenWithCleanup(bool cleanup)
}
#if CC_USE_PHYSICS
if (child->_physicsBody != nullptr)
{
child->_physicsBody->removeFromWorld();
}
child->removeFromPhysicsWorld();
#endif
if (cleanup)
@ -1144,11 +1154,7 @@ void Node::detachChild(Node *child, ssize_t childIndex, bool doCleanup)
}
#if CC_USE_PHYSICS
if (child->_physicsBody != nullptr)
{
child->_physicsBody->removeFromWorld();
}
child->removeFromPhysicsWorld();
#endif
// If you don't do cleanup, the child's actions will not get removed and the

5
cocos/2d/CCNode.h
View File

@ -1522,6 +1522,11 @@ public:
* get the PhysicsBody the sprite have
*/
PhysicsBody* getPhysicsBody() const;
/**
* remove this node from physics world. it will remove all the physics bodies in it's children too.
*/
void removeFromPhysicsWorld();
#endif

507
templates/cocos2dx_files.json
View File

@ -2342,6 +2342,26 @@
"plugin/jsbindings/manual/pluginxUTF8.h",
"plugin/jsbindings/manual/uthash.h",
"plugin/jsbindings/script/jsb_pluginx.js",
"plugin/luabindings/auto/api/AgentManager.lua",
"plugin/luabindings/auto/api/FacebookAgent.lua",
"plugin/luabindings/auto/api/PluginManager.lua",
"plugin/luabindings/auto/api/PluginProtocol.lua",
"plugin/luabindings/auto/api/ProtocolAds.lua",
"plugin/luabindings/auto/api/ProtocolAnalytics.lua",
"plugin/luabindings/auto/api/ProtocolIAP.lua",
"plugin/luabindings/auto/api/ProtocolShare.lua",
"plugin/luabindings/auto/api/ProtocolSocial.lua",
"plugin/luabindings/auto/api/ProtocolUser.lua",
"plugin/luabindings/auto/api/lua_cocos2dx_pluginx_auto_api.lua",
"plugin/luabindings/auto/lua_cocos2dx_pluginx_auto.cpp",
"plugin/luabindings/auto/lua_cocos2dx_pluginx_auto.hpp",
"plugin/luabindings/manual/lua_pluginx_basic_conversions.cpp",
"plugin/luabindings/manual/lua_pluginx_basic_conversions.h",
"plugin/luabindings/manual/lua_pluginx_manual_callback.cpp",
"plugin/luabindings/manual/lua_pluginx_manual_callback.h",
"plugin/luabindings/manual/lua_pluginx_manual_protocols.cpp",
"plugin/luabindings/manual/lua_pluginx_manual_protocols.h",
"plugin/luabindings/script/lua_plugin.lua",
"plugin/plugins/admob/proj.android/.classpath",
"plugin/plugins/admob/proj.android/.project",
"plugin/plugins/admob/proj.android/AndroidManifest.xml",
@ -2385,6 +2405,481 @@
"plugin/plugins/alipay/proj.android/src/org/cocos2dx/plugin/PartnerConfig.java",
"plugin/plugins/alipay/proj.android/src/org/cocos2dx/plugin/ResultChecker.java",
"plugin/plugins/alipay/proj.android/src/org/cocos2dx/plugin/Rsa.java",
"plugin/plugins/facebook/proj.android/.classpath",
"plugin/plugins/facebook/proj.android/.project",
"plugin/plugins/facebook/proj.android/AndroidManifest.xml",
"plugin/plugins/facebook/proj.android/DependProject/.classpath",
"plugin/plugins/facebook/proj.android/DependProject/.project",
"plugin/plugins/facebook/proj.android/DependProject/AndroidManifest.xml",
"plugin/plugins/facebook/proj.android/DependProject/build.xml",
"plugin/plugins/facebook/proj.android/DependProject/project.properties",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_button_blue_focused.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_button_blue_normal.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_button_blue_pressed.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_button_grey_focused.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_button_grey_normal.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_button_grey_pressed.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_close.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_inverse_icon.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_logo.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_picker_magnifier.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_tooltip_black_background.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_tooltip_black_bottomnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_tooltip_black_topnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_tooltip_black_xout.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_tooltip_blue_background.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_tooltip_blue_bottomnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_tooltip_blue_topnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-hdpi/com_facebook_tooltip_blue_xout.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-ldpi/com_facebook_close.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_button_blue_focused.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_button_blue_normal.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_button_blue_pressed.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_inverse_icon.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_picker_magnifier.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_tooltip_black_background.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_tooltip_black_bottomnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_tooltip_black_topnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_tooltip_black_xout.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_tooltip_blue_background.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_tooltip_blue_bottomnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_tooltip_blue_topnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-mdpi/com_facebook_tooltip_blue_xout.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_button_blue_focused.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_button_blue_normal.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_button_blue_pressed.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_button_grey_focused.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_button_grey_normal.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_button_grey_pressed.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_close.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_inverse_icon.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_logo.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_picker_magnifier.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_tooltip_black_background.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_tooltip_black_bottomnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_tooltip_black_topnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_tooltip_black_xout.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_tooltip_blue_background.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_tooltip_blue_bottomnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_tooltip_blue_topnub.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable-xhdpi/com_facebook_tooltip_blue_xout.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_blue.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_blue_focused.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_blue_normal.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_blue_pressed.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_check.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_check_off.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_check_on.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_grey_focused.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_grey_normal.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_button_grey_pressed.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_close.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_inverse_icon.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_list_divider.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_list_section_header_background.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_loginbutton_silver.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_logo.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_picker_item_background.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_picker_list_focused.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_picker_list_longpressed.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_picker_list_pressed.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_picker_list_selector.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_picker_list_selector_background_transition.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_picker_list_selector_disabled.9.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_picker_top_button.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_place_default_icon.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_profile_default_icon.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_profile_picture_blank_portrait.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_profile_picture_blank_square.png",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_top_background.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_top_button.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/drawable/com_facebook_usersettingsfragment_background_gradient.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_friendpickerfragment.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_login_activity_layout.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_picker_activity_circle_row.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_picker_checkbox.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_picker_image.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_picker_list_row.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_picker_list_section_header.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_picker_search_box.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_picker_title_bar.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_picker_title_bar_stub.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_placepickerfragment.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_placepickerfragment_list_row.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_search_bar_layout.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_tooltip_bubble.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/layout/com_facebook_usersettingsfragment.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values-es/strings.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values-hdpi/dimens.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values-he/strings.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values-iw/strings.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values-ldpi/dimens.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values-mdpi/dimens.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values-xhdpi/dimens.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values/attrs.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values/colors.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values/drawables.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values/strings.xml",
"plugin/plugins/facebook/proj.android/DependProject/res/values/styles.xml",
"plugin/plugins/facebook/proj.android/ForManifest.xml",
"plugin/plugins/facebook/proj.android/build.xml",
"plugin/plugins/facebook/proj.android/proguard-project.txt",
"plugin/plugins/facebook/proj.android/project.properties",
"plugin/plugins/facebook/proj.android/sdk/android-support-v4.jar",
"plugin/plugins/facebook/proj.android/sdk/bolts.jar",
"plugin/plugins/facebook/proj.android/sdk/facebooksdk.jar",
"plugin/plugins/facebook/proj.android/src/org/cocos2dx/plugin/FacebookWrapper.java",
"plugin/plugins/facebook/proj.android/src/org/cocos2dx/plugin/ShareFacebook.java",
"plugin/plugins/facebook/proj.android/src/org/cocos2dx/plugin/UserFacebook.java",
"plugin/plugins/facebook/proj.ios/PluginFacebook.xcodeproj/project.pbxproj",
"plugin/plugins/facebook/proj.ios/PluginFacebook/PluginFacebook-Prefix.pch",
"plugin/plugins/facebook/proj.ios/PluginFacebook/ShareFacebook.h",
"plugin/plugins/facebook/proj.ios/PluginFacebook/ShareFacebook.m",
"plugin/plugins/facebook/proj.ios/PluginFacebook/UserFacebook.h",
"plugin/plugins/facebook/proj.ios/PluginFacebook/UserFacebook.m",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/FacebookSDK",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBAccessTokenData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBAppCall.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBAppEvents.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBAppLinkData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBAppLinkResolver.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBCacheDescriptor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBColor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBDialogsData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBDialogsParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBErrorUtility.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBFrictionlessRecipientCache.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBFriendPickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBGraphLocation.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBGraphPlace.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBGraphUser.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBInsights.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBLikeControl.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBLinkShareParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBLoginTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBLoginView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBNativeDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBOpenGraphAction.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBOpenGraphActionParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBOpenGraphActionShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBOpenGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBPlacePickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBProfilePictureView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBRequest.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBRequestConnection.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBSDKMacros.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBSessionTokenCachingStrategy.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBSettings.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBShareDialogPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBTestSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBUserSettingsViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBWebDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FacebookSDK.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/NSError+FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/Contents/Resources/en.lproj/Localizable.strings",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/Contents/Resources/he.lproj/Localizable.strings",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/facebook-logo.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/facebook-logo@2x.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadLandscape.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadLandscape@2x.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadPortrait.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadPortrait@2x.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPhonePortrait.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPhonePortrait@2x.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/silver-button-normal.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/silver-button-normal@2x.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/silver-button-pressed.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FBUserSettingsViewResources.bundle/images/silver-button-pressed@2x.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/FacebookSDKResources.bundle.README",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Resources/Info.plist",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBAccessTokenData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBAppCall.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBAppEvents.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBAppLinkData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBAppLinkResolver.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBCacheDescriptor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBColor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBConnect.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDialog.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDialogsData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBDialogsParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBErrorUtility.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBFrictionlessRecipientCache.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBFrictionlessRequestSettings.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBFriendPickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphLocation.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphPlace.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphUser.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBInsights.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBLikeControl.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBLinkShareParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBLoginDialog.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBLoginTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBLoginView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBNativeDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBOpenGraphAction.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBOpenGraphActionParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBOpenGraphActionShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBOpenGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBPlacePickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBProfilePictureView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBRequest.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBRequestConnection.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSDKMacros.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSessionManualTokenCachingStrategy.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSessionTokenCachingStrategy.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSettings.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBShareDialogPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBTestSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBUserSettingsViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBWebDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/Facebook.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FacebookSDK.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/NSError+FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/FacebookSDK",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBAccessTokenData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBAppCall.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBAppEvents.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBAppLinkData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBAppLinkResolver.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBCacheDescriptor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBColor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBDialogsData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBDialogsParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBErrorUtility.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBFrictionlessRecipientCache.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBFriendPickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBGraphLocation.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBGraphPlace.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBGraphUser.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBInsights.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBLikeControl.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBLinkShareParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBLoginTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBLoginView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBNativeDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBOpenGraphAction.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBOpenGraphActionParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBOpenGraphActionShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBOpenGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBPlacePickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBProfilePictureView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBRequest.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBRequestConnection.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBSDKMacros.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBSessionTokenCachingStrategy.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBSettings.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBShareDialogPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBTestSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBUserSettingsViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBWebDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FacebookSDK.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/NSError+FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/Contents/Resources/en.lproj/Localizable.strings",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/Contents/Resources/he.lproj/Localizable.strings",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/facebook-logo.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/facebook-logo@2x.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadLandscape.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadLandscape@2x.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadPortrait.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadPortrait@2x.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPhonePortrait.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPhonePortrait@2x.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/silver-button-normal.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/silver-button-normal@2x.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/silver-button-pressed.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle/images/silver-button-pressed@2x.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/FacebookSDKResources.bundle.README",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Resources/Info.plist",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBAccessTokenData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBAppCall.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBAppEvents.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBAppLinkData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBAppLinkResolver.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBCacheDescriptor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBColor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBConnect.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBDialog.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBDialogsData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBDialogsParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBErrorUtility.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBFrictionlessRecipientCache.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBFrictionlessRequestSettings.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBFriendPickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBGraphLocation.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBGraphPlace.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBGraphUser.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBInsights.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBLikeControl.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBLinkShareParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBLoginDialog.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBLoginTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBLoginView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBNativeDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBOpenGraphAction.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBOpenGraphActionParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBOpenGraphActionShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBOpenGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBPlacePickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBProfilePictureView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBRequest.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBRequestConnection.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBSDKMacros.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBSessionManualTokenCachingStrategy.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBSessionTokenCachingStrategy.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBSettings.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBShareDialogPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBTestSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBUserSettingsViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBWebDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/Facebook.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FacebookSDK.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/NSError+FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/FacebookSDK",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBAccessTokenData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBAppCall.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBAppEvents.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBAppLinkData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBAppLinkResolver.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBCacheDescriptor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBColor.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBDialogsData.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBDialogsParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBErrorUtility.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBFrictionlessRecipientCache.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBFriendPickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBGraphLocation.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBGraphPlace.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBGraphUser.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBInsights.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBLikeControl.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBLinkShareParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBLoginTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBLoginView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBNativeDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBOpenGraphAction.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBOpenGraphActionParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBOpenGraphActionShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBOpenGraphObject.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBPlacePickerViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBProfilePictureView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBRequest.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBRequestConnection.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBSDKMacros.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBSessionTokenCachingStrategy.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBSettings.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBShareDialogParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBShareDialogPhotoParams.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBTestSession.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBTooltipView.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBUserSettingsViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBViewController.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBWebDialogs.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FacebookSDK.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/NSError+FBError.h",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/Contents/Resources/en.lproj/Localizable.strings",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/Contents/Resources/he.lproj/Localizable.strings",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/facebook-logo.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/facebook-logo@2x.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadLandscape.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadLandscape@2x.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadPortrait.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadPortrait@2x.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPhonePortrait.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/loginBackgroundIPhonePortrait@2x.jpg",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/silver-button-normal.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/silver-button-normal@2x.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/silver-button-pressed.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FBUserSettingsViewResources.bundle/images/silver-button-pressed@2x.png",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/FacebookSDKResources.bundle.README",
"plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Resources/Info.plist",
"plugin/plugins/facebookads/proj.android/.classpath",
"plugin/plugins/facebookads/proj.android/.project",
"plugin/plugins/facebookads/proj.android/AndroidManifest.xml",
"plugin/plugins/facebookads/proj.android/ForManifest.xml",
"plugin/plugins/facebookads/proj.android/build.xml",
"plugin/plugins/facebookads/proj.android/proguard-project.txt",
"plugin/plugins/facebookads/proj.android/res/values-large/layout.xml",
"plugin/plugins/facebookads/proj.android/res/values-sw600dp/layout.xml",
"plugin/plugins/facebookads/proj.android/res/values/layouts.xml",
"plugin/plugins/facebookads/proj.android/sdk/AudienceNetwork.jar",
"plugin/plugins/facebookads/proj.android/sdk/android-support-v4.jar",
"plugin/plugins/facebookads/proj.android/src/org/cocos2dx/plugin/AdsFacebook.java",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/FBAudienceNetwork",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Headers/FBAdImage.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Headers/FBAdSettings.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Headers/FBAdView.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Headers/FBAudienceNetwork.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Headers/FBInterstitialAd.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Headers/FBNativeAd.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Resources",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/DeprecatedHeaders/FBAdImage.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/DeprecatedHeaders/FBAdSettings.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/DeprecatedHeaders/FBAdView.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/DeprecatedHeaders/FBAudienceNetwork.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/DeprecatedHeaders/FBInterstitialAd.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/DeprecatedHeaders/FBNativeAd.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/FBAudienceNetwork",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/Headers/FBAdImage.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/Headers/FBAdSettings.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/Headers/FBAdView.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/Headers/FBAudienceNetwork.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/Headers/FBInterstitialAd.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/A/Headers/FBNativeAd.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/DeprecatedHeaders/FBAdImage.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/DeprecatedHeaders/FBAdSettings.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/DeprecatedHeaders/FBAdView.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/DeprecatedHeaders/FBAudienceNetwork.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/DeprecatedHeaders/FBInterstitialAd.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/DeprecatedHeaders/FBNativeAd.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/FBAudienceNetwork",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/Headers/FBAdImage.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/Headers/FBAdSettings.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/Headers/FBAdView.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/Headers/FBAudienceNetwork.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/Headers/FBInterstitialAd.h",
"plugin/plugins/facebookads/proj.ios/FBAudienceNetwork.framework/Versions/Current/Headers/FBNativeAd.h",
"plugin/plugins/facebookads/proj.ios/PluginFacebookAds.xcodeproj/project.pbxproj",
"plugin/plugins/facebookads/proj.ios/PluginFacebookAds/AdsFacebook.h",
"plugin/plugins/facebookads/proj.ios/PluginFacebookAds/AdsFacebook.m",
"plugin/plugins/facebookads/proj.ios/PluginFacebookAds/PluginFacebookAds-Prefix.pch",
"plugin/plugins/flurry/proj.android/.classpath",
"plugin/plugins/flurry/proj.android/.project",
"plugin/plugins/flurry/proj.android/AndroidManifest.xml",
@ -2405,6 +2900,7 @@
"plugin/plugins/flurry/proj.ios/PluginFlurry-Prefix.pch",
"plugin/plugins/flurry/proj.ios/PluginFlurry.xcodeproj/project.pbxproj",
"plugin/plugins/flurry/proj.ios/libFlurry.a",
"plugin/plugins/googleplay/Readme.md",
"plugin/plugins/googleplay/proj.android/.classpath",
"plugin/plugins/googleplay/proj.android/.project",
"plugin/plugins/googleplay/proj.android/AndroidManifest.xml",
@ -3508,6 +4004,8 @@
"plugin/plugins/weibo/proj.ios/SinaWeibo/SinaWeiboRequest.m",
"plugin/protocols/PluginManager.cpp",
"plugin/protocols/PluginParam.cpp",
"plugin/protocols/include/AgentManager.h",
"plugin/protocols/include/FacebookAgent.h",
"plugin/protocols/include/PluginFactory.h",
"plugin/protocols/include/PluginManager.h",
"plugin/protocols/include/PluginParam.h",
@ -3518,6 +4016,8 @@
"plugin/protocols/include/ProtocolShare.h",
"plugin/protocols/include/ProtocolSocial.h",
"plugin/protocols/include/ProtocolUser.h",
"plugin/protocols/platform/android/AgentManager.cpp",
"plugin/protocols/platform/android/FacebookAgent.cpp",
"plugin/protocols/platform/android/PluginFactory.cpp",
"plugin/protocols/platform/android/PluginJavaData.h",
"plugin/protocols/platform/android/PluginJniHelper.cpp",
@ -3534,6 +4034,8 @@
"plugin/protocols/platform/android/ProtocolUser.cpp",
"plugin/protocols/platform/ios/AdsWrapper.h",
"plugin/protocols/platform/ios/AdsWrapper.mm",
"plugin/protocols/platform/ios/AgentManager.mm",
"plugin/protocols/platform/ios/FacebookAgent.mm",
"plugin/protocols/platform/ios/IAPWrapper.h",
"plugin/protocols/platform/ios/IAPWrapper.mm",
"plugin/protocols/platform/ios/InterfaceAds.h",
@ -3542,6 +4044,8 @@
"plugin/protocols/platform/ios/InterfaceShare.h",
"plugin/protocols/platform/ios/InterfaceSocial.h",
"plugin/protocols/platform/ios/InterfaceUser.h",
"plugin/protocols/platform/ios/ParseUtils.h",
"plugin/protocols/platform/ios/ParseUtils.m",
"plugin/protocols/platform/ios/PluginFactory.mm",
"plugin/protocols/platform/ios/PluginOCMacros.h",
"plugin/protocols/platform/ios/PluginProtocol.mm",
@ -3575,6 +4079,7 @@
"plugin/protocols/proj.android/src/org/cocos2dx/plugin/InterfaceShare.java",
"plugin/protocols/proj.android/src/org/cocos2dx/plugin/InterfaceSocial.java",
"plugin/protocols/proj.android/src/org/cocos2dx/plugin/InterfaceUser.java",
"plugin/protocols/proj.android/src/org/cocos2dx/plugin/PluginListener.java",
"plugin/protocols/proj.android/src/org/cocos2dx/plugin/PluginWrapper.java",
"plugin/protocols/proj.android/src/org/cocos2dx/plugin/ShareWrapper.java",
"plugin/protocols/proj.android/src/org/cocos2dx/plugin/SocialWrapper.java",
@ -3587,9 +4092,11 @@
"plugin/tools/gameDevGuide.sh",
"plugin/tools/pluginx-bindings-generator/conversions.yaml",
"plugin/tools/pluginx-bindings-generator/genbindings-all.sh",
"plugin/tools/pluginx-bindings-generator/genbindings-lua.py",
"plugin/tools/pluginx-bindings-generator/genbindings.sh",
"plugin/tools/pluginx-bindings-generator/modify_include.sed",
"plugin/tools/pluginx-bindings-generator/tojs/cocos2dx_pluginx.ini",
"plugin/tools/pluginx-bindings-generator/tolua/cocos2dx_pluginx.ini",
"plugin/tools/publish.sh",
"plugin/tools/toolsForGame/addPluginForGame.sh",
"plugin/tools/toolsForGame/main.py",

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit fed86b061f5bacffa66149498afdcba180bd0063
Subproject commit 1a71fe7be45db504f3bdc0e24e8d7eca83f2fc1a