axmol/cocos2dx
James Chen 07b9db8e91 Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
..
actions issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
base_nodes issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
cocoa fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
effects issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
extensions Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
include issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
kazmath fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
keypad_dispatcher issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
label_nodes Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
layers_scenes_transitions_nodes issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
menu_nodes issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
misc_nodes issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
particle_nodes issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
platform Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
proj.ios issue #1269:mrege latest code and fix conflict 2012-06-19 13:57:33 +08:00
proj.win32 fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
script_support issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
shaders issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
sprite_nodes issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
support Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
text_input_node issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
textures Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
tileMap_parallax_nodes issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
touch_dispatcher issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
Android.mk fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
CCCamera.cpp issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
CCCamera.h issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
CCConfiguration.cpp Merge with gles20. 2012-06-11 10:43:07 -07:00
CCConfiguration.h issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
CCDirector.cpp issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
CCDirector.h issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
CCDrawingPrimitives.cpp issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
CCDrawingPrimitives.h issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
CCScheduler.cpp issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
CCScheduler.h issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
cocos2d.cpp Merge with gles20. 2012-06-11 10:43:07 -07:00