axmol/HelloWorld
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
..
Resource [airplay] fix screen orientation bugs (pointer not properly worked) on devices ( checked on IOS IPad/IPhone), when orientation was changed. 2011-04-04 02:05:37 -07:00
airplay [airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk 2011-04-04 00:40:39 +08:00
android TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +08:00
ios TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +08:00
win32 Add VC2010 project files on win32 2011-03-10 19:50:17 +08:00
wophone fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach. 2011-04-22 10:57:46 +08:00
AppDelegate.cpp TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +08:00
AppDelegate.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
HelloWorldScene.cpp [ios] HelloWorld.jpg ->.png, xcode project from iOS4.1 to 4.2 "Lastest iOS" 2011-03-14 18:31:16 +08:00
HelloWorldScene.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00