James Chen
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
Phenix Yu
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
James Chen
d01f1277af
optimize data struct.
2012-04-14 19:11:57 +08:00
Phenix Yu
247bf08d98
fixed content size issue for retina
2012-04-11 19:27:34 +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
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
56d5c496e9
issue #1056 : Refactored two macros -- ccArrayMakeObjectsPerformSelector , ccArrayMakeObjectsPerformSelectorWithObject.
2012-03-29 11:25:08 +08:00
James Chen
7d04254855
issue #1056 : Updated some files.
2012-03-26 22:37:09 +08:00
James Chen
0f5efaffd2
issue #1056 : Check bugs of SpriteTest.
2012-03-26 18:44:28 +08:00
James Chen
9c9230a43f
#issue #1056 : Updated SpriteTest.
2012-03-23 17:31:28 +08:00
James Chen
2ac2da9c97
issue #1056 : 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest.
...
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
2012-03-21 15:43:35 +08:00
James Chen
6ce06bd906
issue #1056 : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 15:04:53 +08:00
James Chen
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
James Chen
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
James Chen
9e89171557
issue #1056 : Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.
2012-03-15 10:42:22 +08:00
James Chen
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08:00
James Chen
aefdb852a2
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 14:55:17 +08:00
dumganhar
d61f87ba92
modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void)
2012-01-09 23:21:31 +08:00
dumganhar
a773e4fb96
move SelectorProtocol to CCObject
2012-01-08 21:03:16 +08:00
minggo
cdc842051f
issue #892 : use RTTI to simplify codes, work ok on win32
2011-12-07 14:28:22 +08:00
minggo
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
Walzer
ab7db20809
Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform
2011-11-26 17:20:12 +08:00
minggo
5273819e83
offer a thread safe function to read contents of xml file, and the engine use it internal
2011-11-15 10:41:18 +08:00
minggo
2c14402107
fixed #776 : merge pull request and remove unneeded codes
2011-10-28 09:46:19 +08:00
laschweinski
04633242ba
fix a bug in audio player
2011-10-22 19:10:50 +08:00
minggo
a411f4877c
fixed #698:Not invoke init() in the construction of CCSprite
2011-08-29 11:00:31 +08:00
moadib
a8d87a9976
Non-trivial arguments passed by reference now.
...
Removed unnecessary cocos2d:: prefix inside namespace.
2011-08-17 17:26:26 +04:00
minggo
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
natural-law
d6221cfa36
Use the setter to set the value of m_tAnchorPoint.
2011-08-02 11:02:02 +08:00
natural-law
bf44d13bc9
fixed #644 , m_bUseBatchNode of all sprite drawn by CCSpriteBatchNode should be false after CCSpriteBatchNode::removeAllChildrenWithCleanup() invoked.
2011-08-01 10:44:18 +08:00
Walzer
45e8915963
fixed #628 , CCMutableArray::arrayWithObjects & arrayWithArray should set the return object to autorelease. And add CCAnimation::m_pobFrames->retain() after it get value from arrayWithArray. (it's property with retain in -iphone version but we miss the retain)
2011-07-24 08:30:49 +08:00
minggo
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
natural-law
810cf3f8c3
fixed #591
2011-07-08 15:02:46 +08:00
natural-law
7d7f3a9241
fixed #562 , Upgrade folder sprite_nodes to rc3.
2011-07-01 16:11:31 +08:00
natural-law
b684cbdc6c
fixed #522 , CCSpriteFrameCache::addSpriteFramesWithFile(const char *pszPlist) will not crash any more if the parameter don't have '/'.
2011-06-30 17:50:28 +08:00
Marat Yakupov
14c43f4246
changed postfix increment of iterators to prefix increment
2011-06-21 09:30:03 +04:00
liswei
91326028ec
fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion)
2011-06-13 16:58:55 +08:00
liswei
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +08:00
natural-law
15ef0b9105
issue #428 , fix the bug created by issue 428. Have some loop in wrong arrays.
2011-04-28 10:16:58 +08:00
natural-law
5d2ac1fc0c
fixed #428 , Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
2011-04-21 14:46:15 +08:00
minggo
7d52161804
fixed #441 : Initialize pointer in contruction & detect pointer value in destruction
2011-04-01 16:06:53 +08:00
yangws
0efeaa6696
fixed #420 deal with ccsprite init failed case in CCSprite.cpp.
2011-03-31 14:56:49 +08:00
natural-law
87ea85a986
fixed #411,support .plist format generated by zwoptex in the last version.
2011-03-29 16:59:50 +08:00
natural-law
5f7357bf09
fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.
2011-03-29 11:56:14 +08:00
natural-law
55143e3b9e
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
2011-03-24 10:38:08 +08:00
walzer
2b7a324c47
fix compilation error when COCOS2D_DEBUG = 2
2011-03-21 10:50:24 +08:00
walzer
81fa070125
fixed #418 , add copyright of original authors, merge Bin's commit
2011-03-19 14:45:51 +08:00
minggo
47173778cc
fixed #409 : rename NSArray UIAlignment
2011-03-18 14:31:29 +08:00
minggo
89db0334a3
revert the modification of CCNode_mobile.cpp and CCSprite.cpp
2011-03-15 10:27:16 +08:00
minggo
4b61e713e5
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-15 10:20:56 +08:00
yangws
1e67709e34
fixed #392 CC_SPRITE_DEBUG_DRAW OK.
2011-03-12 15:20:26 +08:00
natural-law
dd675f8cf1
[wophone]Resolve the memory leak of CCAccelerometer.
2011-03-11 17:41:19 +08:00
natural-law
6d028007c2
Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful.
2011-03-11 17:00:10 +08:00
minggo
7a331e1e14
issue #375 : wophone compiled ok
2011-03-07 18:20:48 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
yangws
67c0ad6332
add platform support project on win32.
...
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
natural-law
0d2d746aec
Fix bugs.Run tests in cocos2d-uphone successful.
2011-01-05 17:01:08 +08:00
natural-law
711f3a2906
modify YES to true,and No to false.
2010-12-31 17:56:46 +08:00
minggo
d0a16a246e
fixed comipling error and link error of upto-0.99.5
2010-12-31 14:56:24 +08:00
natural-law
35d611155b
add functions:
...
void CCSpriteBatchNode::addQuadFromSprite(CCSprite *sprite, unsigned int index);
CCSpriteBatchNode * CCSpriteBatchNode::addSpriteWithoutQuad(CCSprite*child, unsigned int z, int aTag);
2010-12-28 17:42:23 +08:00
minggo
4cd3e59e2b
fixed #278
2010-12-27 10:26:56 +08:00
Walzer
641bea0abc
fixed #265 compile error when enable CC_XXX_DEBUG_DRAW switchs in ccConfig.h
2010-12-17 23:18:03 +08:00
Walzer
0b8d5c96f7
fixed #263 , compilation error while enableing CC_SPRITE_DEBUG_DRAW
2010-12-16 22:37:15 +08:00
Walzer
5babcbca6b
fixed #248 , crashed in CCSprite::setDisplayFrame
2010-12-10 10:31:14 +08:00
Walzer
820c2f0714
issue #211 cocos2d-x back to cocos2dx
2010-11-18 15:01:42 +00:00
Walzer
b4328354af
issue #211 cocos2dx -> cocos2d-x
2010-11-18 14:07:17 +00:00
Walzer
916b620259
fixed #201 when load image fails, it will jump a MessageBox now, and return a transparent sprite
2010-11-12 07:55:28 +00:00
yangws
cf0a2c5665
add cocos2dx-win32 framework, can't work yet.
2010-10-08 09:53:04 +00:00
Ming
19b6f1a235
2010-10-08 01:57:07 +00:00
Ming
12d6df9717
issue #154
2010-09-24 10:10:32 +00:00
natural-law
5af16c3282
issue #144
...
Clear memory leaks of the test_uphone project
2010-09-17 06:51:34 +00:00
natural-law
16b360fd7d
fixed #148
...
Explant Box2D and add Box2dTest
2010-09-14 06:47:12 +00:00
natural-law
ae1439812a
issue #139
...
Debug
2010-09-13 06:12:50 +00:00
Walzer
b2d950743b
issue 136, use NSDictionary in CCSpriteFrameCache
2010-09-10 06:08:25 +00:00
natural-law
2997a74699
issue #135
...
Add SpriteTest code
2010-09-09 02:17:38 +00:00
natural-law
bd796c7452
issue #130
...
Add function to set the resource path
2010-09-07 08:30:31 +00:00
natural-law
f94441141f
fixed #132
...
add AtlasTest code
2010-09-07 03:47:54 +00:00
Ming
b587476b97
issue #61 :
2010-09-06 02:21:05 +00:00
Ming
41b014f6ab
issue #61 :
2010-09-04 07:16:52 +00:00
Walzer
5fd1bf85b6
issue #121 , return bool in function init****
2010-09-04 04:02:52 +00:00
Ming
59afd38192
issue #116 : remove __super
2010-09-02 06:54:42 +00:00
Ming
ed023fc129
fixed #112
2010-09-01 07:36:25 +00:00
Walzer
92f2528ede
fixed #69 , complete CCTMXLayer
2010-08-31 07:11:13 +00:00
Ming
39c6ebf503
issue #85:remove the using of dynamic_cast()
2010-08-31 03:20:37 +00:00
Ming
7291056154
fixed #86
2010-08-25 09:21:38 +00:00
Ming
710e29b086
issue #80
2010-08-25 02:19:20 +00:00
Ming
17e866f5ac
issue #61
2010-08-20 01:31:35 +00:00
Walzer
29d9a489b8
issue #18 , debug
2010-08-19 06:11:35 +00:00
Ming
2f638dbe14
issue #55
2010-08-18 06:57:36 +00:00
Ming
c8ea0e7eb6
fixed #54
2010-08-17 06:25:41 +00:00
Ming
1f2117fb19
fixed #45
2010-08-13 03:18:31 +00:00
Ming
b4c8d88707
issue #45 : fix logic error of insertChild()
2010-08-13 02:54:30 +00:00
Ming
c8e031777c
issue #44 : fix some bugs
2010-08-13 02:05:35 +00:00
Ming
c2ed3d22ef
issue #44 : fix some bugs
2010-08-12 10:14:21 +00:00
Ming
3c658c27a5
issue #44 : fix some bugs
2010-08-12 09:01:51 +00:00
Ming
3e2ee37a8a
issue #35 : fixed some bugs
2010-08-09 03:46:35 +00:00
yangws
d30d8be81b
fixed bug: show currect image must run app twice.
2010-08-05 04:02:55 +00:00
yangws
08e72de8b4
issue #34 add setDeviceOrientation in CCXApplication class.
2010-08-05 02:29:29 +00:00
Ming
76f62adf62
fixed #30 : change some header files to include
2010-08-04 08:45:00 +00:00
Walzer
14427a24d7
2010-08-04 07:46:12 +00:00