Commit Graph

147 Commits

Author SHA1 Message Date
Rohan Kuruvilla be305f84b6 Fixing bug where it doesn't use embedded texture data, if texture filename is not available 2013-01-24 18:37:23 -08:00
James Chen f70e4db254 fixed : Getting full path will fail if texture name in the plist is without relative path. 2013-01-17 11:42:41 +08:00
James Chen 6733f786a5 fixed : Reverted some invokings of function that returns const reference. 2013-01-14 16:06:18 +08:00
James Chen 6565fa92cc fixed : Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
James Chen b62d254f63 fixed : Added return pointer check. 2012-12-27 16:07:48 +08:00
James Chen ac7755e68b fixed : TestCpp crashes when running ActionEaseTest after running ParticlesTest 2012-12-27 15:42:55 +08:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
folecr fc65b786ad Use the "old" particle system quad code. 2012-11-30 13:22:01 -08:00
James Chen 3fc2f9888b issue : Fix crash of ParticlesTest. 2012-11-21 17:22:26 +08:00
James Chen ebd522e3fa issue : Return a new object instead of 'const reference' for some get methods. 2012-11-20 16:34:55 +08:00
minggo e19b418c62 issue : update to v2.1 beta3 2012-11-15 17:16:51 +08:00
minggo a701eaecce issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
James Chen 6d1a7e089b fixed : Removed CCParticleFire::create(const char* pListFile) since particle can be constructed from plist by CCParticleSystemQuad::create(plist). 2012-11-08 12:55:32 +08:00
James Chen 4d48e79d47 fixed : Added a newline at the end of firePngData.h file. 2012-11-08 12:06:02 +08:00
James Chen 4a37c8fa8b fixed : Set a defaut texture for CCParticleFire, CCParticleFireworks, etc.
Added some static constructors.
2012-11-08 12:03:49 +08:00
James Chen 0ace12fc52 issue : Moved implementations of static functions in CCParticleExample.h, CCLayer.h to CCParticleExample.cpp, CCLayer.cpp. 2012-11-01 22:17:12 +08:00
walzer 06f639edab update copyright to 2012, update cocos2d version to 2.0.3
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
2012-09-24 21:22:20 +08:00
Rohan Kuruvilla 423bdf3f5a Adding createWithTotalParticles static function to CCParticleSystemQuad 2012-09-20 18:02:17 -07:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
James Chen 7c5b3c472e Added CCParticleSystem::createWithTotalParticles. 2012-08-29 14:49:03 -07:00
Walzer cc3d850892 fixed , add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
Walzer 685b70e6fb fixed , résolve conflicting "create" functions
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
minggo f9c40f7372 issue : work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
James Chen a901b0bb12 fixed : Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
James Chen f8ebbccb98 fixed : Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify 2012-06-20 14:38:13 +08:00
James Chen 24e3ec7499 fixed : Updated comment information for deprecated apis. 2012-06-20 14:31:36 +08:00
James Chen b818c0afa6 fixed : Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen 595a402c83 fixed #1292:make some function names more readable. 2012-06-15 16:47:30 +08:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
James Chen 052d8ea931 fixed : Added some create methods. Compiling successfully on win32 by vs2008. 2012-06-14 18:32:44 +08:00
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
2012-06-14 17:36:31 +08:00
James Chen 740e28dbc1 issue : Uncommented old interfaces. 2012-06-14 17:29:23 +08:00
James Chen 7fe3f7357e issue : Reverted old interfaces. 2012-06-14 17:18:05 +08:00
James Chen 23574172ff issue : Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen 3f7b44fc23 issue : Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
Nicolas Gramlich e2a1a246a0 Converted removed all Carriage Returns (dos line-endings, ^M.) in cocos2dx, except in the windows project/platform files. 2012-06-13 14:26:28 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
James Chen 12a9d13443 issue : Synchronize to RC2, HelloWorld works ok on win32. 2012-06-08 16:54:38 +08:00
James Chen 76a560a474 issue : Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
James Chen 26cf81e42e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
	cocos2dx/CCScheduler.h
	cocos2dx/include/ccTypes.h
2012-06-08 14:14:13 +08:00
James Chen c5cf23c859 issue : First commit since sync to rc2. 2012-06-08 14:11:48 +08:00
minggo cc16320445 issue : syncronize actions 2012-06-08 13:55:28 +08:00
Nicolas Gramlich 8576837e5e CCParticleSystemQuad: Added CCParticleSystemQuad::node(). 2012-06-01 16:38:43 -07:00
James Chen ad50d6ee57 fixed : Fixed some warning on win32. 2012-05-29 17:11:33 +08:00
James Chen d5f52335d5 fixed : Wrote some comments in CCParticleSystem. 2012-05-23 11:26:21 +08:00
James Chen d998b54269 fixed : Memory leak in CCParticleSystem::initWithDictionary() 2012-05-23 11:18:04 +08:00
James Chen c5f7f15090 issue : Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView. 2012-04-27 18:47:49 +08:00