axmol/cocos2dx
James Chen 5b77e6e80e Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
Conflicts:
	cocos2dx/platform/CCEGLViewProtocol.cpp
	cocos2dx/platform/CCEGLViewProtocol.h
2012-04-23 14:39:27 +08:00
..
actions issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
base_nodes issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
cocoa issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo. 2012-04-23 14:30:38 +08:00
effects fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
extensions issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
include issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo. 2012-04-23 14:30:38 +08:00
kazmath issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
keypad_dispatcher issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
label_nodes fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
layers_scenes_transitions_nodes issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
menu_nodes issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
misc_nodes Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform 2012-04-20 17:34:47 +08:00
particle_nodes issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
platform Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform 2012-04-23 14:39:27 +08:00
proj.bada fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler. 2012-02-28 14:59:46 +08:00
proj.ios add project for iOS 2012-04-14 18:19:30 +08:00
proj.linux Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h} 2012-03-12 14:22:39 +01:00
proj.marmalade modify marmalade project setting 2012-02-14 18:25:20 +08:00
proj.qnx fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler. 2012-02-28 14:59:46 +08:00
proj.win32 issue #1177: Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration. 2012-04-20 15:23:00 +08:00
script_support issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
shaders issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
sprite_nodes fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
support fixed #1179: popup message box when invoking CCAssert on Android 2012-04-20 15:12:20 +08:00
text_input_node issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
textures issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
tileMap_parallax_nodes issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
touch_dispatcher issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
Android.mk issue #1177: Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration. 2012-04-20 15:23:00 +08:00
CCCamera.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCConfiguration.cpp issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo. 2012-04-23 14:30:38 +08:00
CCConfiguration.h fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
CCDirector.cpp issue #1177: Updated ios project configuration. 2012-04-23 14:35:41 +08:00
CCDrawingPrimitives.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
CCScheduler.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00
cocos2d.cpp issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 2012-04-19 14:35:52 +08:00