12270 Commits

Author	SHA1	Message	Date
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	1751cc3d89	Merge pull request #3935 from minggo/remove-subfolder ... issue #2905: remove sub folders except platform	2013-10-13 18:40:02 -07:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00
minggo	5182a3c978	Merge pull request #3933 from minggo/iss2905-adjust_folder ... adjust folder structure	2013-10-12 00:27:48 -07:00
minggo	8eeb911e8f	issue #2905: adjust folder structure	2013-10-12 15:25:45 +08:00
James Chen	f6275667bf	Removing unused ios projects.	2013-10-12 15:02:28 +08:00
James Chen	7de6646213	Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder.	2013-10-12 14:56:40 +08:00
minggo	19ee87e29a	issue #2905: step2 Box2D -> box2d	2013-10-12 14:03:04 +08:00
minggo	1f38636e84	issue #2905: step1 Box2D -> box2d	2013-10-12 14:02:13 +08:00
minggo	5acbe663e0	issue #2905: add missing files	2013-10-12 13:44:57 +08:00
minggo	ad6325b0dd	fix conflicts	2013-10-12 11:31:32 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00