3967 Commits

Author	SHA1	Message	Date
Dhilan007	6f39f903e3	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-17 16:23:19 +08:00
James Chen	fd0e84bfa2	Merge pull request #3963 from kpkhxlgy0/use ... closed #2994: Can't click the area that outside of keyboard to close keyboard when using EditBox	2013-10-17 00:36:33 -07:00
minggo	e50f9fc43b	issue #2905: jsbinding samples and lua binding samples build ok on android	2013-10-17 15:04:30 +08:00
XiaoLongHan	a2de02cc19	Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard.	2013-10-17 14:21:55 +08:00
Dhilan007	c6344875de	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-16 17:30:51 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
Dhilan007	5116e91c4b	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905	2013-10-16 11:00:22 +08:00
minggo	410280a8d3	Merge pull request #3945 from minggo/iss2905-adjust_folder ... issue #2905: testcpp bild ok on Android	2013-10-15 03:02:12 -07:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
Dhilan007	2865ad798b	issues #2905:Updating project configuration for folder change.	2013-10-15 10:18:37 +08:00
James Chen	438fe70287	issue #2905: [iOS, Mac] HelloCpp works now.	2013-10-14 15:53:14 +08:00
minggo	92e0dbe0c1	issue #2905:add ccUtils.cpp	2013-10-14 14:56:57 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
ThePickleMan	870f7de357	Readded trimmed semicolon	2013-10-13 23:12:41 -05:00
PickleMan	01ebb2ac29	Added triangle, quad bezier, cubic bezier drawing to DrawNode	2013-10-13 23:41:55 -04:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00