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
|
bb7485621e
|
issue #1056: Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.
|
2012-03-28 21:44: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
|
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
|
7d04254855
|
issue #1056: Updated some files.
|
2012-03-26 22:37:09 +08:00 |
James Chen
|
85c13998ee
|
issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
|
2012-03-26 16:46:23 +08:00 |
James Chen
|
c5d0b1ca6f
|
issue #1056: Updated ParticleTest.
|
2012-03-22 18:29:07 +08:00 |
James Chen
|
35d93328b9
|
issue #1056: 1.Fixed a bug of double delete TouchDispatcher.
2. Modified the last parameter of glDrawElements. It will cause crash on some devices if the last parameter which means Indices's pointer is zero.
|
2012-03-21 21:53:03 +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
|
aefdb852a2
|
issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
|
2012-03-14 14:55:17 +08:00 |
dumganhar
|
baf3755142
|
remove some '__QNX__' macros
|
2011-12-12 16:14:12 +08:00 |
dumganhar
|
bfdb908d01
|
add Cocos2dx project
add HelloWorld project and rename proj.blackberry fold to proj.qnx
|
2011-12-06 14:56:37 +08:00 |
minggo
|
f0d22ae504
|
issue #879: replase assert with CCAssert
|
2011-11-28 17:28:43 +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
|
4ad422defd
|
make tests run ok on linux android
|
2011-09-27 20:36:21 -07:00 |
laschweinski
|
871abb4a32
|
Merge branch 'master' into LinuxPort
|
2011-08-19 13:20:23 +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 |
laschweinski
|
5d20ebe24b
|
modified: HelloWorld/AppDelegate.cpp
modified: HelloWorld/HelloWorldScene.cpp
modified: cocos2dx/cocoa/CCNS.cpp
modified: cocos2dx/include/CCActionInstant.h
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
modified: cocos2dx/platform/CCAccelerometer_platform.h
modified: cocos2dx/platform/CCApplication_platform.h
modified: cocos2dx/platform/CCArchOptimalParticleSystem.h
modified: cocos2dx/platform/CCCommon.cpp
modified: cocos2dx/platform/CCEGLView_platform.h
modified: cocos2dx/platform/CCGL.cpp
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
modified: cocos2dx/platform/CCPlatformConfig.h
modified: cocos2dx/platform/CCPlatformMacros.h
modified: cocos2dx/platform/CCSAXParser.h
modified: cocos2dx/platform/CCStdC.h
modified: cocos2dx/support/CCUserDefault.cpp
modified: cocos2dx/support/data_support/ccCArray.h
modified: tests/AppDelegate.cpp
deleted: tests/Res/music.mid
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
|
2011-08-17 11:36:54 +08:00 |
natural-law
|
a7404dc2bf
|
fixed #639, Initialize the m_tPosition of CCParticleSystem with the setter.
|
2011-07-28 16:16:51 +08:00 |
minggo
|
d48c3fdfb1
|
upgrade to 1.0.0-final 07-11
|
2011-07-12 11:20:41 +08:00 |
minggo
|
8e370eeb10
|
fix some compiling warnings
|
2011-07-07 11:27:45 +08:00 |
natural-law
|
2bc8427b3c
|
Resolve the bug of some particle test cases can't be shown.
|
2011-07-07 11:02:47 +08:00 |
minggo
|
6cb945a8ca
|
fix bug of particle_node when upgrade to rc3
|
2011-07-06 18:16:19 +08:00 |
minggo
|
ff50997eb0
|
issue #574
|
2011-07-06 14:56:05 +08:00 |
minggo
|
0e6bf40e7c
|
fixed #561: upgrade particle_nodes to 1.0.0-rc3
|
2011-07-04 19:20:16 +08:00 |
liswei
|
7c669cfcb4
|
fixed #523 [all] CCParticleSystemQuad::particleWithFile can't work correctly
|
2011-06-14 16:27:47 +08:00 |
liswei
|
1591c7edc8
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +08:00 |
natural-law
|
d4dbedca4d
|
fixed #451,remove the code of support mac platform.
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
|
2011-04-11 11:24:10 +08:00 |
yangws
|
041953151a
|
issue #439 CCFileData and imageWithImageFile modified on win32.
|
2011-03-29 11:41:44 +08:00 |
walzer
|
08a5f8029e
|
issue #418 add copyright of original authors to particle module
|
2011-03-19 10:07:16 +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
|
34a6ca5208
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
cocos2dx/platform/win32/CCXUIImage_win32.cpp
cocos2dx/platform/win32/CCXUIImage_win32.h
tests/test.win32/test.win32.vcproj
|
2011-01-28 14:33:47 +08:00 |
yangws
|
76ea63da7f
|
Change prefix CCX to ccx.
|
2011-01-27 17:07:36 +08:00 |
natural-law
|
3746af1d63
|
fixed #328.Modify the function and parameter name.
|
2011-01-26 15:43:12 +08:00 |
natural-law
|
7015e85918
|
fixed #328.By default,pop up a err dialog when loading textures failed.
|
2011-01-26 11:50:13 +08:00 |
yangws
|
333f0b5574
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
HelloWorld/AppDelegate.cpp
cocos2dx/particle_nodes/CCParticleSystem.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
tests/AppDelegate.cpp
|
2011-01-20 11:18:35 +08:00 |
walzer
|
a9f90256b8
|
fix the wrong direction of particle system
|
2011-01-20 10:21:41 +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
|
79b711a758
|
move CCXBitmapDC from cocos2d/platform to platform_support.
|
2011-01-19 14:23:26 +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
|
78a7329054
|
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
|
2011-01-08 09:27:58 +08:00 |
natural-law
|
ec7fbd0e69
|
Fix bugs.
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
|
2011-01-07 11:30:19 +08:00 |
minggo
|
e312bb4d18
|
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merger
|
2011-01-06 10:24:29 +08:00 |
natural-law
|
0d2d746aec
|
Fix bugs.Run tests in cocos2d-uphone successful.
|
2011-01-05 17:01:08 +08:00 |
minggo
|
f3e8665387
|
remove the usage of YES and NO
|
2010-12-31 16:37:00 +08:00 |
minggo
|
d0a16a246e
|
fixed comipling error and link error of upto-0.99.5
|
2010-12-31 14:56:24 +08:00 |
minggo
|
7b804d985b
|
merge yangws-upto-0.99.5 into upto-0.99.5
|
2010-12-30 10:25:35 +08:00 |
yangws
|
0edf124e4f
|
issue #281 CCParticleExamples upto-0.99.5
|
2010-12-28 14:04:28 +08:00 |
yangws
|
706f97114b
|
issue #281 CCParticleSystemQuad upto-0.99.5
|
2010-12-28 11:55:34 +08:00 |
yangws
|
5e377f9368
|
issue #281 CCParticleSystemPoint.h upto-0.99.5
|
2010-12-28 11:09:40 +08:00 |
minggo
|
b2b8591b26
|
fixed #279
|
2010-12-28 10:23:14 +08:00 |
yangws
|
afd9675854
|
CCParticleSystem upto-0.99.5
|
2010-12-27 17:39:15 +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
|
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
|
94806c9194
|
merge with tag/0.99.4-uphone-0.9.0
|
2010-11-11 03:18:58 +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
|
b2d950743b
|
issue 136, use NSDictionary in CCSpriteFrameCache
|
2010-09-10 06:08:25 +00:00 |
Walzer
|
a1f3f89517
|
fixed #134, save plist file name
|
2010-09-08 01:52:30 +00:00 |
Walzer
|
64d0d7a7e1
|
fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage
|
2010-09-08 01:28:28 +00:00 |
Walzer
|
4b86b49b08
|
fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage
|
2010-09-07 10:04:57 +00:00 |
natural-law
|
bd796c7452
|
issue #130
Add function to set the resource path
|
2010-09-07 08:30:31 +00:00 |
natural-law
|
8eb885382e
|
issue #130
Add function to set the resource path
|
2010-09-07 08:05:18 +00:00 |
Ming
|
b12fac2958
|
issue #61:
|
2010-09-06 02:04:28 +00:00 |
Walzer
|
4226dcede9
|
issue #61, add retain for member variable
|
2010-09-04 10:06:26 +00:00 |
Walzer
|
43a4664534
|
issue #114, CCTMXTiledMap debug
|
2010-09-02 07:31:37 +00:00 |
Ming
|
59afd38192
|
issue #116: remove __super
|
2010-09-02 06:54:42 +00:00 |
Walzer
|
aec3660ec4
|
issue #18, debug
|
2010-08-28 08:28:30 +00:00 |
Walzer
|
cac04e3bfc
|
issue #18, debug
|
2010-08-28 08:23:03 +00:00 |
Walzer
|
2367ceed67
|
issue #82: debug CCParticleSystem::initWithDictionary ,break and return false if there is something wrong
|
2010-08-27 07:17:15 +00:00 |
Walzer
|
daa63cebda
|
issue #82: implement initWithDictionary
|
2010-08-26 09:22:23 +00:00 |
Walzer
|
2658199ead
|
issue #82: debug
|
2010-08-26 06:06:41 +00:00 |
Ming
|
7291056154
|
fixed #86
|
2010-08-25 09:21:38 +00:00 |
Ming
|
32fbef7d34
|
issue 82: remove the including of "platform/platform.h"
|
2010-08-25 06:37:40 +00:00 |
Walzer
|
b34b5b379e
|
issue #82: debug , undefine CCDictionary
|
2010-08-25 03:36:57 +00:00 |
Walzer
|
96a1e4f5ec
|
|
2010-08-25 03:18:59 +00:00 |
Ming
|
710e29b086
|
issue #80
|
2010-08-25 02:19:20 +00:00 |
Walzer
|
cbccd4b1f8
|
issue #62, debug
|
2010-08-24 09:12:16 +00:00 |
Walzer
|
e838e5c8b9
|
issue #62, debug
|
2010-08-24 06:40:30 +00:00 |
Walzer
|
2051869da5
|
issue #62, debug
|
2010-08-24 06:30:03 +00:00 |
Walzer
|
df7092b83b
|
issue #62, debug
|
2010-08-23 09:53:43 +00:00 |
Walzer
|
0fd94875fb
|
fixed #62, complete particle system
|
2010-08-23 06:57:37 +00:00 |