Commit Graph

100 Commits

Author SHA1 Message Date
James Chen 275891dfb0 issue : synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
James Chen 9e89171557 issue : Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class. 2012-03-15 10:42:22 +08:00
James Chen 8aa3f7f9ae issue : TestCases works ok except Box2dTest and ChipmunkTest. 2012-03-14 18:11:25 +08:00
James Chen aefdb852a2 issue : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
minggo f0d22ae504 issue : replase assert with CCAssert 2011-11-28 17:28:43 +08:00
U-zhangxm-PC\zhangxm d84b6c25be issue : merge bada branch and fix some error 2011-11-18 18:45:05 +08:00
dumganhar 5704fdc146 Merge branch 'testMP_static_lib' into newest 2011-11-13 01:05:22 +08:00
dumganhar 25ab866557 when CCTextureAtlas::resizeCapacity, should
glDeleteBuffers(2, m_pBuffersVBO);
// initial binding
glGenBuffers(2, &m_pBuffersVBO[0]);
otherwise, CCSpriteBatchNode will have a bug the can't draw more than one sprite on bada 2.0 device.
2011-11-13 00:57:05 +08:00
dumganhar ca3b91855a debug issue 2011-11-10 16:44:58 +08:00
dumganhar a81b078286 fixed a bug in calloc(0) return NULL. 2011-11-08 15:59:51 +08:00
Leon 70a4942ea6 fix some warning 2011-10-19 15:24:19 +08:00
minggo a7e8c36eee invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n) 2011-08-23 17:04:38 +08:00
Leon 771e2349c5 fix some warnings under xcode 4.0 llvm compiler 2011-08-10 22:39:02 +08:00
minggo f894e00f27 fix a bug of CCProgressTimer when upgrade to rc3 2011-07-06 16:29:56 +08:00
minggo 0d80326392 fixed : upgrade textures to 1.0.0-rc3 2011-07-05 10:47:25 +08:00
minggo 6482f5662b fixed : upgrade label_nodes to 1.0.1-rc3 2011-07-04 10:59:35 +08:00
liswei 1591c7edc8 fixed fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
minggo 113f1ab2ef fixed : solve a potential issue 2011-05-06 18:09:31 +08:00
walzer 81fa070125 fixed , add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
minggo b5a99f90df issue : rename file names and object names 2011-03-07 17:11:57 +08:00
yangws 804dc4ef7c Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/win32/CCXBitmapDC.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
2011-01-19 15:29:08 +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 5155980ef9 fixed #309,optimize code. 2011-01-11 13:57:13 +08:00
natural-law 237042f7dd fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
minggo d0a16a246e fixed comipling error and link error of upto-0.99.5 2010-12-31 14:56:24 +08:00
minggo 942d0233cf fixed 2010-12-30 17:30:11 +08:00
Walzer 820c2f0714 issue cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Ming 416a319344 fixed 2010-11-13 03:34:49 +00:00
Ming 6062cf1558 issue 2010-11-12 09:26:01 +00:00
Ming 6853385c8d resolve compile error for android 2010-11-03 02:59:07 +00:00
Walzer a279e5dc9b issue 169, we should retain the new variable first, and then release the old one. assignment at last. 2010-09-27 10:19:10 +00:00
Walzer fce216a111 issue , initialize the pointer 2010-09-06 06:15:06 +00:00
Ming 6e9ca000e5 issue : 2010-09-06 03:53:41 +00:00
Ming ee75a8c033 issue : 2010-09-06 03:50:24 +00:00
Ming cee96f55a7 issue : 2010-09-04 07:24:26 +00:00
Walzer 5fd1bf85b6 issue , return bool in function init**** 2010-09-04 04:02:52 +00:00
Ming 37ea7dd914 issue : remove the using of sprintf_s, because it is VC specific 2010-09-03 03:49:10 +00:00
Walzer e08807083c issue , debug, change description 2010-08-06 08:05:19 +00:00
Walzer 324a9fac83 issue , debug 2010-08-06 06:32:32 +00:00
Walzer 14427a24d7 2010-08-04 07:46:12 +00:00
Ming a324e38cb2 issue : change INT32 to int, change UINT to unsigned int 2010-08-02 02:58:00 +00:00
Walzer 88ce1c8f83 issue , implement 2010-07-30 08:35:07 +00:00
Walzer b34c778e79 issue , remove unusable include in .h 2010-07-22 10:39:40 +00:00
Walzer 9934149257 issue , change string to const char* 2010-07-22 03:15:25 +00:00
Walzer 59c7a734ba issue , implement .cpp 2010-07-21 09:40:10 +00:00
Walzer adbf70a033 issue , implement .cpp 2010-07-21 03:13:32 +00:00
Walzer 5d60c2ca0a issue , change the use of NSMutableArray 2010-07-20 05:49:13 +00:00
Walzer c61ceb8020 issue : complete CCTextureAtlas, done CCTextureCache partly 2010-07-16 08:28:11 +00:00
Walzer aaf5b5859f issue : add CCTextureAtlas.h and implement CCTextureAtlas.cpp partly, add CCTextureCache.h 2010-07-16 06:15:06 +00:00