axmol/cocos2dx
yangws 3f8293dffb Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
	HelloWorld/wophone/HelloWorld.wophone.vcproj
	tests/test.wophone/copy_res.bat
2011-05-06 17:45:39 +08:00
..
actions fixed #448: make CCCallFuncO invoke correct parameter 2011-04-13 11:53:25 +08:00
base_nodes issue #428, fix the bug created by issue 428. Have some loop in wrong arrays. 2011-04-28 10:16:58 +08:00
cocoa fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
effects fixed #452: refactor CCDirector CCNode CCGrid 2011-04-11 15:10:09 +08:00
include Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input 2011-05-06 17:45:39 +08:00
keypad_dispatcher fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
label_nodes TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +08:00
layers_scenes_transitions_nodes ccTouchDeletateAllBit -> ccTouchDelegateAllBit. I met this typo 3 days ago, then miss it. Thanks to Isaac Ashdown. 2011-04-27 22:45:54 +08:00
menu_nodes fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00
misc_nodes fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
particle_nodes fixed #451,remove the code of support mac platform. 2011-04-11 11:24:10 +08:00
platform Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input 2011-05-06 17:45:39 +08:00
proj.airplay issue #449: refactor CCTransition 2011-04-11 16:09:14 +08:00
proj.win32 Split TextInputTest to Default test and Action test. Compile ok on vs2010. 2011-05-04 14:13:15 +08:00
proj.wophone Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input 2011-05-06 17:45:39 +08:00
sprite_nodes issue #428, fix the bug created by issue 428. Have some loop in wrong arrays. 2011-04-28 10:16:58 +08:00
support fixed a warning in CCProfiling.cpp 2011-04-29 10:08:35 +08:00
text_input_node TextInputTest on on ios. 2011-04-29 18:09:54 +08:00
textures TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +08:00
tileMap_parallax_nodes fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00
touch_dispatcher fixed #467 CCLayer:m_eTouchDelegateType = ccTouchDeletateAllBit all the time, which makes an error logic if adding standard touch delegate when CCTouchDispatcher::m_tLock = ture 2011-04-24 15:38:03 +08:00
Android.mk [android] fixed #477: set default ndk version to ndk-r5 2011-04-29 09:59:05 +08:00
CCCamera.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCConfiguration.cpp fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
CCConfiguration.h fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCDirector.cpp fixed #452: refactor CCDirector CCNode CCGrid 2011-04-11 15:10:09 +08:00
CCDrawingPrimitives.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCScheduler.cpp fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
cocos2d.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00