James Chen
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
James Chen
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
James Chen
baa27540a0
Updated the implementation of ccc4f. Initialize the ccResolutionType resolution variable in CCTextureCache::addImage.
2012-04-09 09:55:06 +08:00
Phenix Yu
a05757f741
update for msvc2010
2012-04-09 00:10:12 +08:00
minggo
4c61035231
return correct content size
2012-04-08 22:37:58 +08:00
minggo
86b13a64c4
CCFileUtils::fullPathFromRelativePath() works correct
2012-04-08 14:52:47 +08:00
minggo
9e62841adb
fixed #1089 : win32 support ipad, new ipad
2012-04-08 14:29:16 +08:00
minggo
29be687f0b
merge commit 0e8a8c04a21b7e96a7386237d0e4e4eef2269c89
2012-04-08 14:28:07 +08:00
minggo
75d6972da8
remove unneeded macros
2012-04-08 14:26:50 +08:00
minggo
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +08:00
James Chen
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
James Chen
64665fe7c8
issue #1094 : Make ParticleBatchNode works on win32.
2012-04-07 12:02:40 +08:00
Walzer
203f40a00d
add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp,
2012-04-06 23:33:42 +08:00
James Chen
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
James Chen
2b272e2813
ParticleTest
2012-04-05 14:19:22 +08:00
James Chen
931c42a621
Updated some files.
2012-04-04 21:58:04 +08:00
James Chen
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
James Chen
2b17a7276c
issue #1056 : Updated CCTextureAtlas.cpp
2012-03-29 14:33:50 +08:00
James Chen
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
James Chen
a0520d8f27
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 11:25:57 +08:00
James Chen
56d5c496e9
issue #1056 : Refactored two macros -- ccArrayMakeObjectsPerformSelector , ccArrayMakeObjectsPerformSelectorWithObject.
2012-03-29 11:25:08 +08:00
James Chen
c759f29d76
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 10:11:42 +08:00
James Chen
c6457dfed8
issue #1056 : Updated ios project configuration.
2012-03-29 10:09:41 +08:00
James Chen
a626271b06
issue #1056 : Made setupVBO as CCTextureAtlas's member function.
2012-03-28 22:01:12 +08:00
James Chen
bb7485621e
issue #1056 : Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.
2012-03-28 21:44:28 +08:00
James Chen
3d63f9c58e
issue #1056 : Set CC_ENABLE_GL_STATE_CACHE = 1, Updated LavaFlow.plist.
2012-03-28 17:51:26 +08:00
James Chen
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
James Chen
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
James Chen
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
James Chen
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
James Chen
3475108953
issue #1056 : Updated Android.mk, fixed a bug in CCImage.h.
2012-03-27 13:48:14 +08:00
James Chen
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
James Chen
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
James Chen
4c7fe7c917
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-26 22:37:30 +08:00
James Chen
7d04254855
issue #1056 : Updated some files.
2012-03-26 22:37:09 +08:00
James Chen
d36933d542
issue #1056 : Update ios project.
2012-03-26 20:29:50 +08:00
James Chen
d67ea955f2
Delete some shader files.
2012-03-26 20:03:54 +08:00
James Chen
0f5efaffd2
issue #1056 : Check bugs of SpriteTest.
2012-03-26 18:44:28 +08:00
James Chen
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
James Chen
8b6de75be6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-26 16:46:40 +08:00
James Chen
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
James Chen
6f5603cfe6
issue #1056 : Updated CCTexture2dTest. Added CCTextureAsyncTest.
2012-03-23 18:16:47 +08:00
James Chen
98ba5ef203
Merge pull request #807 from dumganhar/gles20
...
issue #1056 : Updated SpriteTest.
2012-03-23 02:33:26 -07:00
James Chen
9c9230a43f
#issue #1056 : Updated SpriteTest.
2012-03-23 17:31:28 +08:00
James Chen
2a459e23a6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-23 10:27:35 +08:00
James Chen
0ef65d1ed5
issue #1056 : Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp
2012-03-23 10:26:36 +08:00
minggo
728835c77b
Merge pull request #806 from minggo/SpriteTest
...
Sprite test
2012-03-22 19:25:24 -07:00
minggo
ad8d7cdeff
SpriteTest
2012-03-23 10:23:02 +08:00
James Chen
5e71f5fc7c
Merge pull request #805 from dumganhar/gles20
...
issue #1056 : Updated ParticleTest.
2012-03-22 03:31:50 -07:00
James Chen
900de7328a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 18:29:26 +08:00