15 Commits

Author	SHA1	Message	Date
samuele3hu	cc95fcaa69	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode	2013-07-28 14:35:38 +08:00
samuele3hu	3aeefb51b3	Modify deprecated CCPhysicsDebugNode typedef and some test bug	2013-07-28 14:33:02 +08:00
James Chen	ab84dacf8f	issue #2430: CCBValue::Type is strong enum type now.	2013-07-28 00:26:24 +08:00
James Chen	584402984b	Adding deprecated constants for CCBReader.	2013-07-27 23:04:14 +08:00
James Chen	e66e429bb2	issue #2430: Moving enum type to class for CCBReader.	2013-07-27 21:44:49 +08:00
James Chen	feadd2b2dd	issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'. ... Also added more deprecated constants.	2013-07-27 00:55:41 +08:00
James Chen	58a3560bca	More enum class: ScrollView::Direction, TableView::VerticalFillOrder	2013-07-26 22:55:41 +08:00
James Chen	2bfccb4a43	A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType	2013-07-26 21:36:32 +08:00
minggo	a7c1904eb8	issue #2430:move EditBox enum into class	2013-07-26 17:45:01 +08:00
minggo	f55d73194e	issue 2430:use enum class for Control enum values	2013-07-26 14:37:26 +08:00
James Chen	477dd6c3c7	issue #2404: cocos-ext include WebSocket.h and SocketIO.h now. WebSocket.h doesn't depend on <libwebsockets.h> now.	2013-07-25 10:33:19 +08:00
James Chen	762b987ae7	issue #2404: [Extensions] Updating the file for deprecated methods.	2013-07-24 18:00:40 +08:00
James Chen	debd1965c9	Merge branch 'deprecation' of https://github.com/azmeuk/cocos2d-x into iss2404-ext-deprecated ... Conflicts: cocos2dx/include/CCDeprecated.h	2013-07-24 16:53:14 +08:00
Éloi Rivard	2875284882	emscripten bugfix	2013-07-23 08:58:43 +02:00
Éloi Rivard	36065400bc	Created CCDeprecated-ext	2013-07-23 08:58:43 +02:00