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

Merge branch 'newcode' into v3

This commit is contained in:
yangxiao 2014-10-09 17:01:35 +08:00
parent c087f31e94 db72756d02
commit 222bf570f2
51 changed files with 994 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -17,10 +17,13 @@ cocos2d-x-3.3-beta1
[FIX] Cocos Studio reader: improvement ImageViewReader don't necessary loadTexture when imageFilePath is empty
[FIX] EditBox: view rendereed in wrong position if click EditBox on iOS 8
[FIX] Label: getStringNumLines() may returns wrong result if label is dirty
[FIX] Label: can not change opacity if using FNT font
[FIX] Label: endless loop if not using system font, and constrained length is less than one character width
[FIX] Lua-bindings: may crash if passing two-dimensional table from lua to c++
[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

23
CMakeLists.txt
View File

@ -122,12 +122,12 @@ else()
message( FATAL_ERROR "Unsupported architecture, CMake will exit" )
endif()
include_directories(
${PLATFORM_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cocos
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/deprecated
${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform
${CMAKE_CURRENT_SOURCE_DIR}/extensions
${CMAKE_CURRENT_SOURCE_DIR}/external
)
@ -164,6 +164,14 @@ include_directories(
)
if(LINUX)
find_package(GLFW3 REQUIRED)
message( STATUS "GLFW3 dirs: ${GLFW3_INCLUDE_DIRS}")
include_directories(${GLFW3_INCLUDE_DIRS})
endif(LINUX)
if(NOT MINGW)
@ -189,7 +197,7 @@ if(NOT MINGW)
#i.e we should not need to include an extra dir of /freetype2
link_directories(
${PLATFORM_LINK_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/tinyxml2/prebuilt/${PLATFORM_FOLDER_ARCH}
${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/prebuilt/${PLATFORM_FOLDER_ARCH}
${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/prebuilt/${PLATFORM_FOLDER_ARCH}
@ -206,6 +214,13 @@ if(NOT MINGW)
endif()
# build for 3rd party libraries
if(LINUX)
add_subdirectory(external/Box2D)
add_subdirectory(external/unzip)
add_subdirectory(external/xxhash)
add_subdirectory(external/tinyxml2)
endif()
# libcocos2d.a
add_subdirectory(cocos)
@ -226,4 +241,4 @@ if(BUILD_LUA_LIBS)
add_subdirectory(tests/lua-empty-test/project)
endif(BUILD_LUA_TESTS)
endif(BUILD_LUA_LIBS)
endif(BUILD_LUA_LIBS)

6
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -7,8 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
15AE180619AAD2F700C27E9E /* 3dExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 15AE17E319AAD2F700C27E9E /* 3dExport.h */; };
15AE180719AAD2F700C27E9E /* 3dExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 15AE17E319AAD2F700C27E9E /* 3dExport.h */; };
15AE180819AAD2F700C27E9E /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15AE17E419AAD2F700C27E9E /* CCAABB.cpp */; };
15AE180919AAD2F700C27E9E /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15AE17E419AAD2F700C27E9E /* CCAABB.cpp */; };
15AE180A19AAD2F700C27E9E /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = 15AE17E519AAD2F700C27E9E /* CCAABB.h */; };
@ -1841,7 +1839,6 @@
06CAAAC1186AD63B0012A414 /* TriggerObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerObj.h; sourceTree = "<group>"; };
1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
1551A342158F2AB200E66CFE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
15AE17E319AAD2F700C27E9E /* 3dExport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 3dExport.h; sourceTree = "<group>"; };
15AE17E419AAD2F700C27E9E /* CCAABB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAABB.cpp; sourceTree = "<group>"; };
15AE17E519AAD2F700C27E9E /* CCAABB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAABB.h; sourceTree = "<group>"; };
15AE17E619AAD2F700C27E9E /* CCAnimate3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAnimate3D.cpp; sourceTree = "<group>"; };
@ -4765,7 +4762,6 @@
children = (
B60C5BD219AC68B10056FBDE /* CCBillBoard.cpp */,
B60C5BD319AC68B10056FBDE /* CCBillBoard.h */,
15AE17E319AAD2F700C27E9E /* 3dExport.h */,
15AE17E419AAD2F700C27E9E /* CCAABB.cpp */,
15AE17E519AAD2F700C27E9E /* CCAABB.h */,
15AE17E619AAD2F700C27E9E /* CCAnimate3D.cpp */,
@ -4894,7 +4890,6 @@
1A570083180BC5A10088DEC7 /* CCActionManager.h in Headers */,
1A570087180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */,
50ABBD911925AB4100A911A9 /* CCGLProgramCache.h in Headers */,
15AE180619AAD2F700C27E9E /* 3dExport.h in Headers */,
50ED2BDA19BE76D300A0AB90 /* UIVideoPlayer.h in Headers */,
15AE199919AAD39600C27E9E /* LoadingBarReader.h in Headers */,
15AE1A8F19AAD40300C27E9E /* b2RopeJoint.h in Headers */,
@ -5616,7 +5611,6 @@
1A570313180BCF190088DEC7 /* CCComponentContainer.h in Headers */,
1A087AEB1860400400196EF5 /* edtaa3func.h in Headers */,
B375107F1823ACA100B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */,
15AE180719AAD2F700C27E9E /* 3dExport.h in Headers */,
15AE1A2019AAD3A700C27E9E /* spine-cocos2dx.h in Headers */,
15AE185D19AAD31200C27E9E /* CocosDenshion.h in Headers */,
15AE194319AAD35100C27E9E /* CCColliderDetector.h in Headers */,

2
cmake/Modules/FindChipmunk.cmake
View File

@ -2,7 +2,7 @@
# FindChipmunk
# ------------
#
# Locate FindChipmunk library
# Locate Chipmunk library
#
# This module defines
#

69
cmake/Modules/FindGLFW3.cmake Normal file
View File

@ -0,0 +1,69 @@
#.rst:
# FindGLFW3
# ------------
#
# Locate glfw3 library
#
# This module defines
#
# ::
#
# GLFW3_LIBRARIES, the library to link against
# GLFW3_FOUND, if false, do not try to link to FREETYPE
# GLFW3_INCLUDE_DIRS, where to find headers.
# This is the concatenation of the paths:
# GLFW3_INCLUDE_DIR
#
#=============================================================================
# Copyright 2014-2014 Martell Malone
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
FIND_PATH(GLFW3_INCLUDE_DIR glfw3.h
HINTS
ENV GLFW3_DIR
PATH_SUFFIXES include/GLFW include
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
)
FIND_LIBRARY(GLFW3_LIBRARY
NAMES glfw3 libglfw3 glfw
HINTS
ENV GLFW3_DIR
PATH_SUFFIXES lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw
/opt/local
/opt/csw
/opt
)
set(GLFW3_INCLUDE_DIRS "${GLFW3_INCLUDE_DIR}")
set(GLFW3_LIBRARIES "${GLFW3_LIBRARY}")
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
# handle the QUIETLY and REQUIRED arguments and set GLFW3_FOUND to TRUE if
# all listed variables are TRUE
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW3 DEFAULT_MSG GLFW3_LIBRARIES GLFW3_INCLUDE_DIR)
MARK_AS_ADVANCED(GLFW3_INCLUDE_DIR GLFW3_LIBRARIES GLFW3_LIBRARY)

2
cmake/Modules/FindWebP.cmake
View File

@ -2,7 +2,7 @@
# FindWebP
# ------------
#
# Locate FindChipmunk library
# Locate webp library
#
# This module defines
#

10
cocos/2d/CCLabel.cpp
View File

@ -1248,13 +1248,11 @@ bool Label::isOpacityModifyRGB() const
void Label::setOpacityModifyRGB(bool isOpacityModifyRGB)
{
_isOpacityModifyRGB = isOpacityModifyRGB;
for(const auto& child: _children) {
child->setOpacityModifyRGB(_isOpacityModifyRGB);
if (isOpacityModifyRGB != _isOpacityModifyRGB)
{
_isOpacityModifyRGB = isOpacityModifyRGB;
updateColor();
}
_reusedLetter->setOpacityModifyRGB(true);
}
void Label::updateDisplayedColor(const Color3B& parentColor)

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

8
cocos/2d/CCSpriteBatchNode.cpp
View File

@ -577,7 +577,15 @@ void SpriteBatchNode::removeSpriteFromAtlas(Sprite *sprite)
void SpriteBatchNode::updateBlendFunc(void)
{
if (! _textureAtlas->getTexture()->hasPremultipliedAlpha())
{
_blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED;
setOpacityModifyRGB(false);
}
else
{
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
setOpacityModifyRGB(true);
}
}
// CocosNodeTexture protocol

8
cocos/2d/cocos2d_wp8.vcxproj
View File

@ -79,7 +79,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;_DEBUG;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
@ -104,7 +104,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;NDEBUG;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
@ -129,7 +129,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;_DEBUG;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
@ -155,7 +155,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;NDEBUG;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>

31
cocos/3d/3dExport.h
View File

@ -1,31 +0,0 @@
#ifndef __COCOS_3D_3DEXPORT_H__
#define __COCOS_3D_3DEXPORT_H__
#if defined(WIN32) && defined(_WINDOWS)
#ifdef __MINGW32__
#include <string.h>
#endif
#if defined(CC_STATIC)
#define CC_3D_DLL
#else
#if defined(_USE3DDLL)
#define CC_3D_DLL __declspec(dllexport)
#else /* use a DLL library */
#define CC_3D_DLL __declspec(dllimport)
#endif
#endif
/* Define NULL pointer value */
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
#endif
#else
#define CC_3D_DLL
#endif
#endif // __COCOS_3D_3DEXPORT_H__

3
cocos/3d/CCAABB.h
View File

@ -27,11 +27,10 @@
#include "base/ccMacros.h"
#include "math/CCMath.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
class CC_3D_DLL AABB
class CC_DLL AABB
{
public:

3
cocos/3d/CCAnimate3D.h
View File

@ -29,7 +29,6 @@
#include <unordered_map>
#include "3d/CCAnimation3D.h"
#include "3d/3dExport.h"
#include "base/ccMacros.h"
#include "base/CCRef.h"
#include "2d/CCActionInterval.h"
@ -41,7 +40,7 @@ class Sprite3D;
/**
* Animate3D, Animates a Sprite3D given with an Animation3D
*/
class CC_3D_DLL Animate3D: public ActionInterval
class CC_DLL Animate3D: public ActionInterval
{
public:

3
cocos/3d/CCAnimation3D.h
View File

@ -32,14 +32,13 @@
#include "base/ccMacros.h"
#include "base/CCRef.h"
#include "3d/CCBundle3DData.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
/**
* static animation data, shared
*/
class CC_3D_DLL Animation3D: public Ref
class CC_DLL Animation3D: public Ref
{
friend class Bundle3D;
public:

3
cocos/3d/CCAttachNode.h
View File

@ -27,7 +27,6 @@
#include "math/CCMath.h"
#include "2d/CCNode.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
@ -40,7 +39,7 @@ class Bone3D;
* auto attachNode = sprite->getAttachNode("left hand");
* attachNode->addChild(weapon);
*/
class CC_3D_DLL AttachNode : public Node
class CC_DLL AttachNode : public Node
{
public:
/**

3
cocos/3d/CCBillBoard.h
View File

@ -26,14 +26,13 @@
#define __CCBILLBOARD_H__
#include "2d/CCSprite.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
/**
* Inherit from Sprite, achieve BillBoard.
*/
class CC_3D_DLL BillBoard : public Sprite
class CC_DLL BillBoard : public Sprite
{
public:

3
cocos/3d/CCBundle3D.h
View File

@ -26,7 +26,6 @@
#define __CCBUNDLE3D_H__
#include "3d/CCBundle3DData.h"
#include "3d/3dExport.h"
#include "3d/CCBundleReader.h"
#include "json/document.h"
@ -40,7 +39,7 @@ class Data;
* c3t text file
* c3b binary file
*/
class CC_3D_DLL Bundle3D
class CC_DLL Bundle3D
{
public:
/**you can define yourself bundle and set it, use default bundle otherwise*/

3
cocos/3d/CCMesh.h
View File

@ -29,7 +29,6 @@
#include "3d/CCBundle3DData.h"
#include "3d/CCAABB.h"
#include "3d/3dExport.h"
#include "base/CCRef.h"
#include "math/CCMath.h"
@ -45,7 +44,7 @@ class GLProgram;
/**
* Mesh: contains ref to index buffer, GLProgramState, texture, skin, blend function, aabb and so on
*/
class CC_3D_DLL Mesh : public Ref
class CC_DLL Mesh : public Ref
{
friend class Sprite3D;
public:

3
cocos/3d/CCMeshSkin.h
View File

@ -26,7 +26,6 @@
#define __CCMESHSKIN_H__
#include "3d/CCBundle3DData.h"
#include "3d/3dExport.h"
#include "base/CCRef.h"
#include "base/CCVector.h"
#include "math/CCMath.h"
@ -41,7 +40,7 @@ class Skeleton3D;
* MeshSkin, A class maintain a collection of bones that affect Mesh vertex.
* And it is responsible for computing matrix palletes that used by skin mesh rendering.
*/
class CC_3D_DLL MeshSkin: public Ref
class CC_DLL MeshSkin: public Ref
{
public:

1
cocos/3d/CCMeshVertexIndexData.h
View File

@ -30,7 +30,6 @@
#include "3d/CCBundle3DData.h"
#include "3d/CCAABB.h"
#include "3d/3dExport.h"
#include "base/CCRef.h"
#include "base/CCVector.h"

3
cocos/3d/CCOBB.h
View File

@ -26,11 +26,10 @@
#define __CC_OBB_H__
#include "CCAABB.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
class CC_3D_DLL OBB
class CC_DLL OBB
{
public:
OBB();

3
cocos/3d/CCRay.h
View File

@ -28,11 +28,10 @@
#include "math/CCMath.h"
#include "3d/CCAABB.h"
#include "3d/CCOBB.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
class CC_3D_DLL Ray
class CC_DLL Ray
{
public:
/**

5
cocos/3d/CCSkeleton3D.h
View File

@ -26,7 +26,6 @@
#define __CCSKELETON3D_H__
#include "3d/CCBundle3DData.h"
#include "3d/3dExport.h"
#include "base/CCRef.h"
#include "base/CCVector.h"
@ -36,7 +35,7 @@ NS_CC_BEGIN
/**
* Defines a basic hierachial structure of transformation spaces.
*/
class CC_3D_DLL Bone3D : public Ref
class CC_DLL Bone3D : public Ref
{
friend class Skeleton3D;
friend class MeshSkin;
@ -179,7 +178,7 @@ protected:
* Skeleton
*
*/
class CC_3D_DLL Skeleton3D: public Ref
class CC_DLL Skeleton3D: public Ref
{
public:

5
cocos/3d/CCSprite3D.h
View File

@ -37,7 +37,6 @@
#include "3d/CCAABB.h"
#include "3d/CCBundle3DData.h"
#include "3d/CCMeshVertexIndexData.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
@ -48,7 +47,7 @@ class MeshSkin;
class AttachNode;
struct NodeData;
/** Sprite3D: A sprite can be loaded from 3D model files, .obj, .c3t, .c3b, then can be drawed as sprite */
class CC_3D_DLL Sprite3D : public Node, public BlendProtocol
class CC_DLL Sprite3D : public Node, public BlendProtocol
{
public:
/** creates a Sprite3D*/
@ -214,7 +213,7 @@ protected:
std::unordered_map<std::string, Sprite3DData*> _spriteDatas; //cached sprite datas
};
extern std::string CC_3D_DLL s_attributeNames[];//attribute names array
extern std::string CC_DLL s_attributeNames[];//attribute names array
NS_CC_END
#endif // __SPRITE3D_H_

9
cocos/CMakeLists.txt
View File

@ -68,6 +68,7 @@ set(COCOS_SRC cocos2d.cpp
${COCOS_BASE_SRC}
${COCOS_AUDIO_SRC}
${COCOS_UI_SRC}
${COCOS_DEPRECATED_SRC}
${COCOS_NETWORK_SRC}
${COCOS_EDITOR_SUPPORT_SRC}
${COCOS_EXTENSIONS_SRC}
@ -112,13 +113,19 @@ endif()
add_library(cocos2d ${BUILD_TYPE} ${COCOS_SRC})
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(FMOD_LIB "fmodex64")
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(FMOD_LIB "fmodex")
endif()
if(MINGW)
set(PLATFORM_SPECIFIC_LIBS z jpeg png webp tiff curl websockets glfw3 glew32 opengl32 iconv freetype bz2)
elseif(WINDOWS)
set(PLATFORM_SPECIFIC_LIBS libjpeg libpng libwebp libtiff libcurl_imp libwebsockets freetype250 glfw3 glew32 opengl32 libiconv libzlib)
elseif(LINUX)
set(PLATFORM_SPECIFIC_LIBS jpeg webp tiff freetype curl websockets fontconfig png pthread glfw GLEW GL X11 rt z)
set(PLATFORM_SPECIFIC_LIBS jpeg webp tiff freetype curl websockets
fontconfig png pthread glfw GLEW GL X11 rt z ${FMOD_LIB})
elseif(MACOSX)
INCLUDE_DIRECTORIES ( /System/Library/Frameworks )

8
cocos/audio/proj.wp8/CocosDenshion.vcxproj
View File

@ -78,7 +78,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4251</DisableSpecificWarnings>
</ClCompile>
<Link>
@ -96,7 +96,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4251</DisableSpecificWarnings>
</ClCompile>
<Link>
@ -114,7 +114,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4251</DisableSpecificWarnings>
</ClCompile>
<Link>
@ -132,7 +132,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4251</DisableSpecificWarnings>
</ClCompile>
<Link>

2
cocos/base/CMakeLists.txt
View File

@ -8,7 +8,7 @@ endif()
# todo: also base/CCController-android.cpp
set(COCOS_BASE_SRC
base/CCLight.cpp
base/ccFPSImages.c
base/CCAutoreleasePool.cpp
base/CCCamera.cpp

8
cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj
View File

@ -78,7 +78,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
@ -98,7 +98,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
</ClCompile>
@ -117,7 +117,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
@ -137,7 +137,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
</ClCompile>

8
cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj
View File

@ -78,7 +78,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
@ -98,7 +98,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
</ClCompile>
@ -117,7 +117,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
@ -137,7 +137,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
</ClCompile>

8
cocos/editor-support/spine/proj.wp8/libSpine.vcxproj
View File

@ -78,7 +78,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
@ -98,7 +98,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -117,7 +117,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
@ -137,7 +137,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>

8
cocos/network/proj.wp8/libNetwork.vcxproj
View File

@ -78,7 +78,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\wp8;$(EngineRoot)external\curl\include\wp8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4251</DisableSpecificWarnings>
<CompileAsWinRT>false</CompileAsWinRT>
</ClCompile>
@ -94,7 +94,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\wp8;$(EngineRoot)external\curl\include\wp8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4251</DisableSpecificWarnings>
<CompileAsWinRT>false</CompileAsWinRT>
</ClCompile>
@ -110,7 +110,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\wp8;$(EngineRoot)external\curl\include\wp8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_CRT_SECURE_NO_WARNINGS;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4251</DisableSpecificWarnings>
<CompileAsWinRT>false</CompileAsWinRT>
</ClCompile>
@ -126,7 +126,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\wp8;$(EngineRoot)external\curl\include\wp8;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;NDEBUG;_CRT_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4251</DisableSpecificWarnings>
<CompileAsWinRT>false</CompileAsWinRT>
</ClCompile>

28
cocos/scripting/lua-bindings/auto/api/Node.lua
View File

@ -174,6 +174,11 @@
-- @param self
-- @param #function callback
--------------------------------
-- remove this node from physics world. it will remove all the physics bodies in it's children too.
-- @function [parent=#Node] removeFromPhysicsWorld
-- @param self
--------------------------------
-- removes all components
-- @function [parent=#Node] removeAllComponents
@ -335,6 +340,12 @@
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
-- Resumes all scheduled selectors, actions and event listeners.<br>
-- This method is called internally by onEnter
-- @function [parent=#Node] resume
-- @param self
--------------------------------
-- returns the rotation (X,Y,Z) in degrees.
-- @function [parent=#Node] getRotation3D
@ -362,12 +373,6 @@
-- @param #vec2_table worldPoint
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
-- Resumes all scheduled selectors, actions and event listeners.<br>
-- This method is called internally by onEnter
-- @function [parent=#Node] resume
-- @param self
--------------------------------
-- get the PhysicsBody the sprite have
-- @function [parent=#Node] getPhysicsBody
@ -746,6 +751,17 @@
-- @param self
-- @return mat4_table#mat4_table ret (return value: mat4_table)
--------------------------------
-- Checks whether a lambda function is scheduled.<br>
-- param key key of the callback<br>
-- return Whether the lambda function selector is scheduled.<br>
-- js NA<br>
-- lua NA
-- @function [parent=#Node] isScheduled
-- @param self
-- @param #string key
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Defines the oder in which the nodes are renderer.<br>
-- Nodes that have a Global Z Order lower, are renderer first.<br>

15
cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua
View File

@ -10,15 +10,18 @@
-- @param self
--------------------------------
--
-- @function [parent=#Scale9Sprite] updateWithSprite
-- @overload self, cc.Sprite, rect_table, bool, vec2_table, size_table, rect_table
-- @overload self, cc.Sprite, rect_table, bool, rect_table
-- @function [parent=#Scale9Sprite] updateWithSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #rect_table rect
-- @param #bool rotated
-- @param #vec2_table offset
-- @param #size_table originalSize
-- @param #rect_table capInsets
-- @return bool#bool ret (return value: bool)
-- @return bool#bool ret (retunr value: bool)
--------------------------------
-- Returns the flag which indicates whether the widget is flipped horizontally or not.<br>
-- It only flips the texture of the widget, and not the texture of the widget's children.<br>
@ -86,11 +89,14 @@
-- @overload self, cc.Sprite, rect_table, bool, rect_table
-- @overload self
-- @overload self, cc.Sprite, rect_table, rect_table
-- @overload self, cc.Sprite, rect_table, bool, vec2_table, size_table, rect_table
-- @function [parent=#Scale9Sprite] init
-- @param self
-- @param #cc.Sprite sprite
-- @param #rect_table rect
-- @param #bool rotated
-- @param #vec2_table offset
-- @param #size_table originalSize
-- @param #rect_table capInsets
-- @return bool#bool ret (retunr value: bool)
@ -111,6 +117,7 @@
-- @function [parent=#Scale9Sprite] setSpriteFrame
-- @param self
-- @param #cc.SpriteFrame spriteFrame
-- @param #rect_table capInsets
--------------------------------
--

180
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

@ -3640,6 +3640,49 @@ int lua_cocos2dx_Node_setonEnterTransitionDidFinishCallback(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_Node_removeFromPhysicsWorld(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Node* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_removeFromPhysicsWorld'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
cobj->removeFromPhysicsWorld();
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeFromPhysicsWorld",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_removeFromPhysicsWorld'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Node_removeAllComponents(lua_State* tolua_S)
{
int argc = 0;
@ -4668,6 +4711,49 @@ int lua_cocos2dx_Node_getName(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_Node_resume(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Node* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_resume'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
cobj->resume();
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:resume",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_resume'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Node_getRotation3D(lua_State* tolua_S)
{
int argc = 0;
@ -4850,49 +4936,6 @@ int lua_cocos2dx_Node_convertToNodeSpace(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_Node_resume(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Node* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_resume'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
cobj->resume();
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:resume",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_resume'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Node_getPhysicsBody(lua_State* tolua_S)
{
int argc = 0;
@ -7154,6 +7197,53 @@ int lua_cocos2dx_Node_getParentToNodeTransform(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_Node_isScheduled(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Node* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_isScheduled'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
std::string arg0;
ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:isScheduled");
if(!ok)
return 0;
bool ret = cobj->isScheduled(arg0);
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isScheduled",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_isScheduled'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Node_setGlobalZOrder(lua_State* tolua_S)
{
int argc = 0;
@ -8822,6 +8912,7 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S)
tolua_function(tolua_S,"setScaleX",lua_cocos2dx_Node_setScaleX);
tolua_function(tolua_S,"setRotationSkewX",lua_cocos2dx_Node_setRotationSkewX);
tolua_function(tolua_S,"setonEnterTransitionDidFinishCallback",lua_cocos2dx_Node_setonEnterTransitionDidFinishCallback);
tolua_function(tolua_S,"removeFromPhysicsWorld",lua_cocos2dx_Node_removeFromPhysicsWorld);
tolua_function(tolua_S,"removeAllComponents",lua_cocos2dx_Node_removeAllComponents);
tolua_function(tolua_S,"getOpacity",lua_cocos2dx_Node_getOpacity);
tolua_function(tolua_S,"setCameraMask",lua_cocos2dx_Node_setCameraMask);
@ -8844,11 +8935,11 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S)
tolua_function(tolua_S,"isCascadeOpacityEnabled",lua_cocos2dx_Node_isCascadeOpacityEnabled);
tolua_function(tolua_S,"setParent",lua_cocos2dx_Node_setParent);
tolua_function(tolua_S,"getName",lua_cocos2dx_Node_getName);
tolua_function(tolua_S,"resume",lua_cocos2dx_Node_resume);
tolua_function(tolua_S,"getRotation3D",lua_cocos2dx_Node_getRotation3D);
tolua_function(tolua_S,"getNodeToParentTransform",lua_cocos2dx_Node_getNodeToParentTransform);
tolua_function(tolua_S,"convertTouchToNodeSpaceAR",lua_cocos2dx_Node_convertTouchToNodeSpaceAR);
tolua_function(tolua_S,"convertToNodeSpace",lua_cocos2dx_Node_convertToNodeSpace);
tolua_function(tolua_S,"resume",lua_cocos2dx_Node_resume);
tolua_function(tolua_S,"getPhysicsBody",lua_cocos2dx_Node_getPhysicsBody);
tolua_function(tolua_S,"setPosition",lua_cocos2dx_Node_setPosition);
tolua_function(tolua_S,"stopActionByTag",lua_cocos2dx_Node_stopActionByTag);
@ -8898,6 +8989,7 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S)
tolua_function(tolua_S,"updateDisplayedColor",lua_cocos2dx_Node_updateDisplayedColor);
tolua_function(tolua_S,"setVisible",lua_cocos2dx_Node_setVisible);
tolua_function(tolua_S,"getParentToNodeTransform",lua_cocos2dx_Node_getParentToNodeTransform);
tolua_function(tolua_S,"isScheduled",lua_cocos2dx_Node_isScheduled);
tolua_function(tolua_S,"setGlobalZOrder",lua_cocos2dx_Node_setGlobalZOrder);
tolua_function(tolua_S,"setScale",lua_cocos2dx_Node_setScale);
tolua_function(tolua_S,"getChildByTag",lua_cocos2dx_Node_getChildByTag);

2
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
View File

@ -1577,6 +1577,8 @@ int register_all_cocos2dx(lua_State* tolua_S);

124
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
View File

@ -18022,48 +18022,79 @@ int lua_cocos2dx_ui_Scale9Sprite_updateWithSprite(lua_State* tolua_S)
int argc = 0;
cocos2d::ui::Scale9Sprite* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.Scale9Sprite",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::Scale9Sprite*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Scale9Sprite_updateWithSprite'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 4)
{
cocos2d::Sprite* arg0;
cocos2d::Rect arg1;
bool arg2;
cocos2d::Rect arg3;
do{
if (argc == 6) {
cocos2d::Sprite* arg0;
ok &= luaval_to_object<cocos2d::Sprite>(tolua_S, 2, "cc.Sprite",&arg0);
ok &= luaval_to_object<cocos2d::Sprite>(tolua_S, 2, "cc.Sprite",&arg0);
if (!ok) { break; }
cocos2d::Rect arg1;
ok &= luaval_to_rect(tolua_S, 3, &arg1, "ccui.Scale9Sprite:updateWithSprite");
ok &= luaval_to_rect(tolua_S, 3, &arg1, "ccui.Scale9Sprite:updateWithSprite");
if (!ok) { break; }
bool arg2;
ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.Scale9Sprite:updateWithSprite");
ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.Scale9Sprite:updateWithSprite");
if (!ok) { break; }
cocos2d::Vec2 arg3;
ok &= luaval_to_vec2(tolua_S, 5, &arg3, "ccui.Scale9Sprite:updateWithSprite");
ok &= luaval_to_rect(tolua_S, 5, &arg3, "ccui.Scale9Sprite:updateWithSprite");
if(!ok)
return 0;
bool ret = cobj->updateWithSprite(arg0, arg1, arg2, arg3);
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Scale9Sprite:updateWithSprite",argc, 4);
if (!ok) { break; }
cocos2d::Size arg4;
ok &= luaval_to_size(tolua_S, 6, &arg4, "ccui.Scale9Sprite:updateWithSprite");
if (!ok) { break; }
cocos2d::Rect arg5;
ok &= luaval_to_rect(tolua_S, 7, &arg5, "ccui.Scale9Sprite:updateWithSprite");
if (!ok) { break; }
bool ret = cobj->updateWithSprite(arg0, arg1, arg2, arg3, arg4, arg5);
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
}while(0);
ok = true;
do{
if (argc == 4) {
cocos2d::Sprite* arg0;
ok &= luaval_to_object<cocos2d::Sprite>(tolua_S, 2, "cc.Sprite",&arg0);
if (!ok) { break; }
cocos2d::Rect arg1;
ok &= luaval_to_rect(tolua_S, 3, &arg1, "ccui.Scale9Sprite:updateWithSprite");
if (!ok) { break; }
bool arg2;
ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.Scale9Sprite:updateWithSprite");
if (!ok) { break; }
cocos2d::Rect arg3;
ok &= luaval_to_rect(tolua_S, 5, &arg3, "ccui.Scale9Sprite:updateWithSprite");
if (!ok) { break; }
bool ret = cobj->updateWithSprite(arg0, arg1, arg2, arg3);
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
}while(0);
ok = true;
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Scale9Sprite:updateWithSprite",argc, 4);
return 0;
#if COCOS2D_DEBUG >= 1
@ -18566,7 +18597,39 @@ int lua_cocos2dx_ui_Scale9Sprite_init(lua_State* tolua_S)
}
}while(0);
ok = true;
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Scale9Sprite:init",argc, 3);
do{
if (argc == 6) {
cocos2d::Sprite* arg0;
ok &= luaval_to_object<cocos2d::Sprite>(tolua_S, 2, "cc.Sprite",&arg0);
if (!ok) { break; }
cocos2d::Rect arg1;
ok &= luaval_to_rect(tolua_S, 3, &arg1, "ccui.Scale9Sprite:init");
if (!ok) { break; }
bool arg2;
ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.Scale9Sprite:init");
if (!ok) { break; }
cocos2d::Vec2 arg3;
ok &= luaval_to_vec2(tolua_S, 5, &arg3, "ccui.Scale9Sprite:init");
if (!ok) { break; }
cocos2d::Size arg4;
ok &= luaval_to_size(tolua_S, 6, &arg4, "ccui.Scale9Sprite:init");
if (!ok) { break; }
cocos2d::Rect arg5;
ok &= luaval_to_rect(tolua_S, 7, &arg5, "ccui.Scale9Sprite:init");
if (!ok) { break; }
bool ret = cobj->init(arg0, arg1, arg2, arg3, arg4, arg5);
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
}while(0);
ok = true;
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Scale9Sprite:init",argc, 6);
return 0;
#if COCOS2D_DEBUG >= 1
@ -18702,6 +18765,19 @@ int lua_cocos2dx_ui_Scale9Sprite_setSpriteFrame(lua_State* tolua_S)
cobj->setSpriteFrame(arg0);
return 0;
}
if (argc == 2)
{
cocos2d::SpriteFrame* arg0;
cocos2d::Rect arg1;
ok &= luaval_to_object<cocos2d::SpriteFrame>(tolua_S, 2, "cc.SpriteFrame",&arg0);
ok &= luaval_to_rect(tolua_S, 3, &arg1, "ccui.Scale9Sprite:setSpriteFrame");
if(!ok)
return 0;
cobj->setSpriteFrame(arg0, arg1);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Scale9Sprite:setSpriteFrame",argc, 1);
return 0;

8
cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj
View File

@ -78,7 +78,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
@ -96,7 +96,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -113,7 +113,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
@ -131,7 +131,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>

8
cocos/ui/proj.wp8/libGUI.vcxproj
View File

@ -78,7 +78,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsWinRT>true</CompileAsWinRT>
<MinimalRebuild>false</MinimalRebuild>
@ -100,7 +100,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -119,7 +119,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
@ -139,7 +139,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>

8
extensions/proj.wp8/libExtensions.vcxproj
View File

@ -78,7 +78,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
@ -98,7 +98,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;NDEBUG;_LIB;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;NDEBUG;_LIB;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
@ -118,7 +118,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
@ -138,7 +138,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WP8;NDEBUG;_LIB;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;NDEBUG;_LIB;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>

509
templates/cocos2dx_files.json
View File

@ -50,6 +50,7 @@
"cmake/BuildHelpers.CMakeLists.txt",
"cmake/Modules/CMakeParseArguments.cmake",
"cmake/Modules/FindChipmunk.cmake",
"cmake/Modules/FindGLFW3.cmake",
"cmake/Modules/FindPackageHandleStandardArgs.cmake",
"cmake/Modules/FindPackageMessage.cmake",
"cmake/Modules/FindWebP.cmake",
@ -200,7 +201,6 @@
"cocos/2d/cocos2dx.props",
"cocos/2d/libcocos2d.vcxproj",
"cocos/2d/libcocos2d.vcxproj.filters",
"cocos/3d/3dExport.h",
"cocos/3d/Android.mk",
"cocos/3d/CCAABB.cpp",
"cocos/3d/CCAABB.h",
@ -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",

17
templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
View File

@ -100,12 +100,11 @@ void startScript(string strDebugArg)
engine->executeScriptFile(ConfigParser::getInstance()->getEntryFile().c_str());
}
static bool resetLuaModule(string fileName)
static void resetLuaModule(const string& fileName)
{
if (fileName.empty())
{
CCLOG("fileName is null");
return false;
return;
}
auto engine = LuaEngine::getInstance();
LuaStack* luaStack = engine->getLuaStack();
@ -125,7 +124,7 @@ static bool resetLuaModule(string fileName)
tableKey = replaceAll(tableKey, "\\", "/");
tableKey.append(".lua");
found = fileName.rfind(tableKey);
if (0 == found || ( found != std::string::npos && fileName.at(found - 1) == '/'))
if (0 == found || (found != std::string::npos && fileName.at(found - 1) == '/'))
{
lua_pushstring(stack, key.c_str());
lua_pushnil(stack);
@ -137,8 +136,8 @@ static bool resetLuaModule(string fileName)
lua_pop(stack, 1);
}
lua_pop(stack, 2);
return true;
}
bool reloadScript(const string& file)
{
auto director = Director::getInstance();
@ -150,10 +149,16 @@ bool reloadScript(const string& file)
}
FileUtils::getInstance()->purgeCachedEntries();
string modulefile = file;
if (!resetLuaModule(modulefile))
if (! modulefile.empty())
{
resetLuaModule(modulefile);
}
else
{
modulefile = ConfigParser::getInstance()->getEntryFile().c_str();
}
auto engine = LuaEngine::getInstance();
LuaStack* luaStack = engine->getLuaStack();
std::string require = "require \'" + modulefile + "\'";

2
tests/cpp-empty-test/Classes/HelloWorldScene.cpp
View File

@ -45,7 +45,7 @@ bool HelloWorld::init()
closeItem->setPosition(origin + Vec2(visibleSize) - Vec2(closeItem->getContentSize() / 2));
// create menu, it's an autorelease object
auto menu = Menu::create(closeItem, NULL);
auto menu = Menu::create(closeItem, nullptr);
menu->setPosition(Vec2::ZERO);
this->addChild(menu, 1);

8
tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj
View File

@ -83,7 +83,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@ -104,7 +104,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@ -125,7 +125,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@ -146,7 +146,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>

4
tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.cpp
View File

@ -123,7 +123,7 @@ BillBoardTest::BillBoardTest()
auto menuItem1 = MenuItemLabel::create(label1, CC_CALLBACK_1(BillBoardTest::rotateCameraCallback,this,10));
auto label2 = Label::createWithTTF(ttfConfig,"rotate-");
auto menuItem2 = MenuItemLabel::create(label2, CC_CALLBACK_1(BillBoardTest::rotateCameraCallback,this,-10));
auto menu = Menu::create(menuItem1,menuItem2,NULL);
auto menu = Menu::create(menuItem1, menuItem2, nullptr);
menu->setPosition(Vec2::ZERO);
menuItem1->setPosition( Vec2( s.width-80, VisibleRect::top().y-160) );
menuItem2->setPosition( Vec2( s.width-80, VisibleRect::top().y-190) );
@ -137,7 +137,7 @@ BillBoardTest::BillBoardTest()
menuItem1->setPosition( Vec2( s.width-80, VisibleRect::top().y-100) );
menuItem2->setPosition( Vec2( s.width-80, VisibleRect::top().y-130) );
menu = Menu::create(menuItem1,menuItem2,NULL);
menu = Menu::create(menuItem1, menuItem2, nullptr);
menu->setPosition(Vec2(0,0));
this->addChild(menu, 10);
menuCallback_orientedPoint(nullptr);

2
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
View File

@ -278,7 +278,7 @@ void Camera3DTestDemo::onEnter()
auto menuItem6 = MenuItemLabel::create(label6, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback,this,CameraType::ThirdCamera));
auto label7 = Label::createWithTTF(ttfConfig,"first person");
auto menuItem7 = MenuItemLabel::create(label7, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback,this,CameraType::FirstCamera));
auto menu = Menu::create(menuItem1,menuItem2,menuItem3,menuItem4,menuItem5,menuItem6,menuItem7,NULL);
auto menu = Menu::create(menuItem1, menuItem2, menuItem3, menuItem4, menuItem5, menuItem6, menuItem7, nullptr);
menu->setPosition(Vec2::ZERO);
menuItem1->setPosition(s.width-50, VisibleRect::top().y-50 );

2
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
View File

@ -988,7 +988,7 @@ void ClippingToRenderTextureTest::setup()
auto s = Director::getInstance()->getWinSize();
// create menu, it's an autorelease object
auto menu = Menu::create(button, NULL);
auto menu = Menu::create(button, nullptr);
menu->setPosition(Point(s.width/2, s.height/2));
this->addChild(menu, 1);

10
tests/cpp-tests/Classes/LightTest/LightTest.cpp
View File

@ -65,7 +65,7 @@ LightTest::LightTest()
_spotLightLabel = Label::createWithTTF(ttfConfig,"Spot Light OFF");
_spotLightLabel->retain();
auto menuItem3 = MenuItemLabel::create(_spotLightLabel, CC_CALLBACK_1(LightTest::SwitchLight,this,LightType::SPOT));
auto menu = Menu::create(menuItem0, menuItem1,menuItem2,menuItem3,NULL);
auto menu = Menu::create(menuItem0, menuItem1, menuItem2, menuItem3, nullptr);
menu->setPosition(Vec2::ZERO);
menuItem0->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
menuItem0->setPosition( Vec2(VisibleRect::left().x, VisibleRect::top().y-50) );
@ -239,7 +239,7 @@ void LightTest::addLights()
auto tintto2 = TintTo::create(4, 0, 255, 0);
auto tintto3 = TintTo::create(4, 255, 0, 0);
auto tintto4 = TintTo::create(4, 255, 255, 255);
auto seq = Sequence::create(tintto1,tintto2, tintto3, tintto4, NULL);
auto seq = Sequence::create(tintto1,tintto2, tintto3, tintto4, nullptr);
_ambientLight->runAction(RepeatForever::create(seq));
}
@ -248,7 +248,7 @@ void LightTest::addLights()
auto tintto2 = TintTo::create(4, 0, 255, 0);
auto tintto3 = TintTo::create(4, 0, 0, 255);
auto tintto4 = TintTo::create(4, 255, 255, 255);
auto seq = Sequence::create(tintto1,tintto2, tintto3, tintto4, NULL);
auto seq = Sequence::create(tintto1,tintto2, tintto3, tintto4, nullptr);
_directionalLight->runAction(RepeatForever::create(seq));
}
@ -257,7 +257,7 @@ void LightTest::addLights()
auto tintto2 = TintTo::create(4, 0, 255, 0);
auto tintto3 = TintTo::create(4, 0, 0, 255);
auto tintto4 = TintTo::create(4, 255, 255, 255);
auto seq = Sequence::create(tintto2, tintto1, tintto3, tintto4, NULL);
auto seq = Sequence::create(tintto2, tintto1, tintto3, tintto4, nullptr);
_pointLight->runAction(RepeatForever::create(seq));
}
@ -266,7 +266,7 @@ void LightTest::addLights()
auto tintto2 = TintTo::create(4, 0, 255, 0);
auto tintto3 = TintTo::create(4, 0, 0, 255);
auto tintto4 = TintTo::create(4, 255, 255, 255);
auto seq = Sequence::create(tintto3, tintto2, tintto1, tintto4, NULL);
auto seq = Sequence::create(tintto3, tintto2, tintto1, tintto4, nullptr);
_spotLight->runAction(RepeatForever::create(seq));
}
}

2
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
View File

@ -1021,7 +1021,7 @@ Sprite3DReskinTest::Sprite3DReskinTest()
item3->setPosition( Vec2(VisibleRect::left().x+50, VisibleRect::bottom().y+item1->getContentSize().height*6 ) );
item4->setPosition( Vec2(VisibleRect::left().x+50, VisibleRect::bottom().y+item1->getContentSize().height *7 ) );
item5->setPosition( Vec2(VisibleRect::left().x+50, VisibleRect::bottom().y+item1->getContentSize().height *8 ) );
auto pMenu1 = CCMenu::create(item1,item2,item3,item4,item5,NULL);
auto pMenu1 = CCMenu::create(item1, item2, item3, item4, item5, nullptr);
pMenu1->setPosition(Vec2(0,0));
this->addChild(pMenu1, 10);

8
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj
View File

@ -89,7 +89,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@ -110,7 +110,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@ -131,7 +131,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
@ -152,7 +152,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WP8;_WINRT_DLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;CC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>

2
tools/cocos2d-console

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