..
actions
Merge pull request #3347 from timothyqiu/docfix
2013-08-01 18:22:43 -07:00
base_nodes
small fix to make it compile with std::vector too
2013-08-19 17:33:23 -07:00
cocoa
Removed Iterator class
2013-08-21 20:03:45 -07:00
draw_nodes
Use explicit boolean compare instead of implicit float -> boolean conversion
2013-08-12 14:21:58 -07:00
effects
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
include
Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean
2013-08-13 11:28:54 -07:00
kazmath
Add new platform: CC_PLATFORM_QT5
2013-07-24 20:18:43 +02: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
issue #2488 : Fixing a warning in CCFontFreeType.cpp.
2013-08-15 21:39:03 +08:00
layers_scenes_transitions_nodes
Merge pull request #2950 from zcgit/develop
2013-08-19 19:02:53 -07:00
menu_nodes
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
misc_nodes
Use C++ code in C++ comments.
2013-08-01 16:40:56 +08:00
particle_nodes
closed #2522 : Fix some coding style.
2013-08-12 17:05:19 +08:00
platform
cocos2d in lowercase
2013-08-20 14:17:43 -07: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-10 23:11:31 +09:00
proj.win32
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode
2013-08-16 11:14:47 +08:00
script_support
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
shaders
ccGLXXX -> GL::xxx
2013-07-25 18:42:53 -07:00
sprite_nodes
Fixes crash when reordering
2013-08-19 17:27:31 -07:00
support
Uses high resolution clock for Profiling
2013-08-20 16:06:34 -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
issue #2533 : resolve some conflicts
2013-08-16 14:27:13 +08:00
tilemap_parallax_nodes
Compiles with improved CCArray
2013-08-19 17:09:28 -07:00
touch_dispatcher
Compiles with improved CCArray
2013-08-19 17:09:28 -07:00
Android.mk
updata: [cocos2d's code style] add space before backslash and return before else if
2013-08-16 16:10:39 +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
issue #2462:use cocos2d-x c++ style
2013-08-08 16:31:44 +08:00
CCDirector.h
issue #2462:use cocos2d-x c++ style
2013-08-08 16:31:44 +08:00
CCScheduler.cpp
issue #2430:use const member variable instead of macro
2013-07-25 21:04:32 +08:00
CCScheduler.h
Use C++ code in C++ comments.
2013-08-01 16:40:56 +08:00
ccFPSImages.c
issue 2217: Removing unused fps_image png data.
2013-05-23 16:04:40 +08:00
ccFPSImages.h
issue 2217: Removing unused fps_image png data.
2013-05-23 16:04:40 +08:00
ccTypes.cpp
Constant fixes
2013-07-25 13:36:19 -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