10 Commits

Author	SHA1	Message	Date
minggo	6abe6fce78	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
minggo	5d9fea1416	issue #2393:mark PointZero RectZero and SizeZero as deprecated	2013-07-12 14:47:36 +08:00
minggo	15096b0716	issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated	2013-07-12 14:30:26 +08:00
minggo	bb758df0d0	issue #2393:mark ccp as deprecated	2013-07-12 14:11:55 +08:00
Ricardo Quesada	cf262c28e2	getInstance() / destroyInstance() are used... ... ... instead of sharedXXX / purgeXXX. They are more C++ friendly, and also easier to remember. common files + Mac files + iOS files + tests/samples files were updated. The old methods are deprecated now.	2013-07-11 15:24:23 -07:00
James Chen	dcaa55e622	Warning fixes for TestCpp. Using lambda, CC_CALLBACK_1 and clone pattern.	2013-06-21 14:15:20 +08:00
James Chen	1fb9f44d15	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
James Chen	0ca86db0ff	fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it.	2013-06-03 10:12:55 +08:00
James Chen	8e15cdf5fd	WS_ERROR -> ERROR, WS_STATE -> STATE.	2013-06-01 19:51:10 +08:00
James Chen	05a88c89dc	fixed #1647: Adding WebSocket support for Cpp and JSB.	2013-05-31 23:13:03 +08:00