minggo cd5bcb87af issue #2284: merge master and fixed some conflicts		2013-06-13 17:54:05 +08:00
..
actions	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
base_nodes	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
cocoa	Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2	2013-06-11 16:30:05 -07:00
draw_nodes	A problem of CCDrawNode::drawPolygon outline	2013-06-04 13:22:06 +08:00
effects	Coordinates are already in terms of pixels -- no need to do content scaling	2013-05-17 17:08:46 -07:00
include	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
kazmath	Support Tizen device.	2013-06-12 10:20:18 +09:00
keyboard_dispatcher	check if delegate is not null when dispatching keyboard event	2013-06-10 00:54:31 +02:00
keypad_dispatcher	Minor English Spelling Corrections. A few grammar corrections.	2012-09-17 00:02:24 -07:00
label_nodes	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
layers_scenes_transitions_nodes	Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2	2013-06-11 16:30:05 -07:00
menu_nodes	Fix windows build (nullptr instead of NULL when assigning to std::function)	2013-06-07 00:08:59 +04: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	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.blackberry	Updating project configuration for Blackberry port.	2013-06-07 16:52:49 +08:00
proj.emscripten	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.ios	Fixes for iOS7 and Xcode5	2013-06-11 12:11:05 -07:00
proj.linux	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.mac	Merge pull request from cocos2d/develop	2013-06-11 01:06:12 +02:00
proj.marmalade	1. add Component struct.	2013-06-04 17:38:43 +08:00
proj.nacl	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.tizen	Support Tizen device.	2013-06-12 10:20:18 +09:00
proj.win32	1. add Component struct.	2013-06-04 17:38:43 +08:00
script_support	issue #2103 add cocosbuilder lua test sample	2013-06-05 15:51:29 +08:00
shaders	on dealloc, log "this" with %p, not %x.	2013-06-05 18:21:05 -07:00
sprite_nodes	Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it.	2013-06-08 11:10:39 +08:00
support	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
text_input_node	Fixed GCC warning on narrowing conversion	2013-04-19 12:09:26 +04:00
textures	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
tilemap_parallax_nodes	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08: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	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54: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	Adds setObject to CCConfiguration	2013-06-05 09:46:56 +08:00
CCConfiguration.h	Adds setObject to CCConfiguration	2013-06-05 09:46:56 +08:00
CCDirector.cpp	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
CCDirector.h	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +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	MenuItemToggle is fixed	2013-06-05 17:51:40 -07:00