Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx
History
yangws e895d9d073 TextInputTest compile ok on android and merge last master code. 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input

Conflicts:
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/platform/android/Cocos2dJni.cpp
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	tests/test.ios/test.xcodeproj/project.pbxproj
	tests/test.win32/test.win32.vcproj
 		2011-04-26 18:04:07 +08:00
..
actions fixed #448: make CCCallFuncO invoke correct parameter 2011-04-13 11:53:25 +08:00
base_nodes fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +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 TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +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 issue #449: refactor CCTransition 2011-04-11 16:09:14 +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 TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +08:00
proj.airplay issue #449: refactor CCTransition 2011-04-11 16:09:14 +08:00
proj.win32 TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +08:00
proj.wophone fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00
sprite_nodes fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00
support issue #468, Fix the compile error when the target platform is not win32. 2011-04-25 15:05:16 +08:00
text_input_node keyboard notification message on ios and TextFieldTTF test code OK. 2011-04-26 16:33:20 +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 TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +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