7 Commits

Author	SHA1	Message	Date
Ricardo Quesada	453b670ad2	Removes CCVertexAttribBind	2014-05-08 14:01:26 -07:00
Ricardo Quesada	087378926f	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-08 10:16:09 -07:00
Dhilan007	52d7d804f7	Update XCode project.pbxproj for add files related to VideoWidget.	2014-05-08 18:28:28 +08:00
Ricardo Quesada	b401f6adc1	Lots of new code ... Adds GLProgramState	2014-05-07 20:20:19 -07:00
yangxiao	bbd4533c5e	Improves GLProgram ... Adds vetex attrib bind class	2014-05-06 11:03:24 -07:00
andyque	47acbc24e0	issue #4861, add CCEventFocus and CCEventListener	2014-05-05 11:37:38 +08:00
James Chen	8cbcf17163	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00