diff --git a/cocos/platform/ios/CCEAGLView.mm b/cocos/platform/ios/CCEAGLView.mm index fcbddd02e711..d6f0a0636a41 100644 --- a/cocos/platform/ios/CCEAGLView.mm +++ b/cocos/platform/ios/CCEAGLView.mm @@ -728,7 +728,7 @@ - (void)onUIKeyboardNotification:(NSNotification *)notif; CGSize viewSize = self.frame.size; CGFloat tmp; - switch ([[UIApplication sharedApplication] statusBarOrientation]) + switch (getFixedOrientation([[UIApplication sharedApplication] statusBarOrientation])) { case UIInterfaceOrientationPortrait: begin.origin.y = viewSize.height - begin.origin.y - begin.size.height; @@ -741,15 +741,9 @@ - (void)onUIKeyboardNotification:(NSNotification *)notif; break; case UIInterfaceOrientationLandscapeLeft: - tmp = begin.size.width; - begin.size.width = begin.size.height; - begin.size.height = tmp; - tmp = end.size.width; - end.size.width = end.size.height; - end.size.height = tmp; - tmp = viewSize.width; - viewSize.width = viewSize.height; - viewSize.height = tmp; + std::swap(begin.size.width, begin.size.height); + std::swap(end.size.width, end.size.height); + std::swap(viewSize.width, viewSize.height); tmp = begin.origin.x; begin.origin.x = begin.origin.y; @@ -760,15 +754,9 @@ - (void)onUIKeyboardNotification:(NSNotification *)notif; break; case UIInterfaceOrientationLandscapeRight: - tmp = begin.size.width; - begin.size.width = begin.size.height; - begin.size.height = tmp; - tmp = end.size.width; - end.size.width = end.size.height; - end.size.height = tmp; - tmp = viewSize.width; - viewSize.width = viewSize.height; - viewSize.height = tmp; + std::swap(begin.size.width, begin.size.height); + std::swap(end.size.width, end.size.height); + std::swap(viewSize.width, viewSize.height); tmp = begin.origin.x; begin.origin.x = begin.origin.y; @@ -847,6 +835,15 @@ - (void)onUIKeyboardNotification:(NSNotification *)notif; } } +UIInterfaceOrientation getFixedOrientation(UIInterfaceOrientation statusBarOrientation) +{ + if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0) + { + statusBarOrientation = UIInterfaceOrientationPortrait; + } + return statusBarOrientation; +} + -(void) doAnimationWhenKeyboardMoveWithDuration:(float)duration distance:(float)dis { [UIView beginAnimations:nil context:nullptr]; @@ -866,7 +863,7 @@ -(void) doAnimationWhenKeyboardMoveWithDuration:(float)duration distance:(float) dis /= 2.0f; } - switch ([[UIApplication sharedApplication] statusBarOrientation]) + switch (getFixedOrientation([[UIApplication sharedApplication] statusBarOrientation])) { case UIInterfaceOrientationPortrait: self.frame = CGRectMake(originalRect_.origin.x, originalRect_.origin.y - dis, originalRect_.size.width, originalRect_.size.height); diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 121b4f5b4361..11138b57471c 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -1957,6 +1957,7 @@ "external/glfw3/include/win32/glfw3native.h", "external/glfw3/prebuilt/mac/libglfw3.a", "external/glfw3/prebuilt/win32/glfw3.lib", + "external/jpeg/CMakeLists.txt", "external/jpeg/include/android/jconfig.h", "external/jpeg/include/android/jerror.h", "external/jpeg/include/android/jmorecfg.h", @@ -2084,6 +2085,7 @@ "external/sqlite3/include/sqlite3ext.h", "external/sqlite3/libraries/win32/sqlite3.dll", "external/sqlite3/libraries/win32/sqlite3.lib", + "external/tiff/CMakeLists.txt", "external/tiff/include/android/tiff.h", "external/tiff/include/android/tiffconf.h", "external/tiff/include/android/tiffio.h", @@ -2143,6 +2145,7 @@ "external/unzip/unzip.cpp", "external/unzip/unzip.h", "external/version.json", + "external/webp/CMakeLists.txt", "external/webp/include/android/decode.h", "external/webp/include/android/encode.h", "external/webp/include/android/types.h", @@ -2201,6 +2204,28 @@ "external/websockets/prebuilt/wp8/arm/libwebsockets.lib", "external/websockets/prebuilt/wp8/win32/libwebsockets.dll", "external/websockets/prebuilt/wp8/win32/libwebsockets.lib", + "external/win32-specific/MP3Decoder/include/mpg123.h", + "external/win32-specific/MP3Decoder/prebuilt/libmpg123.dll", + "external/win32-specific/MP3Decoder/prebuilt/libmpg123.lib", + "external/win32-specific/OggDecoder/include/ogg/ogg.h", + "external/win32-specific/OggDecoder/include/ogg/os_types.h", + "external/win32-specific/OggDecoder/include/vorbis/codec.h", + "external/win32-specific/OggDecoder/include/vorbis/vorbisenc.h", + "external/win32-specific/OggDecoder/include/vorbis/vorbisfile.h", + "external/win32-specific/OggDecoder/prebuilt/libogg.dll", + "external/win32-specific/OggDecoder/prebuilt/libogg.lib", + "external/win32-specific/OggDecoder/prebuilt/libvorbis.dll", + "external/win32-specific/OggDecoder/prebuilt/libvorbis.lib", + "external/win32-specific/OggDecoder/prebuilt/libvorbisfile.dll", + "external/win32-specific/OggDecoder/prebuilt/libvorbisfile.lib", + "external/win32-specific/OpenalSoft/include/AL/al.h", + "external/win32-specific/OpenalSoft/include/AL/alc.h", + "external/win32-specific/OpenalSoft/include/AL/alext.h", + "external/win32-specific/OpenalSoft/include/AL/efx-creative.h", + "external/win32-specific/OpenalSoft/include/AL/efx-presets.h", + "external/win32-specific/OpenalSoft/include/AL/efx.h", + "external/win32-specific/OpenalSoft/prebuilt/OpenAL32.dll", + "external/win32-specific/OpenalSoft/prebuilt/OpenAL32.lib", "external/win32-specific/gles/include/OGLES/GL/glew.h", "external/win32-specific/gles/include/OGLES/GL/glxew.h", "external/win32-specific/gles/include/OGLES/GL/wglew.h", @@ -2312,6 +2337,7 @@ "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", @@ -2329,6 +2355,7 @@ "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", @@ -2521,6 +2548,8 @@ "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/FBGraphObjectPickerViewController.h", + "plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Headers/FBGraphPerson.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", @@ -2533,6 +2562,7 @@ "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/FBPeoplePickerViewController.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", @@ -2544,6 +2574,7 @@ "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/FBTaggableFriendPickerViewController.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", @@ -2586,6 +2617,8 @@ "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/FBGraphObjectPickerViewController.h", + "plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBGraphPerson.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", @@ -2599,6 +2632,7 @@ "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/FBPeoplePickerViewController.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", @@ -2611,6 +2645,7 @@ "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/FBTaggableFriendPickerViewController.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", @@ -2636,6 +2671,8 @@ "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/FBGraphObjectPickerViewController.h", + "plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBGraphPerson.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", @@ -2648,6 +2685,7 @@ "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/FBPeoplePickerViewController.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", @@ -2659,6 +2697,7 @@ "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/FBTaggableFriendPickerViewController.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", @@ -2701,6 +2740,8 @@ "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/FBGraphObjectPickerViewController.h", + "plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/DeprecatedHeaders/FBGraphPerson.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", @@ -2714,6 +2755,7 @@ "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/FBPeoplePickerViewController.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", @@ -2726,6 +2768,7 @@ "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/FBTaggableFriendPickerViewController.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", @@ -2751,6 +2794,8 @@ "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/FBGraphObjectPickerViewController.h", + "plugin/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/Current/Headers/FBGraphPerson.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", @@ -2763,6 +2808,7 @@ "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/FBPeoplePickerViewController.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", @@ -2774,6 +2820,7 @@ "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/FBTaggableFriendPickerViewController.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", @@ -2797,6 +2844,56 @@ "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/project.properties", + "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/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", @@ -3933,6 +4030,7 @@ "plugin/protocols/include/ProtocolShare.h", "plugin/protocols/include/ProtocolSocial.h", "plugin/protocols/include/ProtocolUser.h", + "plugin/protocols/include/iOSIAPAgent.h", "plugin/protocols/platform/android/AgentManager.cpp", "plugin/protocols/platform/android/FacebookAgent.cpp", "plugin/protocols/platform/android/PluginFactory.cpp", @@ -3980,6 +4078,7 @@ "plugin/protocols/platform/ios/SocialWrapper.mm", "plugin/protocols/platform/ios/UserWrapper.h", "plugin/protocols/platform/ios/UserWrapper.mm", + "plugin/protocols/platform/ios/iOSIAPAgent.mm", "plugin/protocols/proj.android/.classpath", "plugin/protocols/proj.android/.project", "plugin/protocols/proj.android/AndroidManifest.xml", @@ -5834,6 +5933,16 @@ "external/lua/luasocket/usocket.h", "external/lua/luasocket/wsocket.c", "external/lua/luasocket/wsocket.h", + "external/lua/quick/LuaEventNode.cpp", + "external/lua/quick/LuaEventNode.h", + "external/lua/quick/LuaNodeManager.cpp", + "external/lua/quick/LuaNodeManager.h", + "external/lua/quick/LuaTouchEventManager.cpp", + "external/lua/quick/LuaTouchEventManager.h", + "external/lua/quick/LuaTouchTargetNode.cpp", + "external/lua/quick/LuaTouchTargetNode.h", + "external/lua/quick/lua_cocos2dx_quick_manual.cpp", + "external/lua/quick/lua_cocos2dx_quick_manual.hpp", "external/lua/tolua/CMakeLists.txt", "external/lua/tolua/tolua++.h", "external/lua/tolua/tolua_event.c",