15 Commits

Author	SHA1	Message	Date
minggo	90448ec7d0	issue #1269:fix some compiling error because of including error header files	2012-06-19 16:20:46 +08:00
minggo	b4899ae46d	issue #1310: synchronize CCLabelTTF	2012-06-11 14:36:25 +08:00
James Chen	2238db301b	fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points.	2012-06-06 14:13:40 +08:00
James Chen	ad50d6ee57	fixed #1270: Fixed some warning on win32.	2012-05-29 17:11:33 +08:00
Walzer	1e732930b7	fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works.	2012-05-24 17:48:05 +08:00
James Chen	c7359ba1a0	fixed #1252: Added CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device.	2012-05-23 11:57:43 +08:00
James Chen	7cdb11b668	fixed #1215: fixed a bug in retina support for win32.	2012-05-03 15:05:19 +08:00
James Chen	5fc72581cb	issue #1204: Removed CCApplication::initInstance.	2012-05-02 17:50:26 +08:00
James Chen	edfb8c1f9c	issue #1190: used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg.	2012-04-26 11:39:49 +08:00
James Chen	af86a52f27	issue #1177:Updated some files for ios port.	2012-04-23 15:40:46 +08:00
James Chen	5b77e6e80e	Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform ... Conflicts: cocos2dx/platform/CCEGLViewProtocol.cpp cocos2dx/platform/CCEGLViewProtocol.h	2012-04-23 14:39:27 +08:00
James Chen	24515f009e	issue #1177: Updated ios project configuration.	2012-04-23 14:35:41 +08:00
James Chen	521155e9e2	issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.	2012-04-23 14:30:38 +08:00
James Chen	909a759ff6	issue #1177: Updated android project configuration.	2012-04-20 17:33:28 +08:00
James Chen	d1d0fd619a	issue #1177: Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration.	2012-04-20 15:23:00 +08:00