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
c02a9a4dd5
Setting apk file path at runtime in cocos2d-android.
2011-01-07 16:29:06 +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
1f08213563
HelloWorld runs ok on iphone
2011-01-07 11:27:42 +08:00
minggo
a391c8ef99
fixed some errors for iphone platform
2011-01-07 10:25:32 +08:00
minggo
99dd33f94a
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into upto-0.99.5
2011-01-07 09:33:09 +08:00
minggo
9a959c299f
fixed some errors of iphone platform
2011-01-07 09:35:27 +08:00
minggo
0a7b16f9c0
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
2011-01-06 14:15:45 +08:00
natural-law
e0570d43ad
Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful.
2011-01-06 14:04:03 +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
natural-law
1b37dd27ad
Fix bugs.Run HelloWorld successful.
2011-01-05 11:24:52 +08:00
natural-law
25e9721678
fix bugs.
2011-01-04 17:46:23 +08:00
natural-law
711f3a2906
modify YES to true,and No to false.
2010-12-31 17:56:46 +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
natural-law
3dfd530b38
Merge branch 'iss295' into upto-0.99.5
2010-12-31 09:48:48 +08:00
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
0a4ff84f87
fix an error of cocos2d-uphone.vcproj
2010-12-30 15:30:30 +08:00
minggo
8af9edbcf8
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
2010-12-30 14:44:34 +08:00
minggo
88de01d915
update some files in platfomr/iphone to 0.99.5
2010-12-30 14:22:25 +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
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
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
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
e7231f232c
fixed #276
2010-12-24 15:53:51 +08:00
minggo
c6b7fd82a9
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merger
2010-12-24 15:25:28 +08:00
minggo
d6fb209861
merged from minggo-upto-0.995 to upto-0.99.5
2010-12-24 15:21:57 +08:00
minggo
f92b0d514e
fixed #273
2010-12-24 15:04:26 +08:00