9 Commits

Author	SHA1	Message	Date
Dhilan007	abef5b59fa	fix compile error for vs project	2013-12-10 21:20:52 +08:00
Huabing.Xu	e14295c404	Merge branch 'develop' into free_instead_of_delete	2013-11-15 09:45:03 +08:00
chengstory	e9f5e889d6	fixed #3185 replace NULL to nullptr.	2013-11-14 14:05:24 +08:00
CaiWenzhi	03b3d583e8	Modify scenereader	2013-11-13 10:16:16 +08:00
boyu0	6c1144ee79	issue #2770: fix some warning	2013-11-11 12:49:38 +08:00
CaiWenzhi	7a207431cd	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch ... Conflicts: cocos/gui/UIHelper.h	2013-11-06 16:13:10 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
Ricardo Quesada	84a6aa29cd	Adds more 64-bit fixes ... Replaces more `int` with `long` where it makes sense. Also , it repalces some `unsigned long` with `long` for "lenght" values as described in our c++ guideline	2013-11-05 17:36:44 -08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00