samuele3hu 32d056df18 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView		2013-09-04 14:03:21 +08:00
..
actions	fixes some macro names	2013-08-28 12:43:20 -07:00
base_nodes	uses std::sort() by default	2013-08-31 15:37:35 -07:00
cocoa	SpriteBatchNode: follows C++ best practices	2013-08-31 10:38:10 -07:00
draw_nodes	Use explicit boolean compare instead of implicit float -> boolean conversion	2013-08-12 14:21:58 -07:00
effects	Better destructors logs	2013-08-21 20:08:51 -07:00
include	revert back fps interval to 0.1s	2013-08-29 20:05:14 -07:00
kazmath	compiles on ARM	2013-08-30 21:08:28 -07:00
keyboard_dispatcher	fixed issues on win32 and mac keyboard	2013-07-02 11:39:18 +02:00
keypad_dispatcher	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
label_nodes	Merge branch 'develop' into dictionary_array_fixes	2013-08-21 21:27:44 -07:00
layers_scenes_transitions_nodes	Merge remote-tracking branch 'parent/develop' into develop	2013-08-26 21:36:38 +09:00
menu_nodes	fix warnings caused by deprecating some functions of Array	2013-08-22 10:45:47 +08:00
misc_nodes	Use C++ code in C++ comments.	2013-08-01 16:40:56 +08:00
particle_nodes	fix warnings caused by deprecating some functions of Array	2013-08-22 10:45:47 +08:00
platform	Add parameter in method cocos_android_app_init() to initialize plugin.	2013-09-02 16:10:08 +08:00
proj.emscripten	issue #2488: Updating project configurations for new Label classes.	2013-08-15 21:01:45 +08:00
proj.linux	updata: [cocos2d's code style] add space before backslash and return before else if	2013-08-16 16:10:39 +08:00
proj.nacl	issue #2430:move GLProgram enum into class	2013-07-25 17:48:22 +08:00
proj.qt5	Qt 5: Build fixes for Qt 5 platform	2013-08-01 09:20:17 +02:00
proj.tizen	[Tizen] Update project files.	2013-08-25 02:22:50 +09:00
proj.win32	issue #2433:Modify platform config and some test samples	2013-08-30 11:56:35 +08:00
script_support	issue #2764:Add TableView lua binding and releated test sample	2013-09-04 14:02:22 +08:00
shaders	Array & Dictionary fixes	2013-08-21 20:12:09 -07:00
sprite_nodes	removes 'private' section from SpriteBatchNode	2013-09-02 16:56:14 -07:00
support	SpriteBatchNode: follows C++ best practices	2013-08-31 10:38:10 -07:00
text_input_node	New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment	2013-07-26 16:04:21 -07:00
textures	Array & Dictionary fixes	2013-08-21 20:12:09 -07:00
tilemap_parallax_nodes	Merge branch 'develop' into dictionary_array_fixes	2013-08-21 21:27:44 -07:00
touch_dispatcher	Array & Dictionary fixes	2013-08-21 20:12:09 -07:00
Android.mk	issue #2434: add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files	2013-08-22 11:49:34 +08:00
CCCamera.cpp	issue #2462:use cocos2d-x c++ style	2013-08-08 16:31:44 +08:00
CCCamera.h	issue #2462:use cocos2d-x c++ style	2013-08-08 16:31:44 +08:00
CCConfiguration.cpp	issue #2533:add ATITC compressed texture support	2013-08-16 11:02:44 +08:00
CCConfiguration.h	issue #2533:add ATITC compressed texture support	2013-08-16 11:02:44 +08:00
CCDeprecated.cpp	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-27 22:06:30 +08:00
CCDirector.cpp	Merge branch 'develop' into dictionary_array_fixes	2013-08-21 21:27:44 -07:00
CCDirector.h	closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11.	2013-08-22 18:16:50 +08:00
CCScheduler.cpp	fix warnings caused by deprecating some functions of Array	2013-08-22 10:45:47 +08:00
CCScheduler.h	Use C++ code in C++ comments.	2013-08-01 16:40:56 +08:00
ccFPSImages.c	…
ccFPSImages.h	…
ccTypes.cpp	Adds more constants to Color	2013-08-22 17:19:07 -07:00
cocos2d.cpp	Fixes some warnings	2013-07-24 14:02:36 -07:00
cocos2dx-Prefix.pch	issue #2371: Deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder.	2013-07-05 10:52:46 +08:00