Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,807 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

27 Commits

Author SHA1 Message Date
Walzer 335d02a556 issue #503, android version build & run ok. 2011-05-21 16:45:55 +08:00
minggo 2c0bd49513 issue #455: CCUserDefault ok on win32 & Android 2011-05-06 15:31:51 +08:00
minggo bb4fc1c446 [android] fixed #477: set default ndk version to ndk-r5 2011-04-29 09:59:05 +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
moadib 85afa22195 [android] fixed typo in CCEGLView method name 2011-04-24 18:52:21 +04:00
minggo 4ffe24fc8e Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374 2011-04-19 13:45:56 +08:00
minggo 37e7fad0d3 issue #456: add curl test & libcurl.so works ok on android 2011-04-15 17:15:05 +08:00
natural-law 1af4aa1138 [android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost. 2011-04-06 16:29:58 +08:00
minggo 768c356343 merge natural-law-iss411 into master 2011-03-31 10:48:00 +08:00
natural-law c8b0d391cd fixed #411,Add ZwoptexTest on ios, wophone, android and airplay.Fix the bug in ios templates which generated by merge. 2011-03-30 15:21:18 +08:00
minggo 27d5a670b5 [android] fixed #367: make the compiling sequece of HelloWorld and tests don't depend on alphabet order 2011-03-29 15:26:50 +08:00
walzer a205df20a4 issue #390, manually merge from Bin's work. 2011-03-25 13:59:08 +08:00
minggo 75e2ecc16d issue #387: move platform_support into cocos2dx/platform 2011-03-09 14:40:05 +08:00
minggo f1d13ca2e1 issue #375: android compiled ok 2011-03-08 13:49:58 +08:00
minggo 89b4d07ed8 [android] fixed #368: move Application code to cocos2dx/platform/ccxApplication 2011-03-01 19:53:39 +08:00
minggo 498e0072e1 [android] fixed #358: autoscale HVGA resource to WVGA 2011-02-26 15:52:57 +08:00
minggo 1428480c7f [android] fixed #338:refactor platform_support 2011-02-25 13:35:27 +08:00
Macarse 24c4a477e3 Fixed issue for tests 2011-02-11 00:48:46 -03:00
minggo 31f9969674 fixed #333: fix compiling issue under linux 2011-01-27 09:49:06 +08:00
minggo d64ac9fdb8 issue #311: cocosdenshion for android 2011-01-19 16:00:19 +08:00
natural-law 237042f7dd fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
natural-law c02a9a4dd5 Setting apk file path at runtime in cocos2d-android. 2011-01-07 16:29:06 +08:00
natural-law ec7fbd0e69 Fix bugs. 
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
 2011-01-07 11:30:19 +08:00
unknown acc30e35b1 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-14 11:10:46 +08:00
natural-law 341e7efb27 fixed #251 add a test case for CCKeypadDelegate 2010-12-14 10:23:20 +08:00
minggo a33823706d fixed #259 2010-12-14 09:42:39 +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