jianglong0156
|
979700e343
|
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
|
2015-08-04 11:30:30 +08:00 |
WenhaiLin
|
9edd66d4a7
|
Label:support font that contains GB2312 char map.
|
2015-07-28 16:28:32 +08:00 |
pandamicro
|
31bd25a5e9
|
Merge pull request #12762 from yangws/issue_10759
Fix bug: Clipping node doesn't work on Android 5.0.
|
2015-07-21 10:47:55 +08:00 |
Vincent Yang
|
14a419d725
|
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after activity recreate.
|
2015-07-20 11:14:06 +08:00 |
Jacky
|
a204b02668
|
fixed renderTexture switch foreground to background issue.
|
2015-07-15 13:47:10 +08:00 |
Jacky
|
ea773cac20
|
Fixed setAnimationInterval JNI bug.
|
2015-07-14 15:11:35 +08:00 |
子龙山人
|
3d06ca297f
|
Merge pull request #10255 from WenhaiLin/v3-activitylife-fix
Fixed game awaked by the clock on Android
|
2015-07-13 22:34:22 +08:00 |
pandamicro
|
8ab1dce2a0
|
Merge pull request #12778 from yangws/issue_9586
Fix bug: FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'
|
2015-07-13 11:03:24 +08:00 |
WenhaiLin
|
142d354485
|
[ci skip]Replace tab with spaces.
|
2015-07-10 21:03:43 +08:00 |
WenhaiLin
|
b459940bb8
|
[ci skip]Replace tab with spaces.
|
2015-07-10 20:47:21 +08:00 |
WenhaiLin
|
c68469a611
|
Update Nibiru SDK.
|
2015-07-10 20:42:05 +08:00 |
Vincent Yang
|
1711a70869
|
Merge v3 branch.
|
2015-07-10 16:39:36 +08:00 |
pandamicro
|
2d27091398
|
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
add write api in FileUtils
|
2015-07-10 15:13:21 +08:00 |
Vincent Yang
|
52293ad451
|
Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'.
|
2015-07-10 14:37:42 +08:00 |
Vincent Yang
|
02226c6a26
|
Fix bug: Clipping node doesn't work on Android 5.0.
|
2015-07-09 16:49:26 +08:00 |
jianglong0156
|
abee4a376a
|
add write api in FileUtils
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
|
2015-07-07 14:06:59 +08:00 |
jianglong0156
|
6f3b977c1e
|
add UserDefault api deleteValueForKey
|
2015-07-06 17:01:17 +08:00 |
子龙山人
|
17207f14e5
|
Merge pull request #12689 from fusijie/refine_setAnimationInterval
Refine setAnimationInterval from double to float.
|
2015-07-06 16:18:45 +08:00 |
Jacky
|
4499b60446
|
Refine setAnimationInterval from double to float.
|
2015-07-06 14:57:42 +08:00 |
WenhaiLin
|
a28ad6939d
|
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
|
2015-07-02 16:19:33 +08:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
WenhaiLin
|
cbb073e905
|
Fixed Application may be created more than once on Android.
|
2015-06-23 16:58:38 +08:00 |
WenhaiLin
|
79aa300448
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
|
2015-06-23 13:42:32 +08:00 |
WenhaiLin
|
b275ce2283
|
Label:Fixed IllegalArgumentException on Android 2.3.x
|
2015-06-23 13:38:06 +08:00 |
andyque
|
55b86b2e14
|
add more docs for samsung enhanced API
|
2015-06-19 18:09:42 +08:00 |
WuHao
|
27d0f51e9b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
|
2015-06-15 16:13:36 +08:00 |
Hao Wu
|
b4ca8c1489
|
Merge pull request #15 from pandamicro/spritepolygon
Add SpritePolygon JSB bindingsJSB bindings
|
2015-06-15 15:47:02 +08:00 |
WenhaiLin
|
518de1ff57
|
[ci skip]Android Studio projects:Fixed compile error.
|
2015-06-15 14:42:45 +08:00 |
pandamicro
|
19ef0e0983
|
Fix indent
|
2015-06-12 13:01:13 +08:00 |
子龙山人
|
03814a569d
|
Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix
SimpleAudioEngine:Fixed thread safety problem on android.
|
2015-06-11 14:30:36 +08:00 |
iris-wy
|
79b3d70b60
|
fix bug #12200
solve warning ""Service Intent must be explicit: Intent {
act=com.enhance.gameservice.IGameTuningService }""
|
2015-06-09 18:43:46 +08:00 |
WenhaiLin
|
6fec9c40b0
|
SimpleAudioEngine:Fixed thread safety problem on android.
|
2015-06-09 15:07:35 +08:00 |
gyf19
|
164e4c8314
|
HttpClient Android supports gzip
|
2015-06-03 19:41:14 +08:00 |
WenhaiLin
|
88697bf136
|
Remove unused function.
|
2015-06-02 16:38:06 +08:00 |
WenhaiLin
|
67d0088103
|
Fixed the text line height calculation is wrong with system font on Android.
|
2015-06-02 16:23:40 +08:00 |
WenhaiLin
|
9d8225aae8
|
Improve UserDefault's robustness on Android.
|
2015-06-01 15:09:11 +08:00 |
子龙山人
|
039c0036be
|
Merge pull request #12072 from iris-wy/v3
Add enhance service API
|
2015-05-29 15:32:06 +08:00 |
iris-wy
|
bbfc33dfd2
|
format
format
|
2015-05-28 11:03:49 +08:00 |
iris-wy
|
9e477303f1
|
delete useless TAG
delete useless TAG
|
2015-05-28 10:55:10 +08:00 |
iris-wy
|
0007799794
|
modify Enhance API
modify Enhance API
|
2015-05-28 10:47:12 +08:00 |
WenhaiLin
|
a569d877ba
|
[ci skip]Remove unnecessary code.
|
2015-05-20 18:05:46 +08:00 |
WenhaiLin
|
df3548673f
|
Remove unnecessary files.
|
2015-05-20 10:19:32 +08:00 |
minggo
|
e700ef6d30
|
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
Add Android Studio support
|
2015-05-18 16:17:24 +08:00 |
WenhaiLin
|
26f094b1a7
|
Remove unnecessary files
|
2015-05-18 16:02:05 +08:00 |
WenhaiLin
|
6dd3108e42
|
Rename module
|
2015-05-18 15:01:20 +08:00 |
WenhaiLin
|
dc8492948e
|
Add Android Studio support
|
2015-05-15 16:37:43 +08:00 |
iris-wy
|
68ec7c8ca1
|
Add enhance service API
Add enhance service API
|
2015-05-15 14:29:22 +08:00 |
minggo
|
5e776381aa
|
Merge pull request #11820 from Dimon4eg/v3
Fix crash in web view if illegal character in url (Android only)
|
2015-05-15 10:12:54 +08:00 |
pandamicro
|
8577055d5a
|
Implement localStorage.clear on Android
|
2015-05-14 10:40:25 +08:00 |
dkorchinskiy
|
9d7e5e5edc
|
Fix crash in web view if illegal character in url (Android only)
|
2015-05-13 14:56:07 +03:00 |