20 Commits

Author	SHA1	Message	Date
natural-law	6bde512cbe	[android]issue #268,support more fonts on cocos2d-android.	2011-01-21 17:32:11 +08:00
walzer	ad5ee3c9f6	Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.	2011-01-17 16:21:11 +08:00
minggo	7e30615d02	issue #304 Remove codes for controlling frame rate.	2011-01-10 15:13:30 +08:00
minggo	a391c8ef99	fixed some errors for iphone platform	2011-01-07 10:25:32 +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	711f3a2906	modify YES to true,and No to false.	2010-12-31 17:56:46 +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	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	dc55c164ba	fixed #292	2010-12-29 18:01:37 +08:00
yangws	5e377f9368	issue #281 CCParticleSystemPoint.h upto-0.99.5	2010-12-28 11:09:40 +08:00
minggo	33ad2881b7	merge mingo-upto-0.99.5 to upto-0.99.5	2010-12-27 11:06:44 +08:00
natural-law	01cd90f2cc	update layers_scenes_transition_nodes to 0.99.5.	2010-12-27 09:40:45 +08:00
natural-law	6ee16ce878	update menu_nodes to 0.99.5	2010-12-25 11:15:19 +08:00
minggo	e7231f232c	fixed #276	2010-12-24 15:53:51 +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