mirror of https://github.com/axmolengine/axmol.git
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
This commit is contained in:
walzer
commit
088c0b2762
9
AUTHORS
9
AUTHORS
|
|
@ -12,6 +12,15 @@ Developers:
|
|||
Rolando Abarca
|
||||
Javascript Binding and testjs
|
||||
|
||||
fape
|
||||
add Hungarian language support
|
||||
|
||||
chenium
|
||||
fix a bug that CCRenderTexture can not work when coming to foreground on Android
|
||||
|
||||
9re(Taro Kobayashi)
|
||||
add Japanese language support
|
||||
|
||||
mingulov
|
||||
improve the speed of accessing to files from apk
|
||||
|
||||
|
|
|
|||
33
CHANGELOG
33
CHANGELOG
|
|
@ -1,3 +1,36 @@
|
|||
cocos2d-2.1beta3-x-2.1.0 @Dec.5 2012
|
||||
[all platforms]
|
||||
Bug #1556: set a default texture for CCParticleFire, CCParticleFireworks, etc
|
||||
Feature #1555: update to cocos2d-iphone v2.1 beta3
|
||||
Feature #1564: update tests to cocos2d-iphone v2.1beta3
|
||||
Feature #1572: add sample game WatermelonWithMe
|
||||
Feature #1573: add sample game CocosDragonJS
|
||||
Refactor #1545: remove the usage of NODE_FUNC and CREATE_FUNC
|
||||
Refactor #1565: remove VS2008 support
|
||||
Refactor #1576: update CCBReader to latest version of CocosBuilder
|
||||
Refactor #1589: add CCBReader::setCCBRootPath()
|
||||
[iOS]
|
||||
Bug #1548: update libcurl header files to 7.26.0 on iOS
|
||||
[android]
|
||||
Bug #1551: add error handler when reading image data using libjpeg
|
||||
Refactor #1558: improve the speed of accessing to files from apk
|
||||
[marmalade]
|
||||
Bug #1559: fix a bug that if a file in resource directory doesn't exist, it will not search from root directory
|
||||
Bug #1571: add box2d rope to marmalade project
|
||||
Bug #1590: JPEG and File fixes for marmalade
|
||||
Feature #1557: Marmalade support
|
||||
Refactor #1574: update marmalade languages
|
||||
Refactor #1575: update samples/TestCpp to compatible with marmalade
|
||||
Refactor #1578: create cocos2dx-ext marmalade project
|
||||
Refactor #1591: add TestLua marmalade project
|
||||
[javascript binding]
|
||||
Bug #1577: fix a bug that touch events lost on Win32 when using JSBinding
|
||||
Bug #1586: fix a crash in WatermelonWithMe
|
||||
Bug #1588: rescheduleCallback support for JSBinding
|
||||
Refactor #1570: improve the debugger for JSBinding
|
||||
[lua binding]
|
||||
Bug #1587: remove lua script handler in CCCallFunc's destructor
|
||||
|
||||
cocos2d-2.0-x-2.0.4 @Nov.2 2012
|
||||
[all platforms]
|
||||
Bug #1473: fix a bug that CCScale9Sprite does not support rotated spriteframe in atlas
|
||||
|
|
|
|||
|
|
@ -45,15 +45,17 @@ cd ".\Release.win32\"
|
|||
|
||||
set CC_TEST_BIN=TestCpp.exe
|
||||
|
||||
set CC_TEST_RES=..\samples\TestCpp\Resources\*.*
|
||||
set CC_HELLOWORLD_RES=..\samples\HelloCpp\Resources\*.*
|
||||
set CC_HELLOLUA_RES=..\samples\HelloLua\Resources\*.*
|
||||
set CC_TESTJS_RES=..\samples\TestJavascript\Resources\*.*
|
||||
set CC_TEST_RES=..\samples\TestCpp\Resources
|
||||
set CC_HELLOWORLD_RES=..\samples\HelloCpp\Resources
|
||||
set CC_TESTLUA_RES=..\samples\TestLua\Resources
|
||||
set CC_SIMPLEGAME_RES=..\samples\SimpleGame\Resources
|
||||
set CC_HELLOLUA_RES=..\samples\HelloLua\Resources
|
||||
set CC_JSB_SOURCES=..\scripting\javascript\bindings\js
|
||||
set CC_TESTJS_RES=..\samples\TestJavascript\cocos2d-js-tests\tests
|
||||
set CC_DRAGONJS_RES=..\samples\TestJavascript\cocos2d-js-tests\games\CocosDragonJS\Published files iOS
|
||||
set CC_MOONWARRIORS_RES=..\samples\TestJavascript\cocos2d-js-tests\games\MoonWarriors
|
||||
set CC_WATERMELONWITHME_RES=..\samples\TestJavascript\cocos2d-js-tests\games\WatermelonWithMe
|
||||
|
||||
if not exist "%CC_TEST_BIN%" (
|
||||
echo Can't find the binary "TestCpp.exe", is there build error?
|
||||
goto ERROR
|
||||
)
|
||||
|
||||
echo./*
|
||||
echo.* Run cocos2d-win32 tests.exe and view Cocos2d-x Application Wizard for Visual Studio User Guide.
|
||||
|
|
@ -62,7 +64,18 @@ echo.
|
|||
xcopy /E /Y /Q "%CC_TEST_RES%" .
|
||||
xcopy /E /Y /Q "%CC_HELLOWORLD_RES%" .
|
||||
xcopy /E /Y /Q "%CC_HELLOLUA_RES%" .
|
||||
xcopy /E /Y /Q "%CC_TESTLUA_RES%" .
|
||||
xcopy /E /Y /Q "%CC_SIMPLEGAME_RES%" .
|
||||
xcopy /E /Y /Q "%CC_JSB_SOURCES%" .
|
||||
xcopy /E /Y /Q "%CC_TESTJS_RES%" .
|
||||
xcopy /E /Y /Q "%CC_MOONWARRIORS_RES%" .
|
||||
xcopy /E /Y /Q "%CC_WATERMELONWITHME_RES%" .
|
||||
xcopy /E /Y /Q "%CC_DRAGONJS_RES%" .
|
||||
|
||||
if not exist "%CC_TEST_BIN%" (
|
||||
echo Can't find the binary "TestCpp.exe", is there build error?
|
||||
goto ERROR
|
||||
)
|
||||
|
||||
call "%CC_TEST_BIN%"
|
||||
start http://www.cocos2d-x.org/projects/cocos2d-x/wiki/Cocos2d-x_Application_Wizard_for_Visual_Studio_User_Guide
|
||||
|
|
|
|||
|
|
@ -52,18 +52,7 @@ CCSet::CCSet(const CCSet &rSetObject)
|
|||
|
||||
CCSet::~CCSet(void)
|
||||
{
|
||||
// call release() of elements
|
||||
CCSetIterator iter;
|
||||
for (iter = m_pSet->begin(); iter != m_pSet->end(); ++iter)
|
||||
{
|
||||
if (! (*iter))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
(*iter)->release();
|
||||
}
|
||||
|
||||
removeAllObjects();
|
||||
CC_SAFE_DELETE(m_pSet);
|
||||
}
|
||||
|
||||
|
|
@ -96,6 +85,20 @@ void CCSet::removeObject(CCObject *pObject)
|
|||
CC_SAFE_RELEASE(pObject);
|
||||
}
|
||||
|
||||
void CCSet::removeAllObjects()
|
||||
{
|
||||
CCSetIterator it;
|
||||
for (it = m_pSet->begin(); it != m_pSet->end(); ++it)
|
||||
{
|
||||
if (! (*it))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
(*it)->release();
|
||||
}
|
||||
}
|
||||
|
||||
bool CCSet::containsObject(CCObject *pObject)
|
||||
{
|
||||
return m_pSet->find(pObject) != m_pSet->end();
|
||||
|
|
|
|||
|
|
@ -64,6 +64,10 @@ public:
|
|||
*@brief Remove the given element, nothing todo if no element equals pObject.
|
||||
*/
|
||||
void removeObject(CCObject *pObject);
|
||||
/**
|
||||
*@brief Remove all elements of the set
|
||||
*/
|
||||
void removeAllObjects();
|
||||
/**
|
||||
*@brief Check if CCSet contains a element equals pObject.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ To enabled set it to 1. Disabled by default.
|
|||
Default value: 0.1f
|
||||
*/
|
||||
#ifndef CC_DIRECTOR_STATS_INTERVAL
|
||||
#define CC_DIRECTOR_STATS_INTERVAL (0.1f)
|
||||
#define CC_DIRECTOR_STATS_INTERVAL (0.5f)
|
||||
#endif
|
||||
|
||||
/** @def CC_DIRECTOR_FPS_POSITION
|
||||
|
|
|
|||
|
|
@ -59,12 +59,19 @@ CCRenderTexture::CCRenderTexture()
|
|||
, m_nClearStencil(0)
|
||||
, m_bAutoDraw(false)
|
||||
{
|
||||
#if CC_ENABLE_CACHE_TEXTURE_DATA
|
||||
// Listen this event to save render texture before come to background.
|
||||
// Then it can be restored after coming to foreground on Android.
|
||||
CCNotificationCenter::sharedNotificationCenter()->addObserver(this,
|
||||
callfuncO_selector(CCRenderTexture::listenToBackground),
|
||||
EVENT_COME_TO_BACKGROUND,
|
||||
NULL);
|
||||
callfuncO_selector(CCRenderTexture::listenToBackground),
|
||||
EVENT_COME_TO_BACKGROUND,
|
||||
NULL);
|
||||
|
||||
CCNotificationCenter::sharedNotificationCenter()->addObserver(this,
|
||||
callfuncO_selector(CCRenderTexture::listenToForeground),
|
||||
EVNET_COME_TO_FOREGROUND, // this is misspelt
|
||||
NULL);
|
||||
#endif
|
||||
}
|
||||
|
||||
CCRenderTexture::~CCRenderTexture()
|
||||
|
|
@ -78,29 +85,59 @@ CCRenderTexture::~CCRenderTexture()
|
|||
glDeleteRenderbuffers(1, &m_uDepthRenderBufffer);
|
||||
}
|
||||
CC_SAFE_DELETE(m_pUITextureImage);
|
||||
|
||||
|
||||
#if CC_ENABLE_CACHE_TEXTURE_DATA
|
||||
CCNotificationCenter::sharedNotificationCenter()->removeObserver(this, EVENT_COME_TO_BACKGROUND);
|
||||
CCNotificationCenter::sharedNotificationCenter()->removeObserver(this, EVNET_COME_TO_FOREGROUND);
|
||||
#endif
|
||||
}
|
||||
|
||||
void CCRenderTexture::listenToBackground(cocos2d::CCObject *obj)
|
||||
{
|
||||
#if CC_ENABLE_CACHE_TEXTURE_DATA
|
||||
|
||||
CC_SAFE_DELETE(m_pUITextureImage);
|
||||
|
||||
// to get the rendered texture data
|
||||
m_pUITextureImage = newCCImage();
|
||||
|
||||
m_pUITextureImage = newCCImage(false);
|
||||
|
||||
if (m_pUITextureImage)
|
||||
{
|
||||
const CCSize& s = m_pTexture->getContentSizeInPixels();
|
||||
VolatileTexture::addDataTexture(m_pTexture, m_pUITextureImage->getData(), kTexture2DPixelFormat_RGBA8888, s);
|
||||
}
|
||||
|
||||
if ( m_pTextureCopy )
|
||||
{
|
||||
VolatileTexture::addDataTexture(m_pTextureCopy, m_pUITextureImage->getData(), kTexture2DPixelFormat_RGBA8888, s);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
CCLOG("Cache rendertexture failed!");
|
||||
}
|
||||
|
||||
glDeleteFramebuffers(1, &m_uFBO);
|
||||
m_uFBO = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
void CCRenderTexture::listenToForeground(cocos2d::CCObject *obj)
|
||||
{
|
||||
#if CC_ENABLE_CACHE_TEXTURE_DATA
|
||||
// -- regenerate frame buffer object and attach the texture
|
||||
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &m_nOldFBO);
|
||||
|
||||
glGenFramebuffers(1, &m_uFBO);
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, m_uFBO);
|
||||
|
||||
m_pTexture->setAliasTexParameters();
|
||||
|
||||
if ( m_pTextureCopy )
|
||||
{
|
||||
m_pTextureCopy->setAliasTexParameters();
|
||||
}
|
||||
|
||||
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_pTexture->getName(), 0);
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, m_nOldFBO);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -590,7 +627,7 @@ bool CCRenderTexture::saveToFile(const char *szFilePath)
|
|||
{
|
||||
bool bRet = false;
|
||||
|
||||
CCImage *pImage = newCCImage();
|
||||
CCImage *pImage = newCCImage(true);
|
||||
if (pImage)
|
||||
{
|
||||
bRet = pImage->saveToFile(szFilePath, kCCImageFormatJPEG);
|
||||
|
|
@ -605,7 +642,7 @@ bool CCRenderTexture::saveToFile(const char *fileName, tCCImageFormat format)
|
|||
CCAssert(format == kCCImageFormatJPEG || format == kCCImageFormatPNG,
|
||||
"the image can only be saved as JPG or PNG format");
|
||||
|
||||
CCImage *pImage = newCCImage();
|
||||
CCImage *pImage = newCCImage(true);
|
||||
if (pImage)
|
||||
{
|
||||
std::string fullpath = CCFileUtils::sharedFileUtils()->getWriteablePath() + fileName;
|
||||
|
|
@ -619,7 +656,7 @@ bool CCRenderTexture::saveToFile(const char *fileName, tCCImageFormat format)
|
|||
}
|
||||
|
||||
/* get buffer as CCImage */
|
||||
CCImage* CCRenderTexture::newCCImage()
|
||||
CCImage* CCRenderTexture::newCCImage(bool flipImage)
|
||||
{
|
||||
CCAssert(m_ePixelFormat == kCCTexture2DPixelFormat_RGBA8888, "only RGBA8888 can be saved as image");
|
||||
|
||||
|
|
@ -656,16 +693,24 @@ CCImage* CCRenderTexture::newCCImage()
|
|||
glReadPixels(0,0,nSavedBufferWidth, nSavedBufferHeight,GL_RGBA,GL_UNSIGNED_BYTE, pTempData);
|
||||
this->end();
|
||||
|
||||
// to get the actual texture data
|
||||
// #640 the image read from rendertexture is dirty
|
||||
for (int i = 0; i < nSavedBufferHeight; ++i)
|
||||
if ( flipImage ) // -- flip is only required when saving image to file
|
||||
{
|
||||
memcpy(&pBuffer[i * nSavedBufferWidth * 4],
|
||||
&pTempData[(nSavedBufferHeight - i - 1) * nSavedBufferWidth * 4],
|
||||
nSavedBufferWidth * 4);
|
||||
}
|
||||
// to get the actual texture data
|
||||
// #640 the image read from rendertexture is dirty
|
||||
for (int i = 0; i < nSavedBufferHeight; ++i)
|
||||
{
|
||||
memcpy(&pBuffer[i * nSavedBufferWidth * 4],
|
||||
&pTempData[(nSavedBufferHeight - i - 1) * nSavedBufferWidth * 4],
|
||||
nSavedBufferWidth * 4);
|
||||
}
|
||||
|
||||
pImage->initWithImageData(pBuffer, nSavedBufferWidth * nSavedBufferHeight * 4, CCImage::kFmtRawData, nSavedBufferWidth, nSavedBufferHeight, 8);
|
||||
pImage->initWithImageData(pBuffer, nSavedBufferWidth * nSavedBufferHeight * 4, CCImage::kFmtRawData, nSavedBufferWidth, nSavedBufferHeight, 8);
|
||||
}
|
||||
else
|
||||
{
|
||||
pImage->initWithImageData(pTempData, nSavedBufferWidth * nSavedBufferHeight * 4, CCImage::kFmtRawData, nSavedBufferWidth, nSavedBufferHeight, 8);
|
||||
}
|
||||
|
||||
} while (0);
|
||||
|
||||
CC_SAFE_DELETE_ARRAY(pBuffer);
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ public:
|
|||
/* creates a new CCImage from with the texture's data.
|
||||
Caller is responsible for releasing it by calling delete.
|
||||
*/
|
||||
CCImage* newCCImage();
|
||||
CCImage* newCCImage(bool flipImage = true);
|
||||
|
||||
/** saves the texture into a file using JPEG format. The file will be saved in the Documents folder.
|
||||
Returns YES if the operation is successful.
|
||||
|
|
@ -145,6 +145,11 @@ public:
|
|||
*/
|
||||
void listenToBackground(CCObject *obj);
|
||||
|
||||
/** Listen "come to foreground" message and restore the frame buffer object
|
||||
It only has effect on Android.
|
||||
*/
|
||||
void listenToForeground(CCObject *obj);
|
||||
|
||||
/** Valid flags: GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT, GL_STENCIL_BUFFER_BIT. They can be OR'ed. Valid when "autoDraw is YES. */
|
||||
unsigned int getClearFlags() const;
|
||||
void setClearFlags(unsigned int uClearFlags);
|
||||
|
|
|
|||
|
|
@ -64,7 +64,9 @@ typedef enum LanguageType
|
|||
kLanguageGerman,
|
||||
kLanguageSpanish,
|
||||
kLanguageRussian,
|
||||
kLanguageKorean
|
||||
kLanguageKorean,
|
||||
kLanguageJapanese,
|
||||
kLanguageHungarian
|
||||
} ccLanguageType;
|
||||
|
||||
// end of platform group
|
||||
|
|
|
|||
|
|
@ -112,6 +112,14 @@ ccLanguageType CCApplication::getCurrentLanguage()
|
|||
{
|
||||
ret = kLanguageKorean;
|
||||
}
|
||||
else if (0 == strcmp("ja", pLanguageName))
|
||||
{
|
||||
ret = kLanguageJapanese;
|
||||
}
|
||||
else if (0 == strcmp("hu", pLanguageName))
|
||||
{
|
||||
ret = kLanguageHungarian;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,10 +147,18 @@ ccLanguageType CCApplication::getCurrentLanguage()
|
|||
{
|
||||
ret_language = kLanguageRussian;
|
||||
}
|
||||
else if (strcmp(language, "ko") == 0)
|
||||
else if (strcmp(language, "ko") == 0)
|
||||
{
|
||||
ret_language = kLanguageKorean;
|
||||
}
|
||||
else if (strcmp(language, "ja") == 0)
|
||||
{
|
||||
ret_language = kLanguageJapanese;
|
||||
}
|
||||
else if (strcmp(language, "hu") == 0)
|
||||
{
|
||||
ret_language = kLanguageHungarian;
|
||||
}
|
||||
|
||||
free(language);
|
||||
free(country);
|
||||
|
|
|
|||
|
|
@ -107,6 +107,12 @@ ccLanguageType CCApplication::getCurrentLanguage()
|
|||
else if ([languageCode isEqualToString:@"ko"]){
|
||||
ret = kLanguageKorean;
|
||||
}
|
||||
else if ([languageCode isEqualToString:@"ja"]){
|
||||
ret = kLanguageJapanese;
|
||||
}
|
||||
else if ([languageCode isEqualToString:@"hu"]){
|
||||
ret = kLanguageHungarian;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,8 +100,60 @@ CCApplication* CCApplication::sharedApplication()
|
|||
|
||||
ccLanguageType CCApplication::getCurrentLanguage()
|
||||
{
|
||||
//TODO
|
||||
return kLanguageEnglish;
|
||||
char *pLanguageName = getenv("LANG");
|
||||
ccLanguageType ret = kLanguageEnglish;
|
||||
if (!pLanguageName)
|
||||
{
|
||||
return kLanguageEnglish;
|
||||
}
|
||||
strtok(pLanguageName, "_");
|
||||
if (!pLanguageName)
|
||||
{
|
||||
return kLanguageEnglish;
|
||||
}
|
||||
|
||||
if (0 == strcmp("zh", pLanguageName))
|
||||
{
|
||||
ret = kLanguageChinese;
|
||||
}
|
||||
else if (0 == strcmp("en", pLanguageName))
|
||||
{
|
||||
ret = kLanguageEnglish;
|
||||
}
|
||||
else if (0 == strcmp("fr", pLanguageName))
|
||||
{
|
||||
ret = kLanguageFrench;
|
||||
}
|
||||
else if (0 == strcmp("it", pLanguageName))
|
||||
{
|
||||
ret = kLanguageItalian;
|
||||
}
|
||||
else if (0 == strcmp("de", pLanguageName))
|
||||
{
|
||||
ret = kLanguageGerman;
|
||||
}
|
||||
else if (0 == strcmp("es", pLanguageName))
|
||||
{
|
||||
ret = kLanguageSpanish;
|
||||
}
|
||||
else if (0 == strcmp("ru", pLanguageName))
|
||||
{
|
||||
ret = kLanguageRussian;
|
||||
}
|
||||
else if (0 == strcmp("ko", pLanguageName))
|
||||
{
|
||||
ret = kLanguageKorean;
|
||||
}
|
||||
else if (0 == strcmp("ja", pLanguageName))
|
||||
{
|
||||
ret = kLanguageJapanese;
|
||||
}
|
||||
else if (0 == strcmp("hu", pLanguageName))
|
||||
{
|
||||
ret = kLanguageHungarian;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ void CCEGLView::setFrameSize(float width, float height)
|
|||
case 16:
|
||||
{
|
||||
/* Updates video mode */
|
||||
eResult = (glfwOpenWindow(width, height, 5, 6, 5, 0, 16, 0, (int)u32GLFWFlags) != false) ? true : false;
|
||||
eResult = (glfwOpenWindow(width, height, 5, 6, 5, 0, 16, 8, (int)u32GLFWFlags) != false) ? true : false;
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
@ -190,7 +190,7 @@ void CCEGLView::setFrameSize(float width, float height)
|
|||
case 24:
|
||||
{
|
||||
/* Updates video mode */
|
||||
eResult = (glfwOpenWindow(width, height, 8, 8, 8, 0, 16, 0, (int)u32GLFWFlags) != false) ? true : false;
|
||||
eResult = (glfwOpenWindow(width, height, 8, 8, 8, 0, 16, 8, (int)u32GLFWFlags) != false) ? true : false;
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
@ -200,7 +200,7 @@ void CCEGLView::setFrameSize(float width, float height)
|
|||
case 32:
|
||||
{
|
||||
/* Updates video mode */
|
||||
eResult = (glfwOpenWindow(width, height, 8, 8, 8, 8, 16, 0, (int)u32GLFWFlags) != GL_FALSE) ? true :false;
|
||||
eResult = (glfwOpenWindow(width, height, 8, 8, 8, 8, 16, 8, (int)u32GLFWFlags) != GL_FALSE) ? true :false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -320,6 +320,10 @@ bool CCEGLView::initGL()
|
|||
{
|
||||
CCLog("OpenGL 2.0 not supported\n");
|
||||
}
|
||||
|
||||
// Enable point size by default on linux.
|
||||
glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -113,6 +113,12 @@ ccLanguageType CCApplication::getCurrentLanguage()
|
|||
else if ([languageCode isEqualToString:@"ko"]){
|
||||
ret = kLanguageKorean;
|
||||
}
|
||||
else if ([languageCode isEqualToString:@"ja"]){
|
||||
ret = kLanguageJapanese;
|
||||
}
|
||||
else if ([languageCode isEqualToString:@"hu"]){
|
||||
ret = kLanguageHungarian;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,6 +177,14 @@ ccLanguageType CCApplication::getCurrentLanguage()
|
|||
currentLanguage = kLanguageKorean;
|
||||
break;
|
||||
|
||||
case S3E_DEVICE_LANGUAGE_JAPANESE:
|
||||
currentLanguage = kLanguageJapanese;
|
||||
break;
|
||||
|
||||
case S3E_DEVICE_LANGUAGE_HUNGARIAN:
|
||||
currentLanguage = kLanguageHungarian;
|
||||
break;
|
||||
|
||||
default:
|
||||
currentLanguage = kLanguageEnglish;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -139,6 +139,12 @@ ccLanguageType CCApplication::getCurrentLanguage()
|
|||
case LANG_KOREAN:
|
||||
ret = kLanguageKorean;
|
||||
break;
|
||||
case LANG_JAPANESE:
|
||||
ret = kLanguageJapanese;
|
||||
break;
|
||||
case LANG_HUNGARIAN:
|
||||
ret = kLanguageHungarian;
|
||||
break;
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -86,13 +86,12 @@
|
|||
<option id="gnu.cpp.link.option.soname.2012475291" name="Shared object name (-Wl,-soname=)" superClass="gnu.cpp.link.option.soname" value="" valueType="string"/>
|
||||
<option id="gnu.cpp.link.option.userobjs.1360463693" name="Other objects" superClass="gnu.cpp.link.option.userobjs" valueType="userObjs">
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libfreetype.a"/>
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libcurl.a"/>
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libtiff.a"/>
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libxml2.a"/>
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libpng.a"/>
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libjpeg.a"/>
|
||||
</option>
|
||||
<option id="gnu.cpp.link.option.paths.1027331890" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
|
||||
<option id="gnu.cpp.link.option.paths.1027331890" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
|
||||
</option>
|
||||
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.620370737" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
|
||||
|
|
@ -106,10 +105,11 @@
|
|||
</toolChain>
|
||||
</folderInfo>
|
||||
<sourceEntries>
|
||||
<entry excluding="shaders|kazmath|tilemap_parallax_nodes|actions|base_nodes|cocoa|effects|include|keypad_dispatcher|label_nodes|layers_scenes_transitions_nodes|menu_nodes|misc_nodes|particle_nodes|platform|script_support|sprite_nodes|support|text_input_node|textures|tileMap_parallax_nodes|touch_dispatcher" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
|
||||
<entry excluding="draw_nodes|shaders|kazmath|tilemap_parallax_nodes|actions|base_nodes|cocoa|effects|include|keypad_dispatcher|label_nodes|layers_scenes_transitions_nodes|menu_nodes|misc_nodes|particle_nodes|platform|script_support|sprite_nodes|support|text_input_node|textures|tileMap_parallax_nodes|touch_dispatcher" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="actions"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="base_nodes"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="cocoa"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="draw_nodes"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="effects"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="include"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="kazmath"/>
|
||||
|
|
@ -217,12 +217,11 @@
|
|||
<option id="gnu.cpp.link.option.soname.1066283521" name="Shared object name (-Wl,-soname=)" superClass="gnu.cpp.link.option.soname" value="" valueType="string"/>
|
||||
<option id="gnu.cpp.link.option.userobjs.394630625" name="Other objects" superClass="gnu.cpp.link.option.userobjs" valueType="userObjs">
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libfreetype.a"/>
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libcurl.a"/>
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libxml2.a"/>
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libpng.a"/>
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/libraries/libjpeg.a"/>
|
||||
</option>
|
||||
<option id="gnu.cpp.link.option.paths.1001119408" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
|
||||
<option id="gnu.cpp.link.option.paths.1001119408" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
|
||||
<listOptionValue builtIn="false" value="../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib"/>
|
||||
</option>
|
||||
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.319060310" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
|
||||
|
|
@ -236,10 +235,11 @@
|
|||
</toolChain>
|
||||
</folderInfo>
|
||||
<sourceEntries>
|
||||
<entry excluding="kazmath|tilemap_parallax_nodes|actions|base_nodes|cocoa|effects|include|keypad_dispatcher|label_nodes|layers_scenes_transitions_nodes|menu_nodes|misc_nodes|particle_nodes|platform|script_support|sprite_nodes|support|text_input_node|textures|tileMap_parallax_nodes|touch_dispatcher" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
|
||||
<entry excluding="draw_nodes|shaders|kazmath|tilemap_parallax_nodes|actions|base_nodes|cocoa|effects|include|keypad_dispatcher|label_nodes|layers_scenes_transitions_nodes|menu_nodes|misc_nodes|particle_nodes|platform|script_support|sprite_nodes|support|text_input_node|textures|tileMap_parallax_nodes|touch_dispatcher" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="actions"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="base_nodes"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="cocoa"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="draw_nodes"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="effects"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="include"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="kazmath"/>
|
||||
|
|
@ -251,6 +251,7 @@
|
|||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="particle_nodes"/>
|
||||
<entry excluding="android/|bada/|ios/|Linux/CCFileUtils_Linux.cpp|Linux/CCImage_Linux.cpp|marmalade/|qnx/|third_party/|win32/|wophone/" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="platform"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="script_support"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="shaders"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="sprite_nodes"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="support"/>
|
||||
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="text_input_node"/>
|
||||
|
|
|
|||
|
|
@ -101,11 +101,6 @@
|
|||
<type>1</type>
|
||||
<locationURI>PARENT-1-PROJECT_LOC/CCDirector.cpp</locationURI>
|
||||
</link>
|
||||
<link>
|
||||
<name>CCDrawingPrimitives.cpp</name>
|
||||
<type>1</type>
|
||||
<locationURI>PARENT-1-PROJECT_LOC/CCDrawingPrimitives.cpp</locationURI>
|
||||
</link>
|
||||
<link>
|
||||
<name>CCScheduler.cpp</name>
|
||||
<type>1</type>
|
||||
|
|
@ -131,6 +126,11 @@
|
|||
<type>1</type>
|
||||
<locationURI>PARENT-1-PROJECT_LOC/cocos2d.cpp</locationURI>
|
||||
</link>
|
||||
<link>
|
||||
<name>draw_nodes</name>
|
||||
<type>2</type>
|
||||
<locationURI>PARENT-1-PROJECT_LOC/draw_nodes</locationURI>
|
||||
</link>
|
||||
<link>
|
||||
<name>effects</name>
|
||||
<type>2</type>
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ SHAREDLIBS += -L../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/
|
|||
|
||||
debug: CCFLAGS += -g3 -O0
|
||||
debug: CXXFLAGS += -g3 -O0
|
||||
debug: DEFINES += -DDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION
|
||||
debug: DEFINES += -DDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION -DCOCOS2D_DEBUG=1
|
||||
debug: $(TARGET)
|
||||
|
||||
release: CCFLAGS += -O3
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
*/
|
||||
|
||||
" \n\
|
||||
#extension GL_OES_standard_derivatives : enable \n\
|
||||
\n\
|
||||
#ifdef GL_ES \n\
|
||||
// #extension GL_OES_standard_derivatives : enable \n\
|
||||
\n\
|
||||
varying mediump vec4 v_color; \n\
|
||||
varying mediump vec2 v_texcoord; \n\
|
||||
#else \n\
|
||||
|
|
@ -32,10 +32,10 @@ varying vec2 v_texcoord; \n\
|
|||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
#if defined GL_OES_standard_derivatives \n\
|
||||
gl_FragColor = v_color*smoothstep(0.0, length(fwidth(v_texcoord)), 1.0 - length(v_texcoord)); \n\
|
||||
#else \n\
|
||||
// #if defined GL_OES_standard_derivatives \n\
|
||||
// gl_FragColor = v_color*smoothstep(0.0, length(fwidth(v_texcoord)), 1.0 - length(v_texcoord)); \n\
|
||||
// #else \n\
|
||||
gl_FragColor = v_color*step(0.0, 1.0 - length(v_texcoord)); \n\
|
||||
#endif \n\
|
||||
// #endif \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ PROJECT_NAME = cocos2d-x
|
|||
# This could be handy for archiving the generated documentation or
|
||||
# if some version control system is used.
|
||||
|
||||
PROJECT_NUMBER = 2.0.3
|
||||
PROJECT_NUMBER = 2.1.0
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewer
|
||||
|
|
@ -676,12 +676,11 @@ WARN_LOGFILE =
|
|||
# with spaces.
|
||||
|
||||
INPUT = ../cocos2dx \
|
||||
../cocos2dx/platform \
|
||||
../CocosDenshion/include \
|
||||
../cocos2dx/platform \
|
||||
../CocosDenshion/include \
|
||||
../document \
|
||||
../extensions \
|
||||
../scripting/lua/cocos2dx_support \
|
||||
|
||||
../scripting/lua/cocos2dx_support
|
||||
|
||||
# This tag can be used to specify the character encoding of the source files
|
||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
|
||||
|
|
|
|||
|
|
@ -134,9 +134,9 @@ CCBReader::~CCBReader() {
|
|||
|
||||
this->mCCNodeLoaderLibrary->release();
|
||||
|
||||
mOwnerOutletNodes->release();
|
||||
mOwnerOutletNames.clear();
|
||||
mOwnerCallbackNodes->release();
|
||||
mOwnerOutletNodes->release();
|
||||
mOwnerOutletNames.clear();
|
||||
mOwnerCallbackNodes->release();
|
||||
mOwnerCallbackNames.clear();
|
||||
|
||||
// Clear string cache.
|
||||
|
|
@ -292,13 +292,13 @@ CCNode* CCBReader::readNodeGraphFromData(CCData *pData, CCObject *pOwner, const
|
|||
CCDICT_FOREACH(animationManagers, pElement)
|
||||
{
|
||||
CCNode* pNode = (CCNode*)pElement->getIntKey();
|
||||
CCBAnimationManager* manager = (CCBAnimationManager*)animationManagers->objectForKey((intptr_t)pNode);
|
||||
pNode->setUserObject(manager);
|
||||
|
||||
if (jsControlled)
|
||||
{
|
||||
mNodesWithAnimationManagers->addObject(pNode);
|
||||
mAnimationManagersForNodes->addObject(manager);
|
||||
CCBAnimationManager* manager = (CCBAnimationManager*)animationManagers->objectForKey((intptr_t)pNode);
|
||||
pNode->setUserObject(manager);
|
||||
|
||||
if (jsControlled)
|
||||
{
|
||||
mNodesWithAnimationManagers->addObject(pNode);
|
||||
mAnimationManagersForNodes->addObject(manager);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -414,24 +414,24 @@ bool CCBReader::readBool() {
|
|||
return 0 == this->readByte() ? false : true;
|
||||
}
|
||||
|
||||
std::string CCBReader::readUTF8()
|
||||
{
|
||||
std::string ret;
|
||||
|
||||
int b0 = this->readByte();
|
||||
int b1 = this->readByte();
|
||||
|
||||
int numBytes = b0 << 8 | b1;
|
||||
|
||||
char* pStr = (char*)malloc(numBytes+1);
|
||||
memcpy(pStr, mBytes+mCurrentByte, numBytes);
|
||||
pStr[numBytes] = '\0';
|
||||
ret = pStr;
|
||||
free(pStr);
|
||||
|
||||
mCurrentByte += numBytes;
|
||||
|
||||
return ret;
|
||||
std::string CCBReader::readUTF8()
|
||||
{
|
||||
std::string ret;
|
||||
|
||||
int b0 = this->readByte();
|
||||
int b1 = this->readByte();
|
||||
|
||||
int numBytes = b0 << 8 | b1;
|
||||
|
||||
char* pStr = (char*)malloc(numBytes+1);
|
||||
memcpy(pStr, mBytes+mCurrentByte, numBytes);
|
||||
pStr[numBytes] = '\0';
|
||||
ret = pStr;
|
||||
free(pStr);
|
||||
|
||||
mCurrentByte += numBytes;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool CCBReader::getBit() {
|
||||
|
|
@ -908,15 +908,7 @@ CCArray* CCBReader::getAnimationManagersForNodes() {
|
|||
|
||||
float CCBReader::getResolutionScale()
|
||||
{
|
||||
// Init resolution scale
|
||||
if (CCApplication::sharedApplication()->getTargetPlatform() == kTargetIpad)
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
NS_CC_EXT_END;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
//#include <stdint.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include "TargetConditionals.h"
|
||||
|
|
|
|||
|
|
@ -25,18 +25,32 @@ bool AppDelegate::applicationDidFinishLaunching()
|
|||
// initialize director
|
||||
CCDirector *pDirector = CCDirector::sharedDirector();
|
||||
pDirector->setOpenGLView(CCEGLView::sharedOpenGLView());
|
||||
pDirector->setProjection(kCCDirectorProjection2D);
|
||||
|
||||
|
||||
CCSize screenSize = CCEGLView::sharedOpenGLView()->getFrameSize();
|
||||
|
||||
CCSize designSize = CCSizeMake(320, 480);
|
||||
CCSize resourceSize = CCSizeMake(320, 480);
|
||||
|
||||
// if (screenSize.height > 320)
|
||||
// {
|
||||
// CCSize resourceSize = CCSizeMake(640, 960);
|
||||
// CCFileUtils::sharedFileUtils()->setResourceDirectory("hd");
|
||||
// pDirector->setContentScaleFactor(resourceSize.height/designSize.height);
|
||||
// }
|
||||
if (screenSize.height > 768)
|
||||
{
|
||||
resourceSize = CCSizeMake(1536, 2048);
|
||||
CCFileUtils::sharedFileUtils()->setResourceDirectory("resources-ipadhd");
|
||||
}
|
||||
else if (screenSize.height > 640)
|
||||
{
|
||||
resourceSize = CCSizeMake(768, 1536);
|
||||
CCFileUtils::sharedFileUtils()->setResourceDirectory("resources-ipad");
|
||||
}
|
||||
else if (screenSize.height > 320)
|
||||
{
|
||||
resourceSize = CCSizeMake(640, 960);
|
||||
CCFileUtils::sharedFileUtils()->setResourceDirectory("resources-iphonehd");
|
||||
|
||||
}
|
||||
|
||||
pDirector->setContentScaleFactor(resourceSize.height/designSize.height);
|
||||
|
||||
CCEGLView::sharedOpenGLView()->setDesignResolutionSize(designSize.width, designSize.height, kResolutionNoBorder);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
c445ba0cb7d4f6fdba3cce049e727fc39bd9b44e
|
||||
|
|
@ -0,0 +1,107 @@
|
|||
# Settings ICF file automatically generated by S3E development environment
|
||||
|
||||
AccelEnabled = Type=bool, Default="true", Value = "true"
|
||||
AudioAAC = Type=bool, Default="false", Value = "false"
|
||||
AudioAACPlus = Type=bool, Default="false", Value = "false"
|
||||
AudioMIDI = Type=bool, Default="true", Value = "true"
|
||||
AudioMP3 = Type=bool, Default="true", Value = "true"
|
||||
AudioPCM = Type=bool, Default="true", Value = "true"
|
||||
AudioQCP = Type=bool, Default="false", Value = "false"
|
||||
AudioVolumeDefault = Type=int, Min=0.000000, Max=256.000000, Default="256", Value = "256"
|
||||
BacklightTimeout = Type=int, Min=0.000000, Max=120000.000000, Default="10000", Value = "10000"
|
||||
CompassEnabled = Type=bool, Default="true", Value = "true"
|
||||
ContactsFromAddrBook = Type=bool, Default="false", Value = "false"
|
||||
DeviceAdvanceSoftkeyPosition = Type=string, Allowed="Bottom Left" "Bottom Right" "Top Right" "Top Left", Default="Bottom Left", Value = "Bottom Left"
|
||||
DeviceArch = Type=string, Allowed="<Use Native Architecture>" "ARM4T" "ARM4" "ARM5T" "ARM5TE" "ARM5TEJ" "ARM6" "ARM6K" "ARM6T2" "ARM6Z" "X86" "PPC" "AMD64" "ARM7", Default="<Use Native Architecture>", Value = "<Use Native Architecture>"
|
||||
DeviceBackSoftkeyPosition = Type=string, Allowed="Bottom Left" "Bottom Right" "Top Right" "Top Left", Default="Bottom Right", Value = "Bottom Right"
|
||||
DeviceBatteryLevel = Type=int, Min=0.000000, Max=100.000000, Default="50", Value = "50"
|
||||
DeviceClass = Type=string, Allowed="UNKNOWN" "SYMBIAN_GENERIC" "SYMBIAN_SERIES60" "SYMBIAN_SERIES60_EMULATOR" "SYMBIAN_UIQ" "SYMBIAN_UIQ_EMULATOR" "BREW_GENERIC" "BREW_QCIF_3D" "BREW_QCIF_25G" "BREW_SQCIF_256" "BREW_QVGA_3G" "WINDOWS_GENERIC" "WINMOBILE_GENERIC" "WINMOBILE_SP" "WINMOBILE_PPC" "LINUX_GENERIC" "LINUX_DESKTOP" "LINUX_EMBED" "WIPI_GENERIC" "NDS_GENERIC" "ARM_SEMIH_GENERIC" "NULCUES_GENERIC" "NGI_GENERIC", Default="WINDOWS_GENERIC", Value = "WINDOWS_GENERIC"
|
||||
DeviceFPU = Type=string, Allowed="None" "VFP Present", Default="VFP Present", Value = "VFP Present"
|
||||
DeviceFreeRAM = Type=int, Min=0.000000, Max=2097151.000000, Default="1048576", Value = "1048576"
|
||||
DeviceIDInt = Type=int, Default="0", Value = "0"
|
||||
DeviceIDString = Type=string, Default="", Value = ""
|
||||
DeviceIMSI = Type=string, Default="SIMULATOR_IMSI", Value = "SIMULATOR_IMSI"
|
||||
DeviceLSKIsBack = Type=bool, Default="false", Value = "false"
|
||||
DeviceLanguage = Type=string, Allowed="UNKNOWN" "ENGLISH" "FRENCH" "GERMAN" "SPANISH" "ITALIAN" "PORTUGUESE" "DUTCH" "TURKISH" "CROATIAN" "CZECH" "DANISH" "FINNISH" "HUNGARIAN" "NORWEGIAN" "POLISH" "RUSSIAN" "SERBIAN" "SLOVAK" "SLOVENIAN" "SWEDISH" "UKRAINIAN" "GREEK" "JAPANESE" "SIMPL_CHINESE" "TRAD_CHINESE" "KOREAN" "ICELANDIC" "FLEMISH" "THAI" "AFRIKAANS" "ALBANIAN" "AMHARIC" "ARABIC" "ARMENIAN" "AZERBAIJANI" "TAGALOG" "BELARUSSIAN" "BENGALI" "BULGARIAN" "BURMESE" "CATALAN" "ESTONIAN" "FARSI" "GAELIC" "GEORGIAN" "GUJARATI" "HEBREW" "HINDI" "INDONESIAN" "IRISH" "KANNADA" "KAZAKH" "KHMER" "LAO" "LATVIAN" "LITHUANIAN" "MACEDONIAN" "MALAY" "MALAYALAM" "MARATHI" "MOLDOVIAN" "MONGOLIAN" "PUNJABI" "ROMANIAN" "SINHALESE" "SOMALI" "SWAHILI" "TAJIK" "TAMIL" "TELUGU" "TIBETAN" "TIGRINYA" "TURKMEN" "URDU" "UZBEK" "VIETNAMESE" "WELSH" "ZULU" "<Use Native Language>", Default="<Use Native Language>", Value = "<Use Native Language>"
|
||||
DeviceMainsPower = Type=bool, Default="false", Value = "false"
|
||||
DeviceName = Type=string, Default="My Computer", Value = "My Computer"
|
||||
DeviceOS = Type=string, Allowed="NONE" "SYMBIAN" "BREW" "WINDOWS" "WINMOBILE" "LINUX" "WIPI" "NDS" "ARM_SEMIH" "NUCLEUS" "NGI" "WINCE" "SHARPEMP" "OSX" "IPHONE" "UIQ" "PS3" "X360" "BADA" "ANDROID" "WEBOS" "QNX", Default="NONE", Value = "NONE"
|
||||
DeviceOSVersion = Type=string, Default="", Value = ""
|
||||
DeviceOSVersionNumber = Type=int, Default="0", Value = "0"
|
||||
DevicePhoneNumber = Type=string, Default="0044123456789", Value = "0044123456789"
|
||||
DeviceTimezone = Type=string, Default="SYSTEM", Value = "SYSTEM"
|
||||
DeviceTotalRAM = Type=int, Min=0.000000, Max=2097151.000000, Default="1048576", Value = "1048576"
|
||||
DeviceUniqueID = Type=string, Default="SIMULATOR_ID", Value = "SIMULATOR_ID"
|
||||
DeviceUniqueIDInt = Type=int, Default="01234567890", Value = "01234567890"
|
||||
FileTotalStorageSize = Type=int, Min=0.000000, Max=2147483648.000000, Default="67108864", Value = "67108864"
|
||||
FileUseSeparateRomRam = Type=bool, Default="true", Value = "true"
|
||||
FileUseTotalStorageSize = Type=bool, Default="false", Value = "false"
|
||||
GLAPI = Type=string, Allowed="None" "GLES 1.0 Common-Lite Profile from Imagination POWERVR(TM)" "GLES 1.1 Common-Lite Profile from Imagination POWERVR(TM)" "GLES 1.0 Common Profile from Imagination POWERVR(TM)" "GLES 1.1 Common Profile from Imagination POWERVR(TM)" "GLES 2.0 from Imagination POWERVR(TM)" "Obey [S3E] SysGlesVersion .icf setting" "GLES 1.1 Common Profile from Qualcomm Snapdragon(TM)" "GLES 2.0 from Qualcomm Snapdragon(TM)" "GLES 2.0 ANGLE", Default="Obey [S3E] SysGlesVersion .icf setting", Value = "Obey [S3E] SysGlesVersion .icf setting"
|
||||
GLDontUseHiddenWindow = Type=bool, Default="false", Value = "false"
|
||||
GLTerminateOnSuspend = Type=bool, Default="false", Value = "false"
|
||||
GLUsePVRVFrame = Type=bool, Default="false", Value = "false"
|
||||
KeyboardHasAlpha = Type=bool, Default="true", Value = "true"
|
||||
KeyboardHasDirection = Type=bool, Default="true", Value = "true"
|
||||
KeyboardHasKeypad = Type=bool, Default="true", Value = "true"
|
||||
KeyboardNumpadRotation = Type=string, Allowed="Rot0" "Rot90" "Rot180" "Rot270", Default="Rot0", Value = "Rot0"
|
||||
LicenseExpiryDate = Type=int, Min=0.000000, Max=999999995904.000000, Default="0", Value = "0"
|
||||
LicenseMinutesRemaining = Type=int, Min=0.000000, Max=10000000.000000, Default="0", Value = "0"
|
||||
LicenseStatus = Type=string, Allowed="EXPIRED" "DEMO" "USECOUNT" "EXPIRYDATE" "EXPIRYMINSUSE" "PURCHASE" "SUBSCRIPTION" "UPGRADE" "NONCOMMERCIAL", Default="NONCOMMERCIAL", Value = "NONCOMMERCIAL"
|
||||
LicenseUsesRemaining = Type=int, Min=0.000000, Max=10000000.000000, Default="0", Value = "0"
|
||||
LocationAltitude = Type=float, Min=-2000.000000, Max=100000.000000, Default="60.0", Value = "60.0"
|
||||
LocationAvailable = Type=bool, Default="true", Value = "true"
|
||||
LocationHeading = Type=float, Min=0.000000, Max=359.000000, Default="0.0", Value = "0.0"
|
||||
LocationHorizontalAccuracy = Type=float, Min=0.000000, Max=100000.000000, Default="20.0", Value = "20.0"
|
||||
LocationLatitude = Type=float, Min=-90.000000, Max=90.000000, Default="51.511791", Value = "51.511791"
|
||||
LocationLongitude = Type=float, Min=-180.000000, Max=180.000000, Default="-0.191084", Value = "-0.191084"
|
||||
LocationSpeed = Type=float, Min=0.000000, Max=10000.000000, Default="0", Value = "0"
|
||||
LocationVerticalAccuracy = Type=float, Min=0.000000, Max=100000.000000, Default="100.0", Value = "100.0"
|
||||
MacOSSimulatorCustomSettings = Type=string, Default="", Value = ""
|
||||
MacOSSimulatorDevices_ANDROID = Type=string, Allowed="Samsung Galaxy S:480x800:512" "HTC Sensation XL:480x800:768" "Samsung Galaxy Note:800x1280:1024" "Motorola Droid Razr:540x960:1024" "Kindle Fire:1024x600:512" "Samsung Galaxy Tab:1024x600:512", Default="Samsung Galaxy S:480x800:512", Value = "Samsung Galaxy S:480x800:512"
|
||||
MacOSSimulatorDevices_IPHONE = Type=string, Allowed="iPhone 3GS:320x480:256" "iPhone 4:640x960:512" "iPad 2:768x1024:512", Default="iPhone 3GS:320x480:256", Value = "iPhone 3GS:320x480:256"
|
||||
MacOSSimulatorPlatforms = Type=string, Allowed="IPHONE" "ANDROID", Default="IPHONE", Value = "IPHONE"
|
||||
MacOSSimulatorUseCustomSettings = Type=bool, Default="true", Value = "true"
|
||||
MemoryPoison = Type=bool, Default="true", Value = "true"
|
||||
MemoryPoisonAlloc = Type=int, Min=0.000000, Max=255.000000, Default="170", Value = "170"
|
||||
MemoryPoisonFree = Type=int, Min=0.000000, Max=255.000000, Default="221", Value = "221"
|
||||
MemoryPoisonInit = Type=int, Min=0.000000, Max=255.000000, Default="204", Value = "204"
|
||||
PointerAvailable = Type=bool, Default="true", Value = "true"
|
||||
PointerMultiSimulationMode = Type=bool, Default="false", Value = "false"
|
||||
PointerMultiTouchAvailable = Type=bool, Default="false", Value = "false"
|
||||
PointerStylusType = Type=string, Allowed="INVALID" "STYLUS" "FINGER", Default="INVALID", Value = "INVALID"
|
||||
PointerType = Type=string, Allowed="INVALID" "MOUSE" "STYLUS", Default="MOUSE", Value = "MOUSE"
|
||||
SMSEnabled = Type=bool, Default="true", Value = "true"
|
||||
SMSReceiveEnabled = Type=bool, Default="true", Value = "true"
|
||||
SocketDNSDelay = Type=int, Min=0.000000, Max=30000.000000, Default="0", Value = "0"
|
||||
SocketHTTPProxy = Type=string, Default="", Value = ""
|
||||
SocketHostName = Type=string, Default="", Value = ""
|
||||
SocketNetworkAvailable = Type=bool, Default="true", Value = "true"
|
||||
SocketNetworkLoss = Type=bool, Default="false", Value = "false"
|
||||
SocketNetworkType = Type=string, Allowed="NONE" "UNKNOWN" "LAN" "WLAN" "GPRS" "UMTS" "EVDO" "CDMA2000" "HSDPA" "WIMAX" "BLUETOOTH" "EDGE" "CDMA" "IDEN" "LTE" "EHRPD" "HSPAPLUS", Default="LAN", Value = "LAN"
|
||||
SocketRecvLimit = Type=int, Min=0.000000, Max=1000000.000000, Default="0", Value = "0"
|
||||
SocketSendLimit = Type=int, Min=0.000000, Max=1000000.000000, Default="0", Value = "0"
|
||||
SoundEnabled = Type=bool, Default="true", Value = "true"
|
||||
SoundRecordEnabled = Type=bool, Default="true", Value = "true"
|
||||
SoundSampleRate = Type=int, Allowed="8192" "11025" "16000" "22050" "44100", Default="22050", Value = "22050"
|
||||
SoundStereo = Type=bool, Default="true", Value = "true"
|
||||
SoundVolumeDefault = Type=int, Min=0.000000, Max=256.000000, Default="256", Value = "256"
|
||||
SurfaceDisableWhenGLIsActive = Type=bool, Default="false", Value = "false"
|
||||
SurfaceDoubleBuffer = Type=bool, Default="false", Value = "false"
|
||||
SurfaceHeight = Type=int, Min=128.000000, Max=4096.000000, Default="480", Value = "320"
|
||||
SurfacePitch = Type=int, Min=0.000000, Max=8192.000000, Default="0", Value = "0"
|
||||
SurfacePixelType = Type=string, Allowed="RGB444" "RGB555" "RGB565" "RGB666" "RGB888" "BGR444" "BGR555" "BGR565" "BGR666" "BGR888", Default="RGB565", Value = "RGB565"
|
||||
SurfacePredefinedResolution = Type=string, Allowed="176x200" "176x208" "240x320 (QVGA Portrait)" "240x400" "320x240 (QVGA Landscape)" "320x400" "320x480 (iPhone Portrait)" "400x240" "480x320 (iPhone Landscape)" "360x640 (qHD Portrait)" "640x360 (qHD Landscape)" "480x640 (VGA Portrait)" "480x800 (WVGA Portrait)" "640x480 (VGA Landscape)" "800x400" "800x480 (WVGA Landscape)" "640x960 (iPhone 4 Portrait)" "960x640 (iPhone 4 Landscape)" "1024x600 (Playbook Landscape)" "600x1024 (Playbook Portrait)" "768x1024 (iPad Portrait)" "1024x768 (iPad Landscape)" "2048x1536 (iPad Retina Landscape)" "1536x2048 (iPad Retina Portrait)", Default="320x480 (iPhone Portrait)", Value = "176x200"
|
||||
SurfaceRotation = Type=string, Allowed="Rot0" "Rot90" "Rot180" "Rot270", Default="Rot0", Value = "Rot0"
|
||||
SurfaceUnalign = Type=bool, Default="true", Value = "true"
|
||||
SurfaceUseMultiBuffers = Type=bool, Default="true", Value = "true"
|
||||
SurfaceWidth = Type=int, Min=128.000000, Max=4096.000000, Default="320", Value = "480"
|
||||
SymbianSoundLatency = Type=int, Min=20.000000, Max=1400.000000, Default="120", Value = "120"
|
||||
ThreadEnabled = Type=bool, Default="true", Value = "true"
|
||||
TimerAccuracy = Type=int, Min=0.000000, Max=1000.000000, Default="0", Value = "0"
|
||||
TimerHiRes = Type=bool, Default="false", Value = "false"
|
||||
TimerLocaltimeOffsetHours = Type=string, Allowed="-12" "-11" "-10" "-9" "-8" "-7" "-6" "-5" "-4" "-3" "-2" "-1" "0" "+1" "+2" "+3" "+4" "+5" "+6" "+7" "+8" "+9" "+10" "+11" "+12" "+13" "SYSTEM", Default="SYSTEM", Value = "SYSTEM"
|
||||
VibraEnabled = Type=bool, Default="true", Value = "true"
|
||||
Video3GPP = Type=bool, Default="false", Value = "false"
|
||||
VideoJPEG = Type=bool, Default="true", Value = "true"
|
||||
VideoMPEG4 = Type=bool, Default="true", Value = "true"
|
||||
VideoVolumeDefault = Type=int, Min=0.000000, Max=256.000000, Default="256", Value = "256"
|
||||
|
|
@ -67,7 +67,7 @@ debug: CCFLAGS += -g3 -O0
|
|||
debug: CXXFLAGS += -g3 -O0
|
||||
debug: SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion
|
||||
debug: SHAREDLIBS += -Wl,-rpath,../../../../../lib/linux/Debug/
|
||||
debug: DEFINES += -DDEBUG
|
||||
debug: DEFINES += -DDEBUG -DCOCOS2D_DEBUG=1
|
||||
debug: $(TARGET)
|
||||
|
||||
release: BIN_DIR = $(BIN_DIR_ROOT)/release
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ bool AppDelegate::applicationDidFinishLaunching()
|
|||
// initialize director
|
||||
CCDirector *pDirector = CCDirector::sharedDirector();
|
||||
pDirector->setOpenGLView(CCEGLView::sharedOpenGLView());
|
||||
pDirector->setProjection(kCCDirectorProjection2D);
|
||||
|
||||
// Set the design resolution
|
||||
CCEGLView::sharedOpenGLView()->setDesignResolutionSize(320, 480, kResolutionShowAll);
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ cp -rf "$RESROUCE_ROOT" "$APP_ANDROID_ROOT"/assets
|
|||
# copy MoonWarriors js
|
||||
cp -rf "$RESROUCE_ROOT"/../src "$APP_ANDROID_ROOT"/assets
|
||||
# copy MoonWarriors-native.js
|
||||
cp "$RESROUCE_ROOT"/../MoonWarriors-native.js "$APP_ANDROID_ROOT"/assets
|
||||
cp "$RESROUCE_ROOT"/../*.js "$APP_ANDROID_ROOT"/assets
|
||||
|
||||
# copy bindings/*.js into assets' root
|
||||
cp -f "$BINDINGS_JS_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
|
||||
|
|
|
|||
|
|
@ -120,15 +120,10 @@
|
|||
156752F7163E7FC30002AD61 /* libjs_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156752F6163E7FC30002AD61 /* libjs_static.a */; };
|
||||
156752F9163E82D40002AD61 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 156752F8163E82D40002AD61 /* libz.dylib */; };
|
||||
15675300163E870E0002AD61 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 156752FF163E870E0002AD61 /* libxml2.dylib */; };
|
||||
157EFB7E1667237500BF1E11 /* main.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB791667237500BF1E11 /* main.js */; };
|
||||
157EFB801667237500BF1E11 /* MoonWarriors-native.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB7B1667237500BF1E11 /* MoonWarriors-native.js */; };
|
||||
157EFB811667237500BF1E11 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 157EFB7C1667237500BF1E11 /* res */; };
|
||||
157EFB821667237500BF1E11 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 157EFB7D1667237500BF1E11 /* src */; };
|
||||
157EFB89166723A800BF1E11 /* jsb_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB84166723A800BF1E11 /* jsb_constants.js */; };
|
||||
157EFB8A166723A800BF1E11 /* jsb_constants_chipmunk.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB85166723A800BF1E11 /* jsb_constants_chipmunk.js */; };
|
||||
157EFB8B166723A800BF1E11 /* jsb_constants_cocos2d.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB86166723A800BF1E11 /* jsb_constants_cocos2d.js */; };
|
||||
157EFB8C166723A800BF1E11 /* jsb_constants_cocosbuilder.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB87166723A800BF1E11 /* jsb_constants_cocosbuilder.js */; };
|
||||
157EFB8D166723A800BF1E11 /* jsb_constants_gl.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB88166723A800BF1E11 /* jsb_constants_gl.js */; };
|
||||
1590031F166DABBD006BF838 /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 157EFB791667237500BF1E11 /* main.js */; };
|
||||
15900320166DABBD006BF838 /* MoonWarriors-jsb.js in Resources */ = {isa = PBXBuildFile; fileRef = 1590031D166DAB95006BF838 /* MoonWarriors-jsb.js */; };
|
||||
15E35BC516688F9900ED83DB /* cocosjs_manual_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15E35BC116688F9900ED83DB /* cocosjs_manual_conversions.cpp */; };
|
||||
15E35BC616688F9900ED83DB /* js_bindings_ccbreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15E35BC316688F9900ED83DB /* js_bindings_ccbreader.cpp */; };
|
||||
15E35BD616688FA900ED83DB /* js_bindings_chipmunk_auto_classes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15E35BC816688FA900ED83DB /* js_bindings_chipmunk_auto_classes.cpp */; };
|
||||
|
|
@ -139,7 +134,6 @@
|
|||
15E35BDB16688FA900ED83DB /* js_manual_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15E35BD416688FA900ED83DB /* js_manual_conversions.cpp */; };
|
||||
15E35BE116688FD800ED83DB /* CCPhysicsDebugNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15E35BDD16688FD800ED83DB /* CCPhysicsDebugNode.cpp */; };
|
||||
15E35BE216688FD800ED83DB /* CCPhysicsSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15E35BDF16688FD800ED83DB /* CCPhysicsSprite.cpp */; };
|
||||
15E35BE31668908C00ED83DB /* MoonWarriors-native.js in Resources */ = {isa = PBXBuildFile; fileRef = 157EFB7B1667237500BF1E11 /* MoonWarriors-native.js */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
|
|
@ -365,7 +359,6 @@
|
|||
156752F8163E82D40002AD61 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
|
||||
156752FF163E870E0002AD61 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
|
||||
157EFB791667237500BF1E11 /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.js; path = "../../TestJavascript/cocos2d-js-tests/games/MoonWarriors/main.js"; sourceTree = "<group>"; };
|
||||
157EFB7B1667237500BF1E11 /* MoonWarriors-native.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = "MoonWarriors-native.js"; path = "../../TestJavascript/cocos2d-js-tests/games/MoonWarriors/MoonWarriors-native.js"; sourceTree = "<group>"; };
|
||||
157EFB7C1667237500BF1E11 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = "../../TestJavascript/cocos2d-js-tests/games/MoonWarriors/res"; sourceTree = "<group>"; };
|
||||
157EFB7D1667237500BF1E11 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = "../../TestJavascript/cocos2d-js-tests/games/MoonWarriors/src"; sourceTree = "<group>"; };
|
||||
157EFB84166723A800BF1E11 /* jsb_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants.js; sourceTree = "<group>"; };
|
||||
|
|
@ -373,6 +366,7 @@
|
|||
157EFB86166723A800BF1E11 /* jsb_constants_cocos2d.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_cocos2d.js; sourceTree = "<group>"; };
|
||||
157EFB87166723A800BF1E11 /* jsb_constants_cocosbuilder.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_cocosbuilder.js; sourceTree = "<group>"; };
|
||||
157EFB88166723A800BF1E11 /* jsb_constants_gl.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_gl.js; sourceTree = "<group>"; };
|
||||
1590031D166DAB95006BF838 /* MoonWarriors-jsb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = "MoonWarriors-jsb.js"; path = "../../TestJavascript/cocos2d-js-tests/games/MoonWarriors/MoonWarriors-jsb.js"; sourceTree = "<group>"; };
|
||||
15E35BC116688F9900ED83DB /* cocosjs_manual_conversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cocosjs_manual_conversions.cpp; sourceTree = "<group>"; };
|
||||
15E35BC216688F9900ED83DB /* cocosjs_manual_conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocosjs_manual_conversions.h; sourceTree = "<group>"; };
|
||||
15E35BC316688F9900ED83DB /* js_bindings_ccbreader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_ccbreader.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -586,21 +580,21 @@
|
|||
15675123163E73F40002AD61 /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
157EFB83166723A800BF1E11 /* js */,
|
||||
157EFB791667237500BF1E11 /* main.js */,
|
||||
157EFB7B1667237500BF1E11 /* MoonWarriors-native.js */,
|
||||
157EFB7C1667237500BF1E11 /* res */,
|
||||
157EFB7D1667237500BF1E11 /* src */,
|
||||
156752BC163E7C350002AD61 /* Icon-144.png */,
|
||||
157EFB791667237500BF1E11 /* main.js */,
|
||||
1590031D166DAB95006BF838 /* MoonWarriors-jsb.js */,
|
||||
15675164163E741E0002AD61 /* Default-568h@2x.png */,
|
||||
15675165163E741E0002AD61 /* Default.png */,
|
||||
15675166163E741E0002AD61 /* Default@2x.png */,
|
||||
156752BC163E7C350002AD61 /* Icon-144.png */,
|
||||
15675167163E741E0002AD61 /* Icon-72.png */,
|
||||
15675168163E741E0002AD61 /* Icon-Small-50.png */,
|
||||
15675169163E741E0002AD61 /* Icon-Small.png */,
|
||||
1567516A163E741E0002AD61 /* Icon-Small@2x.png */,
|
||||
1567516B163E741E0002AD61 /* Icon.png */,
|
||||
1567516C163E741E0002AD61 /* Icon@2x.png */,
|
||||
157EFB83166723A800BF1E11 /* js */,
|
||||
);
|
||||
name = Resources;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -944,6 +938,8 @@
|
|||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1590031F166DABBD006BF838 /* main.js in Resources */,
|
||||
15900320166DABBD006BF838 /* MoonWarriors-jsb.js in Resources */,
|
||||
1567510E163E73B10002AD61 /* README in Resources */,
|
||||
1567516D163E741E0002AD61 /* Default-568h@2x.png in Resources */,
|
||||
1567516E163E741E0002AD61 /* Default.png in Resources */,
|
||||
|
|
@ -960,7 +956,6 @@
|
|||
151031791668915C00C0F72F /* jsb_constants_gl.js in Resources */,
|
||||
151031781668915B00C0F72F /* jsb_constants_cocosbuilder.js in Resources */,
|
||||
151031761668915900C0F72F /* jsb_constants_chipmunk.js in Resources */,
|
||||
15E35BE31668908C00ED83DB /* MoonWarriors-native.js in Resources */,
|
||||
156752BD163E7C350002AD61 /* Icon-144.png in Resources */,
|
||||
157EFB811667237500BF1E11 /* res in Resources */,
|
||||
157EFB821667237500BF1E11 /* src in Resources */,
|
||||
|
|
@ -1058,13 +1053,6 @@
|
|||
156752A5163E77A90002AD61 /* cpSweep1D.c in Sources */,
|
||||
156752A6163E77A90002AD61 /* cpVect.c in Sources */,
|
||||
156752A9163E78180002AD61 /* RootViewController.mm in Sources */,
|
||||
157EFB7E1667237500BF1E11 /* main.js in Sources */,
|
||||
157EFB801667237500BF1E11 /* MoonWarriors-native.js in Sources */,
|
||||
157EFB89166723A800BF1E11 /* jsb_constants.js in Sources */,
|
||||
157EFB8A166723A800BF1E11 /* jsb_constants_chipmunk.js in Sources */,
|
||||
157EFB8B166723A800BF1E11 /* jsb_constants_cocos2d.js in Sources */,
|
||||
157EFB8C166723A800BF1E11 /* jsb_constants_cocosbuilder.js in Sources */,
|
||||
157EFB8D166723A800BF1E11 /* jsb_constants_gl.js in Sources */,
|
||||
15E35BC516688F9900ED83DB /* cocosjs_manual_conversions.cpp in Sources */,
|
||||
15E35BC616688F9900ED83DB /* js_bindings_ccbreader.cpp in Sources */,
|
||||
15E35BD616688FA900ED83DB /* js_bindings_chipmunk_auto_classes.cpp in Sources */,
|
||||
|
|
|
|||
|
|
@ -33,9 +33,15 @@ CurrentLanguageTest::CurrentLanguageTest()
|
|||
case kLanguageSpanish:
|
||||
labelLanguage->setString("current language is Spanish");
|
||||
break;
|
||||
case kLanguageKorean:
|
||||
case kLanguageKorean:
|
||||
labelLanguage->setString("current language is Korean");
|
||||
break;
|
||||
case kLanguageJapanese:
|
||||
labelLanguage->setString("current language is Japanese");
|
||||
break;
|
||||
case kLanguageHungarian:
|
||||
labelLanguage->setString("current language is Hungarian");
|
||||
break;
|
||||
}
|
||||
|
||||
addChild(labelLanguage);
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@
|
|||
</option>
|
||||
<option id="gnu.cpp.compiler.option.preprocessor.def.331369055" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
|
||||
<listOptionValue builtIn="false" value="LINUX"/>
|
||||
<listOptionValue builtIn="false" value="CC_ENABLE_CHIPMUNK_INTEGRATION=1"/>
|
||||
</option>
|
||||
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2029444877" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
|
||||
</tool>
|
||||
|
|
@ -66,6 +67,7 @@
|
|||
<listOptionValue builtIn="false" value="rt"/>
|
||||
<listOptionValue builtIn="false" value="z"/>
|
||||
<listOptionValue builtIn="false" value="cocosdenshion"/>
|
||||
<listOptionValue builtIn="false" value="curl"/>
|
||||
</option>
|
||||
<option id="gnu.cpp.link.option.paths.335055881" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
|
||||
<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.linux/${ConfigName}"/>
|
||||
|
|
@ -145,6 +147,7 @@
|
|||
</option>
|
||||
<option id="gnu.cpp.compiler.option.preprocessor.def.2022262883" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
|
||||
<listOptionValue builtIn="false" value="LINUX"/>
|
||||
<listOptionValue builtIn="false" value="CC_ENABLE_CHIPMUNK_INTEGRATION=1"/>
|
||||
</option>
|
||||
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1960450905" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
|
||||
</tool>
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ BIN_DIR = BIN_DIR_ROOT
|
|||
debug: SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug
|
||||
debug: CCFLAGS += -g3 -O0
|
||||
debug: CXXFLAGS += -g3 -O0
|
||||
debug: DEFINES += -DDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION
|
||||
debug: DEFINES += -DDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION -DCOCOS2D_DEBUG=1
|
||||
debug: BIN_DIR = $(BIN_DIR_ROOT)/debug
|
||||
debug: $(TARGET)
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit d8a9715050f52e04aadc5e8410eeeacede4a3451
|
||||
Subproject commit 2e932705a10756255a226e5faa18891a8ec9d0d0
|
||||
|
|
@ -61,13 +61,6 @@
|
|||
F293BC2115EB838A00256477 /* lvm.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBE915EB838A00256477 /* lvm.c */; };
|
||||
F293BC2215EB838A00256477 /* lzio.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBEB15EB838A00256477 /* lzio.c */; };
|
||||
F293BC2315EB838A00256477 /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBED15EB838A00256477 /* print.c */; };
|
||||
F293BC2415EB838A00256477 /* Android.mk in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF015EB838A00256477 /* Android.mk */; };
|
||||
F293BC2515EB838A00256477 /* .cproject in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF215EB838A00256477 /* .cproject */; };
|
||||
F293BC2615EB838A00256477 /* .project in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF315EB838A00256477 /* .project */; };
|
||||
F293BC2715EB838A00256477 /* liblua.vcproj in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF515EB838A00256477 /* liblua.vcproj */; };
|
||||
F293BC2815EB838A00256477 /* liblua.vcxproj in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF615EB838A00256477 /* liblua.vcxproj */; };
|
||||
F293BC2915EB838A00256477 /* liblua.vcxproj.filters in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF715EB838A00256477 /* liblua.vcxproj.filters */; };
|
||||
F293BC2A15EB838A00256477 /* liblua.vcxproj.user in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF815EB838A00256477 /* liblua.vcxproj.user */; };
|
||||
F293BC2B15EB838A00256477 /* tolua_event.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBFB15EB838A00256477 /* tolua_event.c */; };
|
||||
F293BC2C15EB838A00256477 /* tolua_is.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBFD15EB838A00256477 /* tolua_is.c */; };
|
||||
F293BC2D15EB838A00256477 /* tolua_map.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBFE15EB838A00256477 /* tolua_map.c */; };
|
||||
|
|
@ -215,13 +208,6 @@
|
|||
F293BBEB15EB838A00256477 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lzio.c; sourceTree = "<group>"; };
|
||||
F293BBEC15EB838A00256477 /* lzio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzio.h; sourceTree = "<group>"; };
|
||||
F293BBED15EB838A00256477 /* print.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = print.c; sourceTree = "<group>"; };
|
||||
F293BBF015EB838A00256477 /* Android.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Android.mk; sourceTree = "<group>"; };
|
||||
F293BBF215EB838A00256477 /* .cproject */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = .cproject; sourceTree = "<group>"; };
|
||||
F293BBF315EB838A00256477 /* .project */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = .project; sourceTree = "<group>"; };
|
||||
F293BBF515EB838A00256477 /* liblua.vcproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = liblua.vcproj; sourceTree = "<group>"; };
|
||||
F293BBF615EB838A00256477 /* liblua.vcxproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = liblua.vcxproj; sourceTree = "<group>"; };
|
||||
F293BBF715EB838A00256477 /* liblua.vcxproj.filters */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = liblua.vcxproj.filters; sourceTree = "<group>"; };
|
||||
F293BBF815EB838A00256477 /* liblua.vcxproj.user */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = liblua.vcxproj.user; sourceTree = "<group>"; };
|
||||
F293BBFA15EB838A00256477 /* tolua++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "tolua++.h"; sourceTree = "<group>"; };
|
||||
F293BBFB15EB838A00256477 /* tolua_event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tolua_event.c; sourceTree = "<group>"; };
|
||||
F293BBFC15EB838A00256477 /* tolua_event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tolua_event.h; sourceTree = "<group>"; };
|
||||
|
|
@ -364,9 +350,6 @@
|
|||
children = (
|
||||
F293BBAE15EB838A00256477 /* cocos2dx_support */,
|
||||
F293BBB715EB838A00256477 /* lua */,
|
||||
F293BBEE15EB838A00256477 /* proj.android */,
|
||||
F293BBF115EB838A00256477 /* proj.blackberry */,
|
||||
F293BBF415EB838A00256477 /* proj.win32 */,
|
||||
F293BBF915EB838A00256477 /* tolua */,
|
||||
);
|
||||
name = lua;
|
||||
|
|
@ -449,42 +432,6 @@
|
|||
path = lua;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F293BBEE15EB838A00256477 /* proj.android */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F293BBEF15EB838A00256477 /* jni */,
|
||||
);
|
||||
path = proj.android;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F293BBEF15EB838A00256477 /* jni */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F293BBF015EB838A00256477 /* Android.mk */,
|
||||
);
|
||||
path = jni;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F293BBF115EB838A00256477 /* proj.blackberry */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F293BBF215EB838A00256477 /* .cproject */,
|
||||
F293BBF315EB838A00256477 /* .project */,
|
||||
);
|
||||
path = proj.blackberry;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F293BBF415EB838A00256477 /* proj.win32 */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F293BBF515EB838A00256477 /* liblua.vcproj */,
|
||||
F293BBF615EB838A00256477 /* liblua.vcxproj */,
|
||||
F293BBF715EB838A00256477 /* liblua.vcxproj.filters */,
|
||||
F293BBF815EB838A00256477 /* liblua.vcxproj.user */,
|
||||
);
|
||||
path = proj.win32;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F293BBF915EB838A00256477 /* tolua */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -678,13 +625,6 @@
|
|||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
F293BC2415EB838A00256477 /* Android.mk in Resources */,
|
||||
F293BC2515EB838A00256477 /* .cproject in Resources */,
|
||||
F293BC2615EB838A00256477 /* .project in Resources */,
|
||||
F293BC2715EB838A00256477 /* liblua.vcproj in Resources */,
|
||||
F293BC2815EB838A00256477 /* liblua.vcxproj in Resources */,
|
||||
F293BC2915EB838A00256477 /* liblua.vcxproj.filters in Resources */,
|
||||
F293BC2A15EB838A00256477 /* liblua.vcxproj.user in Resources */,
|
||||
F2A1553E15EB91DE00C9B0B6 /* Collision in Resources */,
|
||||
F2A1553F15EB91DE00C9B0B6 /* Common in Resources */,
|
||||
F2A1554015EB91DE00C9B0B6 /* Dynamics in Resources */,
|
||||
|
|
|
|||
|
|
@ -50,13 +50,11 @@
|
|||
15426FE815B5743C00712A7F /* CocosDenshion.m in Sources */ = {isa = PBXBuildFile; fileRef = 15426FD515B5743C00712A7F /* CocosDenshion.m */; };
|
||||
15426FE915B5743C00712A7F /* SimpleAudioEngine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 15426FD615B5743C00712A7F /* SimpleAudioEngine.mm */; };
|
||||
15426FEA15B5743C00712A7F /* SimpleAudioEngine_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 15426FD815B5743C00712A7F /* SimpleAudioEngine_objc.m */; };
|
||||
157EFB9A1667302B00BF1E11 /* jsb_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB951667302B00BF1E11 /* jsb_constants.js */; };
|
||||
157EFB9B1667302B00BF1E11 /* jsb_constants_chipmunk.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB961667302B00BF1E11 /* jsb_constants_chipmunk.js */; };
|
||||
157EFB9C1667302B00BF1E11 /* jsb_constants_cocos2d.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB971667302B00BF1E11 /* jsb_constants_cocos2d.js */; };
|
||||
157EFB9D1667302B00BF1E11 /* jsb_constants_cocosbuilder.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB981667302B00BF1E11 /* jsb_constants_cocosbuilder.js */; };
|
||||
157EFB9E1667302B00BF1E11 /* jsb_constants_gl.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFB991667302B00BF1E11 /* jsb_constants_gl.js */; };
|
||||
157EFBAE1667308300BF1E11 /* cocos2dxapi.js in Sources */ = {isa = PBXBuildFile; fileRef = 157EFBAD1667308300BF1E11 /* cocos2dxapi.js */; };
|
||||
157EFBB0166730EF00BF1E11 /* Published files iOS in Resources */ = {isa = PBXBuildFile; fileRef = 157EFBAF166730EF00BF1E11 /* Published files iOS */; };
|
||||
15900400166DAD84006BF838 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 159003FF166DAD84006BF838 /* res */; };
|
||||
159004CC166DE338006BF838 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 159004CB166DE338006BF838 /* Icon-57.png */; };
|
||||
159004CE166DE33E006BF838 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 159004CD166DE33E006BF838 /* Icon-114.png */; };
|
||||
159004D0166DE346006BF838 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 159004CF166DE346006BF838 /* Icon-72.png */; };
|
||||
159004D2166DE34B006BF838 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 159004D1166DE34B006BF838 /* Icon-144.png */; };
|
||||
15CFE1A61612FD0E00BF2188 /* CCControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CFE18D1612FD0E00BF2188 /* CCControl.cpp */; };
|
||||
15CFE1A71612FD0E00BF2188 /* CCControlButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CFE18F1612FD0E00BF2188 /* CCControlButton.cpp */; };
|
||||
15CFE1A81612FD0E00BF2188 /* CCControlColourPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CFE1911612FD0E00BF2188 /* CCControlColourPicker.cpp */; };
|
||||
|
|
@ -71,6 +69,16 @@
|
|||
15CFE1B11612FD0E00BF2188 /* CCScale9Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CFE1A41612FD0E00BF2188 /* CCScale9Sprite.cpp */; };
|
||||
15E2AE9E165DC52C00F7743F /* CCPhysicsDebugNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15E2AE9A165DC52C00F7743F /* CCPhysicsDebugNode.cpp */; };
|
||||
15E2AE9F165DC52C00F7743F /* CCPhysicsSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15E2AE9C165DC52C00F7743F /* CCPhysicsSprite.cpp */; };
|
||||
1A995D32166B40C5001C34E9 /* boot-jsb.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A995C5E166B3F52001C34E9 /* boot-jsb.js */; };
|
||||
1A995D33166B40C5001C34E9 /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A995C5F166B3F52001C34E9 /* main.js */; };
|
||||
1A995D34166B40C5001C34E9 /* resources-jsb.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A995CC8166B3F52001C34E9 /* resources-jsb.js */; };
|
||||
1A995D35166B40C5001C34E9 /* watermelon_with_me.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A995CC9166B3F52001C34E9 /* watermelon_with_me.js */; };
|
||||
1A995D36166B40C5001C34E9 /* jsb_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A995C54166B3F24001C34E9 /* jsb_constants.js */; };
|
||||
1A995D37166B40C5001C34E9 /* jsb_constants_chipmunk.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A995C55166B3F24001C34E9 /* jsb_constants_chipmunk.js */; };
|
||||
1A995D38166B40C5001C34E9 /* jsb_constants_cocos2d.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A995C56166B3F24001C34E9 /* jsb_constants_cocos2d.js */; };
|
||||
1A995D39166B40C5001C34E9 /* jsb_constants_cocosbuilder.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A995C57166B3F24001C34E9 /* jsb_constants_cocosbuilder.js */; };
|
||||
1A995D3A166B40C5001C34E9 /* jsb_constants_gl.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A995C58166B3F24001C34E9 /* jsb_constants_gl.js */; };
|
||||
1AAD8928166DFD980028BAAB /* levels.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AAD8926166DFD820028BAAB /* levels.js */; };
|
||||
262829DB15EC7196002C4240 /* chipmunk.c in Sources */ = {isa = PBXBuildFile; fileRef = 262829AC15EC7196002C4240 /* chipmunk.c */; };
|
||||
262829DD15EC7196002C4240 /* cpConstraint.c in Sources */ = {isa = PBXBuildFile; fileRef = 262829AF15EC7196002C4240 /* cpConstraint.c */; };
|
||||
262829DE15EC7196002C4240 /* cpDampedRotarySpring.c in Sources */ = {isa = PBXBuildFile; fileRef = 262829B015EC7196002C4240 /* cpDampedRotarySpring.c */; };
|
||||
|
|
@ -239,13 +247,11 @@
|
|||
15426FD615B5743C00712A7F /* SimpleAudioEngine.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SimpleAudioEngine.mm; sourceTree = "<group>"; };
|
||||
15426FD715B5743C00712A7F /* SimpleAudioEngine_objc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleAudioEngine_objc.h; sourceTree = "<group>"; };
|
||||
15426FD815B5743C00712A7F /* SimpleAudioEngine_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleAudioEngine_objc.m; sourceTree = "<group>"; };
|
||||
157EFB951667302B00BF1E11 /* jsb_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants.js; sourceTree = "<group>"; };
|
||||
157EFB961667302B00BF1E11 /* jsb_constants_chipmunk.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_chipmunk.js; sourceTree = "<group>"; };
|
||||
157EFB971667302B00BF1E11 /* jsb_constants_cocos2d.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_cocos2d.js; sourceTree = "<group>"; };
|
||||
157EFB981667302B00BF1E11 /* jsb_constants_cocosbuilder.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_cocosbuilder.js; sourceTree = "<group>"; };
|
||||
157EFB991667302B00BF1E11 /* jsb_constants_gl.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_gl.js; sourceTree = "<group>"; };
|
||||
157EFBAD1667308300BF1E11 /* cocos2dxapi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = cocos2dxapi.js; path = ../../../scripting/javascript/bindings/generated/cocos2dxapi.js; sourceTree = "<group>"; };
|
||||
157EFBAF166730EF00BF1E11 /* Published files iOS */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Published files iOS"; path = "../../TestJavascript/cocos2d-js-tests/games/CocosDragonJS/Published files iOS"; sourceTree = "<group>"; };
|
||||
159003FF166DAD84006BF838 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = "../../TestJavascript/cocos2d-js-tests/games/WatermelonWithMe/res"; sourceTree = "<group>"; };
|
||||
159004CB166DE338006BF838 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
|
||||
159004CD166DE33E006BF838 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
|
||||
159004CF166DE346006BF838 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
|
||||
159004D1166DE34B006BF838 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
|
||||
15CFE18D1612FD0E00BF2188 /* CCControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControl.cpp; sourceTree = "<group>"; };
|
||||
15CFE18E1612FD0E00BF2188 /* CCControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControl.h; sourceTree = "<group>"; };
|
||||
15CFE18F1612FD0E00BF2188 /* CCControlButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlButton.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -275,6 +281,16 @@
|
|||
15E2AE9B165DC52C00F7743F /* CCPhysicsDebugNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsDebugNode.h; sourceTree = "<group>"; };
|
||||
15E2AE9C165DC52C00F7743F /* CCPhysicsSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsSprite.cpp; sourceTree = "<group>"; };
|
||||
15E2AE9D165DC52C00F7743F /* CCPhysicsSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsSprite.h; sourceTree = "<group>"; };
|
||||
1A995C54166B3F24001C34E9 /* jsb_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants.js; sourceTree = "<group>"; };
|
||||
1A995C55166B3F24001C34E9 /* jsb_constants_chipmunk.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_chipmunk.js; sourceTree = "<group>"; };
|
||||
1A995C56166B3F24001C34E9 /* jsb_constants_cocos2d.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_cocos2d.js; sourceTree = "<group>"; };
|
||||
1A995C57166B3F24001C34E9 /* jsb_constants_cocosbuilder.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_cocosbuilder.js; sourceTree = "<group>"; };
|
||||
1A995C58166B3F24001C34E9 /* jsb_constants_gl.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_constants_gl.js; sourceTree = "<group>"; };
|
||||
1A995C5E166B3F52001C34E9 /* boot-jsb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = "boot-jsb.js"; path = "../../TestJavascript/cocos2d-js-tests/games/WatermelonWithMe/boot-jsb.js"; sourceTree = "<group>"; };
|
||||
1A995C5F166B3F52001C34E9 /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.js; path = "../../TestJavascript/cocos2d-js-tests/games/WatermelonWithMe/main.js"; sourceTree = "<group>"; };
|
||||
1A995CC8166B3F52001C34E9 /* resources-jsb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = "resources-jsb.js"; path = "../../TestJavascript/cocos2d-js-tests/games/WatermelonWithMe/resources-jsb.js"; sourceTree = "<group>"; };
|
||||
1A995CC9166B3F52001C34E9 /* watermelon_with_me.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = watermelon_with_me.js; path = "../../TestJavascript/cocos2d-js-tests/games/WatermelonWithMe/watermelon_with_me.js"; sourceTree = "<group>"; };
|
||||
1AAD8926166DFD820028BAAB /* levels.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = levels.js; path = "../../TestJavascript/cocos2d-js-tests/games/WatermelonWithMe/levels.js"; sourceTree = "<group>"; };
|
||||
2628298215EC7196002C4240 /* chipmunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chipmunk.h; sourceTree = "<group>"; };
|
||||
2628298315EC7196002C4240 /* chipmunk_ffi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chipmunk_ffi.h; sourceTree = "<group>"; };
|
||||
2628298415EC7196002C4240 /* chipmunk_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chipmunk_private.h; sourceTree = "<group>"; };
|
||||
|
|
@ -342,7 +358,7 @@
|
|||
263B98CF16548E4D00228D8A /* js_bindings_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_core.h; sourceTree = "<group>"; };
|
||||
263B98D316548EB700228D8A /* js_bindings_chipmunk_functions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_functions.cpp; sourceTree = "<group>"; };
|
||||
263B98D516548EB700228D8A /* js_bindings_chipmunk_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_manual.cpp; sourceTree = "<group>"; };
|
||||
A922753D1517C094001B78AA /* CocosDragonJS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CocosDragonJS.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
A922753D1517C094001B78AA /* WatermelonWithMe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WatermelonWithMe.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
A92275411517C094001B78AA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
|
||||
A92275431517C094001B78AA /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
|
||||
A92275451517C094001B78AA /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
|
||||
|
|
@ -589,9 +605,17 @@
|
|||
15628F5B15F0F5C2000CF24B /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
157EFBAF166730EF00BF1E11 /* Published files iOS */,
|
||||
157EFBAD1667308300BF1E11 /* cocos2dxapi.js */,
|
||||
157EFB941667302B00BF1E11 /* js */,
|
||||
1AAD8926166DFD820028BAAB /* levels.js */,
|
||||
159004D1166DE34B006BF838 /* Icon-144.png */,
|
||||
159004CF166DE346006BF838 /* Icon-72.png */,
|
||||
159004CD166DE33E006BF838 /* Icon-114.png */,
|
||||
159004CB166DE338006BF838 /* Icon-57.png */,
|
||||
159003FF166DAD84006BF838 /* res */,
|
||||
1A995C5E166B3F52001C34E9 /* boot-jsb.js */,
|
||||
1A995C5F166B3F52001C34E9 /* main.js */,
|
||||
1A995CC8166B3F52001C34E9 /* resources-jsb.js */,
|
||||
1A995CC9166B3F52001C34E9 /* watermelon_with_me.js */,
|
||||
1A995C53166B3F24001C34E9 /* js */,
|
||||
D446FDA616102D86000ADA7B /* Default-568h@2x.png */,
|
||||
D446FDA416102D82000ADA7B /* Default@2x.png */,
|
||||
D446FDA216102D7D000ADA7B /* Default.png */,
|
||||
|
|
@ -599,19 +623,6 @@
|
|||
name = Resources;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
157EFB941667302B00BF1E11 /* js */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
157EFB951667302B00BF1E11 /* jsb_constants.js */,
|
||||
157EFB961667302B00BF1E11 /* jsb_constants_chipmunk.js */,
|
||||
157EFB971667302B00BF1E11 /* jsb_constants_cocos2d.js */,
|
||||
157EFB981667302B00BF1E11 /* jsb_constants_cocosbuilder.js */,
|
||||
157EFB991667302B00BF1E11 /* jsb_constants_gl.js */,
|
||||
);
|
||||
name = js;
|
||||
path = ../../../scripting/javascript/bindings/js;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
15CFE18C1612FD0E00BF2188 /* CCControlExtension */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -655,6 +666,19 @@
|
|||
path = physics_nodes;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
1A995C53166B3F24001C34E9 /* js */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
1A995C54166B3F24001C34E9 /* jsb_constants.js */,
|
||||
1A995C55166B3F24001C34E9 /* jsb_constants_chipmunk.js */,
|
||||
1A995C56166B3F24001C34E9 /* jsb_constants_cocos2d.js */,
|
||||
1A995C57166B3F24001C34E9 /* jsb_constants_cocosbuilder.js */,
|
||||
1A995C58166B3F24001C34E9 /* jsb_constants_gl.js */,
|
||||
);
|
||||
name = js;
|
||||
path = ../../../scripting/javascript/bindings/js;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
2628297C15EC7196002C4240 /* chipmunk */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -778,7 +802,7 @@
|
|||
A922753E1517C094001B78AA /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
A922753D1517C094001B78AA /* CocosDragonJS.app */,
|
||||
A922753D1517C094001B78AA /* WatermelonWithMe.app */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -827,9 +851,9 @@
|
|||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
A922753C1517C094001B78AA /* CocosDragonJS */ = {
|
||||
A922753C1517C094001B78AA /* WatermelonWithMe */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "CocosDragonJS" */;
|
||||
buildConfigurationList = A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "WatermelonWithMe" */;
|
||||
buildPhases = (
|
||||
A92275391517C094001B78AA /* Sources */,
|
||||
A922753A1517C094001B78AA /* Frameworks */,
|
||||
|
|
@ -840,9 +864,9 @@
|
|||
dependencies = (
|
||||
15426FC215B5741900712A7F /* PBXTargetDependency */,
|
||||
);
|
||||
name = CocosDragonJS;
|
||||
productName = CocosDragonJS;
|
||||
productReference = A922753D1517C094001B78AA /* CocosDragonJS.app */;
|
||||
name = WatermelonWithMe;
|
||||
productName = WatermelonWithMe;
|
||||
productReference = A922753D1517C094001B78AA /* WatermelonWithMe.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
|
@ -853,7 +877,7 @@
|
|||
attributes = {
|
||||
LastUpgradeCheck = 0430;
|
||||
};
|
||||
buildConfigurationList = A92275371517C094001B78AA /* Build configuration list for PBXProject "CocosDragonJS" */;
|
||||
buildConfigurationList = A92275371517C094001B78AA /* Build configuration list for PBXProject "WatermelonWithMe" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
|
|
@ -871,7 +895,7 @@
|
|||
);
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
A922753C1517C094001B78AA /* CocosDragonJS */,
|
||||
A922753C1517C094001B78AA /* WatermelonWithMe */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
|
|
@ -891,10 +915,24 @@
|
|||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1AAD8928166DFD980028BAAB /* levels.js in Resources */,
|
||||
1A995D32166B40C5001C34E9 /* boot-jsb.js in Resources */,
|
||||
1A995D33166B40C5001C34E9 /* main.js in Resources */,
|
||||
1A995D34166B40C5001C34E9 /* resources-jsb.js in Resources */,
|
||||
1A995D35166B40C5001C34E9 /* watermelon_with_me.js in Resources */,
|
||||
1A995D36166B40C5001C34E9 /* jsb_constants.js in Resources */,
|
||||
1A995D37166B40C5001C34E9 /* jsb_constants_chipmunk.js in Resources */,
|
||||
1A995D38166B40C5001C34E9 /* jsb_constants_cocos2d.js in Resources */,
|
||||
1A995D39166B40C5001C34E9 /* jsb_constants_cocosbuilder.js in Resources */,
|
||||
1A995D3A166B40C5001C34E9 /* jsb_constants_gl.js in Resources */,
|
||||
D446FDA316102D7D000ADA7B /* Default.png in Resources */,
|
||||
D446FDA516102D82000ADA7B /* Default@2x.png in Resources */,
|
||||
D446FDA716102D86000ADA7B /* Default-568h@2x.png in Resources */,
|
||||
157EFBB0166730EF00BF1E11 /* Published files iOS in Resources */,
|
||||
15900400166DAD84006BF838 /* res in Resources */,
|
||||
159004CC166DE338006BF838 /* Icon-57.png in Resources */,
|
||||
159004CE166DE33E006BF838 /* Icon-114.png in Resources */,
|
||||
159004D0166DE346006BF838 /* Icon-72.png in Resources */,
|
||||
159004D2166DE34B006BF838 /* Icon-144.png in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -999,12 +1037,6 @@
|
|||
263B98D716548EB700228D8A /* js_bindings_chipmunk_manual.cpp in Sources */,
|
||||
15E2AE9E165DC52C00F7743F /* CCPhysicsDebugNode.cpp in Sources */,
|
||||
15E2AE9F165DC52C00F7743F /* CCPhysicsSprite.cpp in Sources */,
|
||||
157EFB9A1667302B00BF1E11 /* jsb_constants.js in Sources */,
|
||||
157EFB9B1667302B00BF1E11 /* jsb_constants_chipmunk.js in Sources */,
|
||||
157EFB9C1667302B00BF1E11 /* jsb_constants_cocos2d.js in Sources */,
|
||||
157EFB9D1667302B00BF1E11 /* jsb_constants_cocosbuilder.js in Sources */,
|
||||
157EFB9E1667302B00BF1E11 /* jsb_constants_gl.js in Sources */,
|
||||
157EFBAE1667308300BF1E11 /* cocos2dxapi.js in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -1108,7 +1140,7 @@
|
|||
"-lz",
|
||||
"-ljs_static",
|
||||
);
|
||||
PRODUCT_NAME = CocosDragonJS;
|
||||
PRODUCT_NAME = WatermelonWithMe;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
WRAPPER_EXTENSION = app;
|
||||
};
|
||||
|
|
@ -1149,7 +1181,7 @@
|
|||
"-lz",
|
||||
"-ljs_static",
|
||||
);
|
||||
PRODUCT_NAME = CocosDragonJS;
|
||||
PRODUCT_NAME = WatermelonWithMe;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
VALIDATE_PRODUCT = YES;
|
||||
WRAPPER_EXTENSION = app;
|
||||
|
|
@ -1159,7 +1191,7 @@
|
|||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
A92275371517C094001B78AA /* Build configuration list for PBXProject "CocosDragonJS" */ = {
|
||||
A92275371517C094001B78AA /* Build configuration list for PBXProject "WatermelonWithMe" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
A92276FE1517C097001B78AA /* Debug */,
|
||||
|
|
@ -1168,7 +1200,7 @@
|
|||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "CocosDragonJS" */ = {
|
||||
A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "WatermelonWithMe" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
A92277011517C097001B78AA /* Debug */,
|
||||
|
|
@ -1 +0,0 @@
|
|||
b93dc46ded7ce28fc6fae87c15645c8eb8d0f258
|
||||
|
|
@ -412,7 +412,7 @@ void ScriptingCore::createGlobalContext() {
|
|||
JS_SetOptions(this->cx_, JS_GetOptions(this->cx_) & ~JSOPTION_METHODJIT_ALWAYS);
|
||||
JS_SetErrorReporter(this->cx_, ScriptingCore::reportError);
|
||||
#if defined(JS_GC_ZEAL) && defined(DEBUG)
|
||||
JS_SetGCZeal(this->cx_, 2, JS_DEFAULT_ZEAL_FREQ);
|
||||
//JS_SetGCZeal(this->cx_, 2, JS_DEFAULT_ZEAL_FREQ);
|
||||
#endif
|
||||
this->global_ = NewGlobalObject(cx_);
|
||||
for (std::vector<sc_register_sth>::iterator it = registrationList.begin(); it != registrationList.end(); it++) {
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ function AddConfigurations(proj, strProjectName) {
|
|||
}
|
||||
|
||||
// Additional Library Directories
|
||||
var strAddDepends = 'libcocos2d.lib libExtensions.lib opengl32.lib glew32.lib';
|
||||
var strAddDepends = 'libcocos2d.lib opengl32.lib glew32.lib';
|
||||
if (wizard.FindSymbol('CC_USE_BOX2D')) {
|
||||
strAddDepends += ' libBox2d.lib';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ function main() {
|
|||
// Decode command line arguments
|
||||
var bDebug = false;
|
||||
var bQuiet = false;
|
||||
var bElevated = false;
|
||||
var bElevated = true;
|
||||
var Args = WScript.Arguments;
|
||||
for (var i = 0; i < Args.length; i++) {
|
||||
if (Args(i) == "/debug")
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ function main() {
|
|||
// Decode command line arguments
|
||||
var bDebug = false;
|
||||
var bQuiet = false;
|
||||
var bElevated = false;
|
||||
var bElevated = true;
|
||||
var Args = WScript.Arguments;
|
||||
for (var i = 0; i < Args.length; i++) {
|
||||
if (Args(i) == "/debug")
|
||||
|
|
|
|||
|
|
@ -7,7 +7,10 @@ typedef enum LanguageType
|
|||
kLanguageItalian,
|
||||
kLanguageGerman,
|
||||
kLanguageSpanish,
|
||||
kLanguageRussian
|
||||
kLanguageRussian,
|
||||
kLanguageKorean,
|
||||
kLanguageJapanese,
|
||||
kLanguageHungarian
|
||||
} ccLanguageType;
|
||||
|
||||
enum TargetPlatform
|
||||
|
|
|
|||
Loading…
Reference in New Issue