natural-law
34f45c8faa
Implement CCEventDispatcher.
2010-12-31 09:36:53 +08:00
minggo
942d0233cf
fixed #290
2010-12-30 17:30:11 +08:00
minggo
b0e5c06d37
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
2010-12-30 10:36:17 +08:00
minggo
da00d82117
fix some error in CCGrid and CCDirector.h
2010-12-30 10:28:13 +08:00
minggo
7b804d985b
merge yangws-upto-0.99.5 into upto-0.99.5
2010-12-30 10:25:35 +08:00
minggo
94c7f968e1
Merge branch 'minggo-upto-0.99.5' into upto-0.99.5
2010-12-29 18:18:14 +08:00
minggo
dc55c164ba
fixed #292
2010-12-29 18:01:37 +08:00
Li Lirong
e58ba468ee
fix some warnings under android
2010-12-29 10:30:42 +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
natural-law
05bf58b488
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
2010-12-28 17:24:56 +08:00
natural-law
a48b4b762b
update tileMap_parallax_nodes to 0.99.5.
2010-12-28 15:17:59 +08:00
minggo
355570ea8f
issue #292
2010-12-28 15:05:55 +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
yangws
afd9675854
CCParticleSystem upto-0.99.5
2010-12-27 17:39:15 +08:00
minggo
33ad2881b7
merge mingo-upto-0.99.5 to upto-0.99.5
2010-12-27 11:06:44 +08:00
minggo
28a3857f95
Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5
2010-12-27 10:59:03 +08:00
minggo
4e35a660dc
Merge branch 'upto-0.99.5' of https://github.com/yangws/cocos2d-x into yangws-upto-0.99.5
2010-12-27 10:55:59 +08:00
minggo
4cd3e59e2b
fixed #278
2010-12-27 10:26:56 +08:00
natural-law
46e78ab7a1
update layers_scenes_transition_nodes to 0.99.5.
2010-12-25 18:07:34 +08:00
yangws
c142070c2c
misc_node upto-0.99.5.
...
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-25 15:09:42 +08:00
natural-law
6ee16ce878
update menu_nodes to 0.99.5
2010-12-25 11:15:19 +08:00
minggo
07b774bc6f
Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5
2010-12-25 09:24:15 +08:00
natural-law
969e65b959
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
2010-12-24 17:33:18 +08:00
natural-law
4a64f899fe
update label_nodes to 0.99.5.
2010-12-24 17:07:31 +08:00
minggo
d6fb209861
merged from minggo-upto-0.995 to upto-0.99.5
2010-12-24 15:21:57 +08:00
natural-law
0f0a8ed956
rename the files related to label_nodes.
2010-12-24 14:00:49 +08:00
natural-law
e11ccb50fe
fixed #283 Add member data m_positionInPixels for some classes.
2010-12-24 11:40:44 +08:00
minggo
e3b49d7504
merge from minggo and natual-raw
2010-12-23 17:40:23 +08:00
natural-law
3c6d1d8317
update actions to 0.99.5
2010-12-23 16:47:29 +08:00
minggo
3692d01c5a
fixed #288
2010-12-23 14:18:08 +08:00
minggo
994a3b05ea
fixed #273
2010-12-23 11:19:56 +08:00
natural-law
eeb4e99804
rename the action classes.
2010-12-22 15:43:54 +08:00
natural-law
4a765d33a3
rename the CCXXXAction files to CCActionXXX.
2010-12-22 15:15:04 +08:00
Walzer
5c858b182c
issue #243 , fix warnings
2010-12-18 12:02:57 +08:00
Leon
96f4f5c9fd
fix some compiling warning for iOS
2010-12-17 23:44:19 +08:00
natural-law
2c84b167e0
fixed #258 Move FileUtils.h from path "support/file_support" to path "include".
2010-12-14 10:45:23 +08:00
natural-law
2706e3a003
fixed #251 CCKeypadDelegate implement
2010-12-13 14:10:39 +08:00
yangws
852c57d2c6
add CCLOG support on win32 and uphone
2010-11-23 18:20:46 +08:00
yangws
de97900b6c
CCLOG support for cocos2d-win32
2010-11-23 11:23:29 +08:00
Walzer
0ad77b779a
issue #211 don't checkout
2010-11-18 15:55:00 +00: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
natural-law
2b23e0f6d5
debug
2010-11-18 10:27:05 +00:00
Walzer
0a2567c646
SEL_MunuHandler -> SEL_MenuHandler & SimpleAudioEngine::sharedEngine
2010-11-17 08:31:48 +00:00
Walzer
fb25984f12
rename getShared methods to shared
2010-11-16 07:12:09 +00:00
Ming
0aab635d85
fixed #206
2010-11-16 04:02:45 +00:00
Ming
416a319344
fixed #203
2010-11-13 03:34:49 +00:00
Ming
6062cf1558
issue #202
2010-11-12 09:26:01 +00:00
Walzer
94806c9194
merge with tag/0.99.4-uphone-0.9.0
2010-11-11 03:18:58 +00:00
natural-law
000bdeeb42
issue #189
...
add support of Accelerometer sensor
2010-11-10 08:29:52 +00:00
Ming
6853385c8d
resolve compile error for android
2010-11-03 02:59:07 +00:00
Ming
992ad7e75d
fix the method of computing frame rate
2010-10-16 07:29:53 +00:00
Ming
0298500abe
add setContentScaleFactor()
2010-10-15 07:47:48 +00:00
Ming
7a9b417248
2010-10-11 10:05:34 +00:00
Ming
9febafadec
2010-10-09 08:23:58 +00:00
Walzer
77564d0017
add LAYER_NODE_FUNC & SCENE_NODE_FUNC
2010-10-09 06:23:47 +00:00
Walzer
371baf3efc
add NSSet::anyObject method
2010-10-01 15:05:05 +00:00
Walzer
1b385bfe20
fix warnings in NSSet & CCXUIImage_uphone. NSSet will alloc std::set in heap, instead of in stack, to avoid compile warning
2010-10-01 06:34:47 +00:00
Walzer
a6b03ce9ea
add type cast in "ccp" marco, to avoid warnings
2010-10-01 06:21:37 +00:00
Ming
0247182dc3
fixed #173
2010-09-30 07:54:15 +00:00
Walzer
72aee0eace
issue #175 , add retain for CCCallFunc::m_pSelectorTarget
2010-09-30 03:57:31 +00:00
Ming
683596a023
issue #170
2010-09-29 09:39:45 +00:00
Walzer
8633fa5d9e
issue #171
2010-09-29 08:33:52 +00:00
Walzer
f1c48be489
issue #171 , implement CGRectIntersectsRect
2010-09-29 08:06:03 +00:00
Walzer
b8f59f623d
issue #171 , implement CGRectIntersectsRect
2010-09-29 07:24:51 +00:00
Walzer
d93aae9133
issue #171 , add annotate for protected member variable
2010-09-29 04:03:21 +00:00
yangws
c8439ca79e
change CGPoint CGSize CGRect function's parameter pass by value to pass by reference,
...
impliment CGRectIntersectsRect function
2010-09-29 03:49:38 +00:00
Walzer
dad659641b
issue #171 , add @brief in class annotate
2010-09-29 01:44:57 +00:00
Ming
742baf4fdb
issue #170
2010-09-28 10:27:33 +00:00
Ming
68d3edc0d3
issue #170
2010-09-28 08:18:05 +00:00
Walzer
01eb8da314
issue #171 , modify object-c code in annotate.
2010-09-28 04:14:12 +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
5b82f4d468
issue #161,support *.jpg
2010-09-26 02:09:05 +00:00
Walzer
8de5442c0e
issue #161,update CCTMXLayer, CCTMXTiledMap, CCTextureCache
2010-09-25 02:28:27 +00:00
Ming
12d6df9717
issue #154
2010-09-24 10:10:32 +00:00
Walzer
156d1ff69b
issue #161,add CCSpriteBatchNode
2010-09-24 04:04:13 +00:00
Ming
a50b1b97bb
issue #151 : because now the r, g, b is correct, so we should not
...
change it
2010-09-21 08:15:23 +00:00
Ming
556b8ed455
issue #151 : change the function name
2010-09-18 07:44:56 +00:00
Ming
93135d1366
issue #151
2010-09-18 07:22:07 +00:00
Ming
622170528c
issue #141
2010-09-14 07:23:38 +00:00
natural-law
40b6d8500a
issue #139
...
Debug
2010-09-13 03:09:15 +00:00
natural-law
44ce8d9c5a
issue #143
...
Clear memory leaks
2010-09-11 08:18:18 +00:00
natural-law
143d8a3271
debug
2010-09-11 06:51:13 +00:00
Walzer
b2d950743b
issue 136, use NSDictionary in CCSpriteFrameCache
2010-09-10 06:08:25 +00:00
natural-law
2f438483e5
fixed #137
...
add SchedulerTest code
2010-09-09 08:15:21 +00:00
natural-law
2997a74699
issue #135
...
Add SpriteTest code
2010-09-09 02:17:38 +00:00
Ming
2abd0cbff7
issue #131
2010-09-08 02:04:06 +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
8eb885382e
issue #130
...
Add function to set the resource path
2010-09-07 08:05:18 +00:00
Walzer
641adefe1c
fixed #133 , override copyWithZone in class CCCallFuncN
2010-09-07 07:13:25 +00:00
natural-law
f94441141f
fixed #132
...
add AtlasTest code
2010-09-07 03:47:54 +00:00
Walzer
43672e1770
issue #114 , CCTMXTiledMap debug
2010-09-07 03:26:28 +00:00
Ming
4023e2830b
issue #131
2010-09-07 02:22:07 +00:00
Walzer
1c1971255e
fixed #129 , use NSString to make dictionary
2010-09-06 12:26:19 +00:00
yangws
4a52e5aaf9
impliment CCXEGLView for uPhone device.
2010-09-06 10:35:24 +00:00
Walzer
37458680a7
fixed #127 , add NSString
2010-09-06 06:54:14 +00:00
Ming
7131389535
issue #61 :
2010-09-06 05:52:57 +00:00
Walzer
4de7ff7a98
issue #114 , CCTMXTiledMap debug
2010-09-06 03:59:28 +00:00
Ming
031054abc6
issue #61 :
2010-09-06 03:58:14 +00:00
Ming
b842c135c3
issue #61 :
2010-09-06 03:55:56 +00:00
Ming
e975c403ba
issue #61 :
2010-09-06 02:57:21 +00:00
Walzer
907fb3f692
issue #126 , add retain when member variable is changed
2010-09-06 02:27:38 +00:00
Walzer
fee1ce8f09
fixed #124 , chipmunk done!
2010-09-04 10:18:14 +00:00
Walzer
4226dcede9
issue #61 , add retain for member variable
2010-09-04 10:06:26 +00:00
Walzer
5fd1bf85b6
issue #121 , return bool in function init****
2010-09-04 04:02:52 +00:00
Ming
f4681c4b53
issue #122
2010-09-04 03:55:42 +00:00
Ming
0dda718b87
issue #122
2010-09-04 03:48:11 +00:00
Ming
0468bbf3f3
issue #122
2010-09-04 03:30:39 +00:00
Ming
8b1e5f71c0
issue #122
2010-09-04 03:20:10 +00:00
Ming
9258d171aa
issue #119
2010-09-03 03:09:47 +00:00
Ming
9a12e848f5
fixed #118
2010-09-03 01:32:13 +00:00
Walzer
fea395cc79
issue #116 , remove include "support/data_support/CCArray.h" in CCTMXLayer.h
2010-09-02 07:48:47 +00:00
Ming
73d6ecb232
issue #116
2010-09-02 02:44:40 +00:00
Ming
6a4af3bcfd
issue #116
2010-09-02 02:33:39 +00:00
natural-law
b18e246eb9
fixed #115
...
add TileMapTest code
2010-09-01 09:30:51 +00:00
Walzer
ca8672ff62
fixed #113
2010-09-01 07:26:47 +00:00
natural-law
4b529493fc
fixed #110
...
add ParallaxTest code
2010-09-01 06:57:55 +00:00
Ming
c6789ef16d
fixed issue#111
2010-09-01 06:57:12 +00:00
Walzer
7bcb58ef78
2010-09-01 05:56:36 +00:00
Walzer
820676ea28
issue #18 , complete the implementation left.
2010-09-01 04:02:36 +00:00
Ming
05259df015
issue #61 : the destruction of NSObject should be virtual
2010-09-01 04:01:48 +00:00
Walzer
ff3d907846
issue 67, modify constructor
2010-08-31 10:11:31 +00:00
Walzer
3d91d1e58d
update to uphone-sdk-2010.08.26, which adds opengl headers
2010-08-31 08:53:25 +00:00
Walzer
a0ec92f6c4
fixed #71 , complete CCTMXTiledMap
2010-08-31 08:48:42 +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
b9587a7062
2010-08-30 07:45:39 +00:00
Walzer
4ac8acdf44
fixed #68 , complete CCTileMapAtlas
2010-08-30 07:23:07 +00:00
Ming
40158638ff
issue #85:remove the using of dynamic_cast()
2010-08-30 07:06:08 +00:00
natural-law
6e7fede2bb
fixed #103
...
add ActionManager Test code
2010-08-30 07:04:46 +00:00
Ming
821602a853
fixed #105
2010-08-30 05:42:17 +00:00
Walzer
1eeebfb6fb
fixed #70 , CCTMXObjectGroup
2010-08-30 03:45:46 +00:00
Ming
0cdfba141a
issue #85 : make CCRepeatForever to inherit from CCIntervalAction
2010-08-28 10:00:38 +00:00
Ming
1e7e3f6854
fixed #102 : CCRANDOM_0_1() has an error, it always return 0
2010-08-28 09:42:12 +00:00
natural-law
b1c7636632
fixed #100
...
Modify the variable type of CCAction::m_pTarget form NSObject to CCNode
2010-08-28 04:02:10 +00:00
Ming
32c2e83b3f
issue #98
2010-08-28 02:56:18 +00:00
Walzer
408a34603b
fixed #72 , complete CCTMXLayerInfo
2010-08-27 10:07:37 +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
Ming
60adec78e8
issue #85 : avoid virtual inheriting from NSObject, and remove the using of dynamic_cast()
2010-08-27 06:13:32 +00:00
natural-law
738ed042fa
fixed #97
...
add Touches Test code
2010-08-27 03:53:35 +00:00
Walzer
2aca691689
issue #96 , add CCTMXXMLParser files
2010-08-26 09:53:35 +00:00
natural-law
7fd86b7734
fixed #95
...
add CocosNode Test code
2010-08-26 07:09:02 +00:00
Walzer
2658199ead
issue #82 : debug
2010-08-26 06:06:41 +00:00
natural-law
82f316a247
issue #78
...
modify Particle Test code
2010-08-26 03:39:26 +00:00
Walzer
0e053e2703
issue #91 , debug CCParallaxNode
2010-08-26 03:34:22 +00:00
Walzer
2ad752d206
fixed #91 , implement CCParallaxNode
2010-08-26 03:30:52 +00:00
natural-law
b47d47b3b5
fixed #93
...
add DrawPrimitives Test code
2010-08-26 02:53:49 +00:00