axmol/cocos2dx
James Chen 7601cc7e27 Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update
Conflicts:
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
2012-11-16 16:21:16 +08:00
..
actions issue #1555: update to v2.1 beta3 2012-11-15 17:16:51 +08:00
base_nodes issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
cocoa issue #1486: fix a warning in CCAutoreleasePool.cpp. 2012-10-12 16:03:53 +08:00
draw_nodes issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
effects issue #1555:add CCDrawNode 2012-11-09 12:08:18 +08:00
include issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
kazmath Marmalade Cocos2d-x Main Repo Changes 2012-10-19 16:38:58 +01:00
keypad_dispatcher Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
label_nodes issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
layers_scenes_transitions_nodes Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update 2012-11-16 16:21:16 +08:00
menu_nodes issue #1555:menu can receive touch event now 2012-11-16 14:51:48 +08:00
misc_nodes issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
particle_nodes issue #1555: update to v2.1 beta3 2012-11-15 17:16:51 +08:00
physics_nodes issue #1555:fix a bug about CCGLProgram 2012-11-13 11:06:32 +08:00
platform Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update 2012-11-16 16:21:16 +08:00
proj.blackberry fixed a couple typos 2012-10-27 09:58:49 -04:00
proj.ios issue 1555:add CCPhysicsSprite 2012-11-12 15:22:26 +08:00
proj.linux issue #1555:linux work ok 2012-11-16 15:16:55 +08:00
proj.mac issue #1555:menu can receive touch event now 2012-11-16 14:51:48 +08:00
proj.marmalade Tiff support and resource location 2012-11-14 17:46:09 +00:00
proj.win32 Merge remote branch 'upstream/gles20' into gles20 2012-10-08 16:35:43 +02:00
script_support Adding executeAccelerometerEvent for to CCScriptSupport and ScriptingCore 2012-11-16 15:56:29 +08:00
shaders issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
sprite_nodes issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
support issue #1530: Exported CCUserDefault to js. 2012-11-16 15:58:18 +08:00
text_input_node Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
textures issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
tilemap_parallax_nodes issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
touch_dispatcher getDelta() is delta function 2012-10-14 21:20:31 +09:00
Android.mk issue #1555:build ok on android 2012-11-16 14:23:14 +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 Merge with gles20. 2012-06-11 10:43:07 -07:00
CCConfiguration.h add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
CCDirector.cpp issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
CCDirector.h issue #1555:fix a bug about CCGLProgram 2012-11-13 11:06:32 +08:00
CCScheduler.cpp Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update 2012-11-16 16:21:16 +08:00
CCScheduler.h issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
cocos2d.cpp issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00