minggo
|
0c495628ea
|
Merge pull request #405 from minggo/iss618
invoke java code(System.exit()) to finish programe
|
2011-07-19 02:20:36 -07:00 |
Leon
|
d2d02e0c52
|
fix compile error with android-ndk-r6
|
2011-07-19 16:54:42 +08:00 |
minggo
|
640d811809
|
[android] fixed #618: invoke java code(System.exit()) to finish programe
|
2011-07-19 16:01:22 +08:00 |
minggo
|
6c47f53b13
|
[Android] fixed #547: line wrap OK on Android
|
2011-06-29 15:45:30 +08:00 |
yangws
|
59f37ddb5d
|
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
|
2011-06-27 10:55:45 +08:00 |
minggo
|
8440d6a267
|
[android] fixed #364: show string correct & line break ok
|
2011-06-24 13:55:00 +08:00 |
minggo
|
10cdd7f798
|
[android] fixed #364: line break ok on Android
|
2011-06-23 14:44:20 +08:00 |
minggo
|
1122a7c7d0
|
[android] use Android widget Bitmap other than skia to drawstring
|
2011-06-22 16:58:50 +08:00 |
natural-law
|
cfee246959
|
fixed #323, Add an interface to get the current language.
|
2011-06-17 10:49:02 +08:00 |
liswei
|
1591c7edc8
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +08:00 |
yangws
|
7e2d1d5c48
|
fixed #490 Text input on android use a different way, TextInputTest OK now.
|
2011-05-30 16:36:12 +08:00 |
minggo
|
ff1017d86f
|
Merge pull request #276 from minggo/iss496
[android] fixed #496 fixed #497
|
2011-05-18 23:18:37 -07:00 |
minggo
|
073260e0a9
|
[android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0
|
2011-05-19 11:26:57 +08:00 |
minggo
|
822016e375
|
[android] fixed #495: fix a memory leak
|
2011-05-18 13:56:35 +08:00 |
Walzer
|
1340bbf842
|
[android] fix a compilation error in CCFileUtils_android.cpp, getWritablePath() method
|
2011-05-12 21:12:15 +08:00 |
minggo
|
91bc9a3f7a
|
[android] fixed #488: fix memory leak
|
2011-05-12 18:55:32 +08:00 |
minggo
|
d8f3b0c25b
|
[android] CCUserDefault works ok on android2.2
|
2011-05-12 18:32:13 +08:00 |
minggo
|
e14040730b
|
fixed #455: release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly
|
2011-05-06 17:46:19 +08:00 |
minggo
|
2c0bd49513
|
issue #455: CCUserDefault ok on win32 & Android
|
2011-05-06 15:31:51 +08:00 |
Walzer
|
b61c019b2c
|
[android] fixed #475, CCImage::initWithString return true even if the bitmap hasn't been initialized. Thanks to Isaac Ashdown's fix on the forum.
|
2011-04-28 15:14:59 +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
|
99733c602d
|
[android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android
|
2011-04-25 15:13:24 +08:00 |
Walzer
|
38ee881876
|
Merge branch 'master' of https://github.com/natural-law/cocos2d-x
|
2011-04-25 09:52:13 +08:00 |
natural-law
|
7337119501
|
issue #466, Modify the interface to fit the refactor of CCFileUtils.
|
2011-04-25 09:40:10 +08:00 |
moadib
|
85afa22195
|
[android] fixed typo in CCEGLView method name
|
2011-04-24 18:52:21 +04:00 |
yangws
|
252f3efe1a
|
CCIMEDispatcher works on android.
|
2011-04-22 16:33:41 +08:00 |
minggo
|
8fbfc2773a
|
Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440
|
2011-04-01 17:19:30 +08:00 |
Marat Yakupov
|
ac84278dae
|
[android] #443 implemented CCKeypadDelegate on android
|
2011-04-01 11:27:06 +04:00 |
minggo
|
2c539a1df5
|
[android] fixed #440: CCMessage works ok on android
|
2011-04-01 11:35:26 +08:00 |
yangws
|
7e81c56231
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
Conflicts:
cocos2dx/platform/ios/CCFileUtils_ios.mm
|
2011-03-30 11:05:23 +08:00 |
walzer
|
5811fb7c76
|
Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422
|
2011-03-29 15:50:28 +08:00 |
yangws
|
6c5cf577b7
|
issue #439 wophone and android modified.
|
2011-03-29 15:05:53 +08:00 |
minggo
|
c686047f83
|
[android] fixed #422: multitouch for android
|
2011-03-29 14:20:05 +08:00 |
natural-law
|
1991a65b0b
|
Merge branch 'master' into iss391
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
|
2011-03-29 10:20:57 +08:00 |
walzer
|
6cc09aa4dc
|
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
|
2011-03-28 21:08:56 +08:00 |
yangws
|
dceff2d179
|
issue #396 android modified.
|
2011-03-28 11:09:49 +08:00 |
natural-law
|
cee82fe9fa
|
issue #434,refactor class CCFileUtils on android and ios.
|
2011-03-26 17:24:37 +08:00 |
natural-law
|
55143e3b9e
|
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
|
2011-03-24 10:38:08 +08:00 |
minggo
|
75e2ecc16d
|
issue #387: move platform_support into cocos2dx/platform
|
2011-03-09 14:40:05 +08:00 |
minggo
|
7aaf4be85f
|
move platform_support into cocos2dx/platform
|
2011-03-09 11:38:36 +08:00 |
minggo
|
f1d13ca2e1
|
issue #375: android compiled ok
|
2011-03-08 13:49:58 +08:00 |
minggo
|
837b8c04bf
|
issue #375: rename some macros
|
2011-03-08 09:29:41 +08:00 |
minggo
|
aaf898cb72
|
merge master into dev
|
2011-03-07 09:52:45 +08:00 |
minggo
|
f7b401163b
|
Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController
|
2011-03-02 09:38:23 +08:00 |
minggo
|
89b4d07ed8
|
[android] fixed #368: move Application code to cocos2dx/platform/ccxApplication
|
2011-03-01 19:53:39 +08:00 |
minggo
|
fc75306402
|
[android] fix a bug when run in HVGA
|
2011-03-01 18:34:06 +08:00 |
minggo
|
498e0072e1
|
[android] fixed #358: autoscale HVGA resource to WVGA
|
2011-02-26 15:52:57 +08:00 |
minggo
|
0453eb0266
|
[android] issue #338:refactor platform_support
|
2011-02-24 19:42:45 +08:00 |
minggo
|
36cb90aaa0
|
Merge branch 'jpgsupport' of https://github.com/minggo/cocos2d-x into minggo-jpgsupport
|
2011-02-23 14:13:48 +08:00 |
minggo
|
3dde0ebcf5
|
[android] fixed #353: support jpg on android
|
2011-02-23 13:43:45 +08:00 |
Macarse
|
4267593bf9
|
Used an array approach
|
2011-02-17 23:23:36 -03:00 |
Macarse
|
8d5995d5a6
|
First approach
|
2011-02-06 17:05:56 -03:00 |
Macarse
|
66038230eb
|
Added logic to disable sensors from the c++ code
|
2011-02-05 20:17:24 -03:00 |
Macarse
|
284c330569
|
Added code from walzer's comment
|
2011-02-01 00:11:42 -03:00 |
Macarse
|
fce540989d
|
First approach
|
2011-01-30 20:05:30 -03:00 |
minggo
|
a0ecaed1ef
|
[android] define s_bPopupNotify
|
2011-01-26 16:45:27 +08:00 |
minggo
|
54dc660f6b
|
[android] change the declaration of s_bPopupNotify from public to private
|
2011-01-26 16:44:58 +08:00 |
natural-law
|
3746af1d63
|
fixed #328.Modify the function and parameter name.
|
2011-01-26 15:43:12 +08:00 |
natural-law
|
7015e85918
|
fixed #328.By default,pop up a err dialog when loading textures failed.
|
2011-01-26 11:50:13 +08:00 |
minggo
|
e23c1eb2f6
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2011-01-22 16:45:26 +08:00 |
minggo
|
4a4c0d3485
|
[android] fixed #321: Frame control of android. It is not so accuracy.
|
2011-01-22 15:10:18 +08:00 |
natural-law
|
6bde512cbe
|
[android]issue #268,support more fonts on cocos2d-android.
|
2011-01-21 17:32:11 +08:00 |
walzer
|
b7e109f6e6
|
fixed iphone/android/uphone compilation errors brought by the prevous commit of #322
|
2011-01-19 22:29:57 +08:00 |
walzer
|
ad5ee3c9f6
|
Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.
|
2011-01-17 16:21:11 +08:00 |
minggo
|
7e30615d02
|
issue #304 Remove codes for controlling frame rate.
|
2011-01-10 15:13:30 +08:00 |
minggo
|
78a7329054
|
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
|
2011-01-08 09:27:58 +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 |
minggo
|
a391c8ef99
|
fixed some errors for iphone platform
|
2011-01-07 10:25:32 +08:00 |
Li Lirong
|
e58ba468ee
|
fix some warnings under android
|
2010-12-29 10:30:42 +08:00 |
minggo
|
b2b8591b26
|
fixed #279
|
2010-12-28 10:23:14 +08:00 |
Walzer
|
63bfa195db
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2010-12-17 20:36:24 +08:00 |
minggo
|
e287466c2f
|
fixed #246
|
2010-12-17 11:39:25 +08:00 |
Walzer
|
c8989c7941
|
fix a memory leak when invoking png_destroy_read_struct, for uphone & andorid platform
|
2010-12-17 10:14:56 +08:00 |
natural-law
|
b8b5c2e8cd
|
fixed #258 Modify the files which include FileUtils.h.
|
2010-12-14 14:05:35 +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 |
minggo
|
7fa8d72076
|
commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git
|
2010-11-29 15:54:32 +08:00 |
minggo
|
9a2ff2407a
|
commit the change before merging master of cocos2d-x
|
2010-11-29 15:08:21 +08:00 |
Ming
|
e379786e4d
|
|
2010-11-19 06:57:58 +00:00 |
natural-law
|
fc745a6a70
|
debug
|
2010-11-19 01:21:47 +00:00 |
Walzer
|
820c2f0714
|
issue #211 cocos2d-x back to cocos2dx
|
2010-11-18 15:01:42 +00:00 |
Walzer
|
b4328354af
|
issue #211 cocos2dx -> cocos2d-x
|
2010-11-18 14:07:17 +00:00 |
natural-law
|
a0930a2991
|
debug
|
2010-11-13 09:01:35 +00:00 |
Ming
|
416a319344
|
fixed #203
|
2010-11-13 03:34:49 +00:00 |
natural-law
|
000bdeeb42
|
issue #189
add support of Accelerometer sensor
|
2010-11-10 08:29:52 +00:00 |
Ming
|
0ea2035ec6
|
|
2010-11-04 09:33:31 +00:00 |
Ming
|
b0e0d63217
|
|
2010-11-03 06:04:48 +00:00 |
Ming
|
b60fbd82a5
|
added for android
|
2010-11-03 03:01:17 +00:00 |