f5d640e3a7
Merge branch 'gles20_tmp' of https://github.com/dumganhar/cocos2d-x into gles20_tmp
...
Conflicts:
tests/tests/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp
tests/tests/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h
tests/tests/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp
tests/tests/ExtensionsTest/ControlExtensionTest/CCControlScene.h
tests/tests/ExtensionsTest/ExtensionsTest.cpp
2012-04-16 23:21:14 +08:00
044729dab9
Updated CCControlExtension
2012-04-16 23:16:03 +08:00
ac6e263621
Updated CCControlExtension
2012-04-16 21:51:06 +08:00
959acd556f
first commit CCControlExtension.
2012-04-16 18:58:43 +08:00
1fe71210ed
Merge pull request #845 from dumganhar/gles20_optimize_data
...
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 00:59:56 -07:00
77919439bc
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 15:41:01 +08:00
381b764da5
Merge pull request #844 from dumganhar/gles20_optimize_data
...
issue #1166 : Improve CCString and CCArray, optimize CCDictionary.
2012-04-16 00:01:18 -07:00
0af443a56f
issue #1166 : Checked whether memory is allocated successfully in CCString::initWithFormatAndValist function.
2012-04-16 14:27:49 +08:00
be129913a8
issue #1166 : Updated the project configuration for VS2010, android, ios port.
2012-04-16 13:02:44 +08:00
a71e5be0d8
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data
...
Conflicts:
cocos2dx/shaders/CCGLProgram.cpp
2012-04-16 12:45:47 +08:00
3a7fed9089
Merge pull request #843 from dumganhar/iss1165_gles20_jbyu
...
fixed #1165 : merged pull request 842
add project for ios
fixed memory leak in CCGLProgram
add pixel format I8 in CCTexture2D
update Director.pkg for LuaCocos2d
2012-04-15 21:04:19 -07:00
88951bfeec
fixed #1165 : Close retinaDisplay for HelloWorld by default. Removed ENABLE_ALL_SHADER macro. Fixed some issues in CCSprite.cpp.
2012-04-16 12:00:35 +08:00
9ace0d2fdc
Fixed memory leaks in CCString and CCDictionary, Updated CCFileUtils_ios.mm.Remove inline prefix for some member function of CCString, so that make it compiled successfully on android and ios.
2012-04-16 10:57:37 +08:00
ebc7106164
Merge branch 'gles20' of https://github.com/jbyu/cocos2d-x into gles20
2012-04-15 15:46:16 +08:00
e623cd6357
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/include/CCTexture2D.h
cocos2dx/include/ccMacros.h
cocos2dx/textures/CCTexture2D.cpp
lua/cocos2dx_support/LuaCocos2d.cpp
2012-04-15 15:46:01 +08:00
d01f1277af
optimize data struct.
2012-04-14 19:11:57 +08:00
5d9c44f897
add project for iOS
2012-04-14 18:19:30 +08:00
61a7ca71c5
fixed getContentSize pass by reference issue
...
update project setting for release mode
2012-04-14 17:13:38 +08:00
b780edde7a
By Default, we enable VAO support for ios and win32 and disable it for other platforms.
2012-04-13 18:18:47 +08:00
e6d7887a8d
Merge pull request #841 from dumganhar/gles20
...
fixed #1164 : 1. Add the render mode which uses VBO without VAO for CCParticleSystemQuad.
2012-04-13 02:38:23 -07:00
3c0653ffa7
fixed #1164 : 1. Add the render mode which uses VBO without VAO in CCParticleSystemQuad.
...
2. delete some unused codes for win32 port.
3. Add CC_REBIND_INDICES_BUFFER macro.
2012-04-13 17:24:50 +08:00
74c7c0d356
Merge pull request #840 from minggo/iss1156_director
...
synchronize CCDirector
2012-04-12 23:19:27 -07:00
34c805590f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director
2012-04-13 14:11:58 +08:00
b43d5aa654
fixed #1156 syn CCDirector
2012-04-13 14:11:35 +08:00
e9e6256815
Merge pull request #839 from dumganhar/gles20
...
fixed #1160 : Renamed 'CGFloat' to 'CCFloat'.
2012-04-12 23:10:57 -07:00
94e056d964
fixed #1160 : Renamed 'CGFloat' to 'CCFloat'.
2012-04-13 14:09:02 +08:00
a20f3fe638
remove unneeded codes
2012-04-13 11:57:25 +08:00
91b4d52c31
Merge pull request #838 from dumganhar/gles20
...
fixed #1159 : Updated "CallFuncND + auto remove" test demo.
2012-04-12 20:56:05 -07:00
47af0886d3
fixed #1159 : Updated "CallFuncND + auto remove" test demo.
2012-04-13 11:54:29 +08:00
9bbac0d33d
issue #1156 : remove unneeded macros and functions
2012-04-13 11:45:41 +08:00
be525c7e57
Merge pull request #837 from dumganhar/gles20
...
fixed #1158 : Fixed a bug in CCParticleSystemQuad.
We need to check whether need to free quads and delete vbo/vao in the destructor.
CCParticleSystemQuad::~CCParticleSystemQuad()
{
if (NULL == m_pBatchNode) // important
{
CC_SAFE_FREE(m_pQuads);
CC_SAFE_FREE(m_pIndices);
glDeleteBuffers(2, &m_pBuffersVBO[0]);
glDeleteVertexArrays(1, &m_uVAOname);
}
}
2012-04-12 20:43:02 -07:00
f7a1807865
fixed #1158 : Fixed a bug in CCParticleSystemQuad.
...
We need to check whether need to free quads and delete vbo/vao in the destructor.
CCParticleSystemQuad::~CCParticleSystemQuad()
{
if (NULL == m_pBatchNode) // important
{
CC_SAFE_FREE(m_pQuads);
CC_SAFE_FREE(m_pIndices);
glDeleteBuffers(2, &m_pBuffersVBO[0]);
glDeleteVertexArrays(1, &m_uVAOname);
}
}
2012-04-13 11:40:56 +08:00
028cf7874e
issue #1156 : remove unneeded macros and functions
2012-04-13 11:22:17 +08:00
7cf16dbb32
Merge pull request #836 from minggo/touch_case
...
fix TouchesTest crashed on Android and iOS
2012-04-12 18:47:41 -07:00
3fbfeeb7e8
fixed #1142 : fix TouchesTest crashed on Android and iOS
2012-04-13 09:45:31 +08:00
1ed6df9de8
add pixel format I8
2012-04-12 20:44:50 +08:00
ac89892db4
Merge pull request #835 from dumganhar/gles20
...
fixed #1155 : Reverted CCDirector singleton to original implementation.
We must take care of the life cycle of CCDirector which should be firstly initialized and be destroyed at the last. Therefore, we should use a global object variable rather than a global object pointer variable.
2012-04-12 03:15:26 -07:00
247bf08d98
fixed content size issue for retina
2012-04-11 19:27:34 +08:00
ab8af9e04c
retina for win32
2012-04-11 16:41:12 +08:00
da76def60a
Fixed a heap crash in CCDirector, and reverted CCDirector singleton to global variable rather than a pointer.
2012-04-11 12:03:37 +08:00
b8e6d9c589
fixed memory leak from CCGLProgram.cpp
...
enable retina for win32
2012-04-11 11:15:53 +08:00
2b5af66974
updated win32 projects configuration release version.
2012-04-10 23:09:58 +08:00
ba37e0e42f
Merge pull request #834 from dumganhar/gles20
...
fixed #1138 : Fixed a memory leak in CCTextureCache::addPVRImage.
2012-04-10 03:45:27 -07:00
b6cc0658f3
invalid pointer check in void TexturePVRRGB888::onEnter().
2012-04-10 18:43:00 +08:00
6823704a46
fixed #1138 : Fixed a memory leak in CCTextureCache::addPVRImage.
2012-04-10 18:17:08 +08:00
429e0bcb46
Merge pull request #832 from dumganhar/gles20
...
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 02:46:38 -07: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
c9b1943559
create folder for shader
2012-04-10 15:30:11 +08:00
James Chen