..
actions
More verbose logging in removeChildByTag and getActionByTag
2013-04-27 23:15:00 +04:00
base_nodes
fixed #2217 : Updating logic when m_bIgnoreContentScaleFactor is enabled.
2013-05-23 16:12:04 +08:00
cocoa
CCConfiguration extension (rewritten)
2013-05-22 13:00:34 -07:00
draw_nodes
Fix incorrect colors in CCDrawNode.
2013-05-07 10:15:50 -03:00
effects
Coordinates are already in terms of pixels -- no need to do content scaling
2013-05-17 17:08:46 -07:00
include
Adding defines and enums for Tizen.
2013-05-16 19:49:16 +09:00
kazmath
Add new port: Native Client
2013-03-02 12:15:24 -08:00
keypad_dispatcher
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
label_nodes
Removing unused variable
2013-06-03 09:17:03 -04:00
layers_scenes_transitions_nodes
Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it.
2013-05-06 20:59:48 -07:00
menu_nodes
Fixing compilation errors.
2013-05-07 15:51:58 +08:00
misc_nodes
Merge pull request #2521 from minggo/emscriptenate
2013-05-06 23:51:38 -07:00
particle_nodes
Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x
2013-03-25 11:46:02 +08:00
platform
fixed #1647 : Adding WebSocket support for Cpp and JSB.
2013-06-02 18:55:57 +08:00
proj.blackberry
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
proj.emscripten
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support
2013-05-28 11:36:05 +08:00
proj.ios
modify ORGANIZATIONNAME
2013-05-28 18:04:42 +08:00
proj.linux
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support
2013-05-28 11:36:05 +08:00
proj.mac
issue #2161 : make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp
2013-05-27 15:06:43 +08:00
proj.marmalade
issue 2217: Updating Make file and project configuration to add ccFPSImage.c.
2013-05-23 16:50:48 +08:00
proj.nacl
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support
2013-05-28 11:36:05 +08:00
proj.tizen
Update projects to Tizen 2.1 SDK.
2013-05-22 16:55:18 +09:00
proj.win32
issue #2161 : resolve conflict
2013-05-28 11:50:14 +08:00
script_support
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
2013-05-06 12:25:13 -07:00
shaders
Added CC_FORMAT_PRINTF to CCString
2013-04-19 14:00:16 +04:00
sprite_nodes
Revert the CCSprite.cpp and CCSprite.h to first merge other changes
2013-05-30 10:21:48 +08:00
support
issue #2103 add some overlapping file and delete some comment line
2013-05-24 13:45:06 +08:00
text_input_node
Fixed GCC warning on narrowing conversion
2013-04-19 12:09:26 +04:00
textures
Merge pull request #2652 from liuyq/memcpy
2013-05-29 22:58:17 -07:00
tilemap_parallax_nodes
Removing unused variable
2013-06-03 09:17:03 -04:00
touch_dispatcher
add getStartLocation() and getStartLocationInView() to CCTouch to access the start point of a touch
2013-03-04 13:08:19 +01:00
Android.mk
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support
2013-05-28 11:36:05 +08:00
CCCamera.cpp
issue #1555:build ok on android
2012-11-16 14:23:14 +08:00
CCCamera.h
update copyright to 2012, update cocos2d version to 2.0.3
2012-09-24 21:22:20 +08:00
CCConfiguration.cpp
uses the cocos2d.x namespace for "cocos2d x" configuration values
2013-05-30 16:29:36 -07:00
CCConfiguration.h
CCConfiguration supports default values in the query
2013-05-30 16:10:31 -07:00
CCDirector.cpp
fixed #2217 : Updating the comment for FPS display by using CCLabelAtlas.
2013-05-23 16:55:53 +08:00
CCDirector.h
fixed #2217 : Using CCLabelAtlas instead of CCLabelTTF to show FPS.
2013-05-23 15:06:57 +08:00
CCScheduler.cpp
fixed potential crash in CCScheduler::removeHashElement
2013-03-26 22:55:26 +01:00
CCScheduler.h
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +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
cocos2d.cpp
CCConfiguration extension (rewritten)
2013-05-22 13:00:34 -07:00