Commit Graph

11 Commits

Author SHA1 Message Date
minggo 8440d6a267 [android] fixed #364: show string correct & line break ok 2011-06-24 13:55:00 +08:00
yangws 01f277674e Add icon for Helloworld and tests on Android. 2011-06-22 13:59:31 +08:00
minggo 073260e0a9 [android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0 2011-05-19 11:26:57 +08:00
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
minggo 37e7fad0d3 issue #456: add curl test & libcurl.so works ok on android 2011-04-15 17:15:05 +08:00
minggo 9fa282c65c [android] fix some bug and remove unneeded files 2011-03-11 11:56:33 +08:00
Macarse fce540989d First approach 2011-01-30 20:05:30 -03:00
Macarse 89f012023e Fix display issue with Samsung Galaxy Tab 2011-01-26 19:03:14 -03:00
minggo e92970ec69 [android] fixed #311: implement cocosdenshin on android 2011-01-21 15:15:09 +08:00
minggo 6b37bc97d4 fixed #220: run tests on android 2010-12-09 10:50:02 +08:00
minggo 534a55eaa1 issue #220: All tests run on android emulator, but the effect of some tests are wrong 2010-12-06 09:51:21 +08:00