6823704a46
fixed #1138 : Fixed a memory leak in CCTextureCache::addPVRImage.
2012-04-10 18:17:08 +08:00
2885664c85
fixed #1136 : Fixed some bugs as follows:
...
1. Using std::string parameter as the key of CCDictionary
2. Deep copy for CCDictionary and CCArray, the classes of elements's type must implement copyWithZone.
3. Added toBool() function to CCString.
4. Retina support for all platforms.
5. Include "CCString.h" and "cocoa/CCNS.h" in cocos2d.h.
6. Added a new constructor(CCArray::CCArray(unsigned int capacity)) for CCArray. And fixed a bug in CCArray.
7. Fixed a memory leak in CCLabelBMFont.cpp.
8. Fixed an error in strings.xml.
2012-04-10 17:17:24 +08:00
137679d369
Fixed a bug in CCFileUtils::dictionaryWithContentOfFile.
2012-04-10 16:32:53 +08:00
675f2b5dd0
Updated strings.xml
2012-04-10 16:21:23 +08:00
8271fdd95b
Initialize m_sString pointer.
2012-04-10 15:24:06 +08:00
22052db4bd
Fixed a memory leak in CCLabelBMFont.cpp.
2012-04-10 15:14:55 +08:00
5ad6c38500
Fixed two memory leaks in CCArray::copyWithZone and CCDictionary::copyWithZone.
2012-04-10 15:01:29 +08:00
6cd69523c8
Merge pull request #829 from dumganhar/iss1094_gles20_particlebat
...
issue #1094 : Make ParticleBatchNode works on win32 and fixed some issues as follows:
1. renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton.
2.fixed a memory leak in CCParticleSystem.
3.init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
4.Add CCAssert in ccArrayRemoveObjectAtIndex.
5.Use new method to allocate CCDirector.
2012-04-08 19:45:38 -07:00
b4d74700e4
Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad
...
Conflicts:
tests/tests/ParticleTest/ParticleTest.cpp
2012-04-09 10:28:21 +08:00
3d601048c6
Merge pull request #831 from dumganhar/new_ipad
...
fixed #1095 : IOS screen resolution(iphone, iphone-retina, ipad, ipad-retina) support.
2012-04-08 19:02:16 -07:00
baa27540a0
Updated the implementation of ccc4f. Initialize the ccResolutionType resolution variable in CCTextureCache::addImage.
2012-04-09 09:55:06 +08:00
4c61035231
return correct content size
2012-04-08 22:37:58 +08:00
86b13a64c4
CCFileUtils::fullPathFromRelativePath() works correct
2012-04-08 14:52:47 +08:00
9e62841adb
fixed #1089 : win32 support ipad, new ipad
2012-04-08 14:29:16 +08:00
29be687f0b
merge commit 0e8a8c04a21b7e96a7386237d0e4e4eef2269c89
2012-04-08 14:28:07 +08:00
75d6972da8
remove unneeded macros
2012-04-08 14:26:50 +08:00
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +08:00
4baebb8cab
issue #1094 : renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton.
...
fixed a memory leak in CCParticleSystem.
2012-04-08 12:50:15 +08:00
64665fe7c8
issue #1094 : Make ParticleBatchNode works on win32.
2012-04-07 12:02:40 +08:00
203f40a00d
add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp,
2012-04-06 23:33:42 +08:00
df58a09255
Update:
...
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
2012-04-05 18:53:53 +08:00
2b272e2813
ParticleTest
2012-04-05 14:19:22 +08:00
931c42a621
Updated some files.
2012-04-04 21:58:04 +08:00
40ec8a3b3d
Merge pull request #821 from dumganhar/gles20
...
issue #1056 : Updated somethings for gles20 branch.
1. Set CC_ENABLE_GL_STATE_CACHE = 1, Updated LavaFlow.plist.
2. Made setupVBO as CCTextureAtlas's member function.
3. Updated ios project configuration.
4. Removed CCNode::arrayMakeObjectsPerformSelector, instead, we defined two macros (arrayMakeObjectsPerformSelector and arrayMakeObjectsPerformSelectorWithObject) to fit for any classes that inherit from CCNode.
2012-03-28 23:38:30 -07:00
2b17a7276c
issue #1056 : Updated CCTextureAtlas.cpp
2012-03-29 14:33:50 +08:00
d7aed75942
issue #1056 : Removed CCNode::arrayMakeObjectsPerformSelector, instead, we defined two macros (arrayMakeObjectsPerformSelector and arrayMakeObjectsPerformSelectorWithObject) to fit for any classes that inherit from CCNode.
2012-03-29 14:30:13 +08:00
a0520d8f27
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 11:25:57 +08:00
56d5c496e9
issue #1056 : Refactored two macros -- ccArrayMakeObjectsPerformSelector , ccArrayMakeObjectsPerformSelectorWithObject.
2012-03-29 11:25:08 +08:00
c759f29d76
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 10:11:42 +08:00
c6457dfed8
issue #1056 : Updated ios project configuration.
2012-03-29 10:09:41 +08:00
a626271b06
issue #1056 : Made setupVBO as CCTextureAtlas's member function.
2012-03-28 22:01:12 +08:00
bb7485621e
issue #1056 : Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.
2012-03-28 21:44:28 +08:00
3d63f9c58e
issue #1056 : Set CC_ENABLE_GL_STATE_CACHE = 1, Updated LavaFlow.plist.
2012-03-28 17:51:26 +08:00
f80b779941
Merge pull request #819 from dumganhar/gles20
...
issue #1056 : Fixed a bug in CCDirector::setProjection.
We should invoking kmGLMultMatrix(&orthoMatrix) after invoking kmMat4OrthographicProjection.
2012-03-28 02:05:53 -07:00
c73c84f79b
issue #1056 : Fixed a bug in CCDirector::setProjection.
...
We should invoking kmGLMultMatrix(&orthoMatrix) after invoking kmMat4OrthographicProjection.
2012-03-28 17:02:07 +08:00
b1fcb19f1b
Merge pull request #811 from dumganhar/gles20
...
issue #1056 : Updated the configuration of ios and android project.
Details:
1. Fixed a bug about reorderChild in CCSpriteBatchNode.
2. Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp.
3. Updated Android.mk, fixed a bug in CCImage.h.
4. Delete some shader files in tests/Resources/ folder since they are moved into tests/Resources/shaders folder.
2012-03-26 23:20:47 -07:00
394bb24cf5
issue #1056 : Reverted opengles emulator version to 2.09, because there are some issues in v2.10.
2012-03-27 14:11:28 +08:00
3475108953
issue #1056 : Updated Android.mk, fixed a bug in CCImage.h.
2012-03-27 13:48:14 +08:00
cef41dfbc5
issue #1056 : Updated opengles2.0 emulator libraries to newest version 2.10@863987. Deleted some files of opengles1.1.
2012-03-27 13:42:35 +08:00
0f1ab7ab37
issue #1056 : Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp.
2012-03-27 10:55:13 +08:00
4c7fe7c917
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-26 22:37:30 +08:00
7d04254855
issue #1056 : Updated some files.
2012-03-26 22:37:09 +08:00
d36933d542
issue #1056 : Update ios project.
2012-03-26 20:29:50 +08:00
d67ea955f2
Delete some shader files.
2012-03-26 20:03:54 +08:00
0f5efaffd2
issue #1056 : Check bugs of SpriteTest.
2012-03-26 18:44:28 +08:00
9ddd5d3879
Merge pull request #809 from dumganhar/gles20
...
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 01:50:54 -07:00
8b6de75be6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-26 16:46:40 +08:00
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
6f5603cfe6
issue #1056 : Updated CCTexture2dTest. Added CCTextureAsyncTest.
2012-03-23 18:16:47 +08:00
98ba5ef203
Merge pull request #807 from dumganhar/gles20
...
issue #1056 : Updated SpriteTest.
2012-03-23 02:33:26 -07:00
James Chen