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
|
34aa7a0bb1
|
Remove unused variable.
|
2015-07-10 16:40:02 +08:00 |
Vincent Yang
|
1711a70869
|
Merge v3 branch.
|
2015-07-10 16:39:36 +08:00 |
Vincent Yang
|
187c72e2b9
|
[ci skip] replace tab with 4 space.
|
2015-07-10 16:17:34 +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 |
jianglong0156
|
d55c0c64c5
|
add std::nothrow
|
2015-07-08 15:19:17 +08:00 |
jianglong0156
|
7e26c381c6
|
remove invalid code
|
2015-07-08 14:36:37 +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 |
Ricardo Quesada
|
ad1fc88fa8
|
compiles on Xcode 7
|
2015-07-06 16:30:29 -07: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 |
pandamicro
|
f126eb3267
|
Merge pull request #12644 from WenhaiLin/v3-38-backevent-fix
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
|
2015-07-03 15:42:45 +08:00 |
pandamicro
|
1b22438792
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
cocos/ui/UICheckBox.cpp
|
2015-07-03 10:23:49 +08:00 |
WenhaiLin
|
a28ad6939d
|
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
|
2015-07-02 16:19:33 +08:00 |
Dale Stammen
|
7684c208e0
|
unsupported cocos2d-x image formats removed or updated
|
2015-06-29 08:41:44 -07:00 |
Dale Stammen
|
eb668f63ce
|
unsupported cocos2d-x image formats removed or updated
|
2015-06-29 08:39:31 -07:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
pandamicro
|
e574c38a6b
|
Merge pull request #12496 from WenhaiLin/v3-tagetplatform-fix
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
|
2015-06-23 22:26:54 +08:00 |
WenhaiLin
|
ed029d264f
|
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
|
2015-06-23 18:40:39 +08:00 |
WenhaiLin
|
cbb073e905
|
Fixed Application may be created more than once on Android.
|
2015-06-23 16:58:38 +08:00 |
pandamicro
|
f617d6f1aa
|
Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix
Label:Fixed IllegalArgumentException on Android 2.3.x
|
2015-06-23 15:27:43 +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 |
子龙山人
|
86b6ea702a
|
Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix
[ci skip]Android Studio projects:Fixed compile error.
|
2015-06-15 14:48:42 +08:00 |
WenhaiLin
|
518de1ff57
|
[ci skip]Android Studio projects:Fixed compile error.
|
2015-06-15 14:42:45 +08:00 |
pandamicro
|
d0db40c4a6
|
Merge pull request #12080 from linshun/v3
issue #12078 added audio, network, physics, platform and storage group.
|
2015-06-15 12:45:11 +08:00 |
pandamicro
|
19ef0e0983
|
Fix indent
|
2015-06-12 13:01:13 +08:00 |
Dale Stammen
|
0f64a2d192
|
removed obsolete override of setViewPortInPoints
|
2015-06-11 07:59:52 -07: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 |
pandamicro
|
6dfe937cae
|
Merge pull request #11892 from dabingnn/v3FrameBufferObject
V3 frame buffer object
|
2015-06-11 14:04:30 +08:00 |
Huabing.Xu
|
10352c40b2
|
Merge branch 'v3' into v3FrameBufferObject
# Conflicts:
# cocos/2d/CCCamera.h
|
2015-06-10 10:16:42 +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 |
Huabing.Xu
|
b79eec0b20
|
fix grid bug for viewport
|
2015-06-09 17:24:30 +08:00 |
Huabing.Xu
|
ef4978f0cd
|
move viewport to experimental namespace
|
2015-06-09 16:21:50 +08:00 |
WenhaiLin
|
6fec9c40b0
|
SimpleAudioEngine:Fixed thread safety problem on android.
|
2015-06-09 15:07:35 +08:00 |
Huabing.Xu
|
97b387560b
|
revert some accidental changes
|
2015-06-09 14:06:11 +08:00 |
Huabing.Xu
|
133ef90c09
|
Merge branch 'v3Viewport' into v3FrameBufferObject
# Conflicts:
# cocos/renderer/CCFrameBufferObject.h
|
2015-06-06 18:16:22 +08:00 |
pandamicro
|
6216e74a38
|
Merge pull request #12165 from gyf19/v3
HttpClient Android supports gzip
|
2015-06-04 22:00:13 +08:00 |
Huabing.Xu
|
ad1f7c472c
|
add render buffer render target for color attachment
|
2015-06-04 11:18:35 +08:00 |
Dale Stammen
|
38c9490f4d
|
don't delete rendering thread. SpiderMonkey needs to stay on same thread
|
2015-06-03 09:19:05 -07:00 |
gyf19
|
164e4c8314
|
HttpClient Android supports gzip
|
2015-06-03 19:41:14 +08:00 |
子龙山人
|
883f250f6a
|
Merge pull request #12137 from WenhaiLin/v3-text-line-height
Fixed the text line height calculation is wrong with system font on Android.
|
2015-06-03 16:24:38 +08:00 |