4 Commits

Author	SHA1	Message	Date
Nicolas Gramlich	13bcf2180c	Merge with gles20.	2012-06-15 16:26:10 -07:00
James Chen	595a402c83	fixed #1292:make some function names more readable.	2012-06-15 16:47:30 +08:00
Nicolas Gramlich	cdd1fb50ac	Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY*	2012-06-14 00:01:01 -07:00
Nicolas Gramlich	29b22adccc	Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work.	2012-06-13 14:19:13 -07:00