pandamicro
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
jianglong0156
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
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
pandamicro
d20052cc22
Fix line wrapper in CCDevice
2015-08-04 11:07:04 +08:00
Sridher Jakku
f48a9fb9f0
getDPI for Mac Implemented
2015-08-03 17:12:52 +05:30
pandamicro
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
pandamicro
f74438372c
Merge pull request #11293 from perminovVS/v3-dev-screen-size-bug
...
GLViewImpl initWithRect bug size
2015-07-31 18:43:23 +08:00
pandamicro
aed6b0719e
Merge pull request #13089 from yangws/issue_12692
...
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
Vincent Yang
e1d4d22353
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-29 18:43:11 +08:00
WenhaiLin
20d445ad1a
Label:The texture of system font should be cropped if the height of label is not enough to show the entire string on Mac.
2015-07-29 16:11:27 +08:00
andyque
6de387b3ac
fix Mac system font crash issue
2015-07-29 15:20:31 +08:00
子龙山人
96d44e1078
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-29 14:51:17 +08:00
pandamicro
c81ba3c148
Merge pull request #12648 from stari4ek/v3-12645-depthstencil-attributes-ios
...
Fixed : #12645 iOS: depth/stencil buffers attributes are ignored
2015-07-29 11:09:56 +08:00
WenhaiLin
9edd66d4a7
Label:support font that contains GB2312 char map.
2015-07-28 16:28:32 +08:00
Ricardo Quesada
2deb492d36
compiles and runs on Xcode 7
2015-07-23 14:28:23 -07: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
pandamicro
371053305e
Merge pull request #12915 from yangws/issue_12887
...
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after…
2015-07-20 14:01:21 +08:00
Vincent Yang
14a419d725
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after activity recreate.
2015-07-20 11:14:06 +08:00
Wenhai Lin
66dadea0cd
Rollback log level
2015-07-17 15:56:51 +08:00
WenhaiLin
f0b29814c3
Label:support font that contains GB2312 char map.[android]
2015-07-16 21:35:10 +08:00
andyque
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
子龙山人
d291afe295
Merge pull request #12856 from fusijie/fix_rendertexture_backtofront
...
fixed renderTexture switch foreground to background issue.
2015-07-15 14:32:40 +08:00
Jacky
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
andyque
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
子龙山人
af4442d0d6
Merge pull request #12833 from fusijie/v3
...
Fixed setAnimationInterval JNI bug.
2015-07-14 16:33:39 +08:00
Jacky
ea773cac20
Fixed setAnimationInterval JNI bug.
2015-07-14 15:11:35 +08:00
andyque
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
Vincent Yang
0589c14302
Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
...
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-14 09:44:36 +08:00
Vincent Yang
06bf6ffa90
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-14 09:35:01 +08:00
andyque
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
Vincent Yang
74227eaf16
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-13 22:44:40 +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
子龙山人
22b4f5a11e
Merge pull request #12238 from lite3/patch-3
...
remove old path When added existing new searchPath
2015-07-13 22:16:50 +08:00
Vincent Yang
e65b01bdc0
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-13 17:06:01 +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
Vincent Yang
8bc68395de
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586
2015-07-13 11:00:18 +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
Vincent Yang
02226c6a26
Fix bug: Clipping node doesn't work on Android 5.0.
2015-07-09 16:49:26 +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
WenhaiLin
4bd1fa7d37
Fixed crash cause by the case of file name on WIN32.
2015-07-07 10:08:47 +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
Michael Sotnikov
363da2beab
Fixed : #12645 iOS: depth/stencil buffers attributes are ignored
2015-07-02 12:07:24 +03: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
lite3
c249f7cb69
keep old behavior
2015-06-15 19:48:12 +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
lite3
f1d879f7ed
remove old path When added existing new searchPath
2015-06-08 13:34:45 +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
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
子龙山人
2c611693c6
Merge pull request #12123 from WenhaiLin/v3-UserDefault-robustness
...
Improve UserDefault's robustness on Android.
2015-06-02 10:11:19 +08:00
WenhaiLin
9d8225aae8
Improve UserDefault's robustness on Android.
2015-06-01 15:09:11 +08:00
Huabing.Xu
27d0f6328f
origin code of viewport
2015-06-01 14:26:08 +08:00
linshun
09b52331d1
issue #12078 : added renderer group and removed core and support group.
2015-06-01 13:43:56 +08:00
Dale Stammen
e0c65c203a
Merge branch 'v3' into v3-uwp
2015-05-29 08:09:05 -07:00
子龙山人
039c0036be
Merge pull request #12072 from iris-wy/v3
...
Add enhance service API
2015-05-29 15:32:06 +08:00
Dale Stammen
05d33ac0c8
removed old WP8 files
2015-05-28 14:08:25 -07:00
linshun
ef39251d14
issue #12078 : added platform group
2015-05-28 15:47:40 +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
Dale Stammen
9ee4b4af1e
Merge branch 'v3' into v3-winrt-audio
2015-05-27 11:54:21 -07:00
anniruddh.koppal
4501a53cfa
Added MP3 support to simple audio engine
2015-05-27 10:57:26 -07:00
minggo
999de9072a
Merge pull request #12003 from minggo/remove-unneeded-function
...
remove uneeded function
2015-05-25 16:33:38 +08:00
minggo
db0caf68c6
remove uneeded function
2015-05-25 09:50:48 +08:00
andyque
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
Dale Stammen
aa7876aefc
remove deprecated methods
2015-05-20 07:55:10 -07:00
Dale Stammen
cada493685
remove deprecated methods
2015-05-20 07:51:52 -07: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
Vladimir Perminov
bfb3fbb1c0
Revert _checkPath
2015-05-17 19:24:57 +03:00
Vladimir Perminov
295e8532d2
FileUtilsWin32 correct use all unicode version winapi
...
Move to FileUtilsWin32 implements:
isDirectoryExistInternal
isDirectoryExist
createDirectory
removeDirectory
removeFile
renameFile
And use common convert to wide char.
2015-05-17 12:40:14 +03: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
Ricardo Quesada
989848a358
fixes memory leak
...
improves performance a little bit
2015-05-14 17:24:27 -07:00
minggo
0a3e6338f1
Merge pull request #11834 from pandamicro/v3_origin
...
Sync fixes in Cocos2d-JS
2015-05-14 13:38:18 +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
cpascal
134355d763
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
...
When I don't want to use TIF file,
Cocos2d-x ccConfig.h's style is..
#define CC_USE_TIF 0
But CCImage.cpp just check wheather defined or not..
2015-05-13 20:52:32 +09:00
minggo
5e87bd307b
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
...
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
Dale Stammen
f1fe802442
updated winrt keyboard support to support physical keyboard
2015-05-12 09:20:10 -07:00
WenhaiLin
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
Dale Stammen
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
minggo
a718c11eb6
Merge pull request #11724 from andyque/fix-binding-generator
...
fix upstream compile error
2015-05-07 11:47:20 +08:00
andyque
db95034798
fix android compile error
2015-05-07 10:37:19 +08:00
Jongryul Kook
dfe30e159f
Need JNIEXPORT for -fvisibility=hidden
2015-05-06 14:24:48 +09:00
WenhaiLin
26c9be7881
Add FileUtils::getSuitableFOpen[window-universal]
2015-05-04 16:06:04 +08:00
WenhaiLin
1839564fbb
Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7
2015-05-04 10:16:47 +08:00
minggo
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
WenhaiLin
1950498b0a
Replace tab with space.
2015-04-29 18:41:10 +08:00
Wenhai Lin
1d9ff11837
VideoPlayer:Fixed can't play video on Android 2.3.x
2015-04-29 18:32:59 +08:00
minggo
2d2f0aac59
fix indent
2015-04-27 16:25:24 +08:00
minggo
8c4cecca0d
fix indent and translate Chinese comment to English
2015-04-27 16:22:54 +08:00
minggo
c0b2433bb5
Merge branch 'v3' of https://github.com/qiutaoleo/cocos2d-x into check-filename-case-on-windows
2015-04-27 15:45:23 +08:00
WuHao
9496a48800
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3
2015-04-24 18:29:23 +08:00
zhangbin
61cf0ad28b
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
2015-04-23 15:46:19 +08:00
Dale Stammen
ac8755868d
need to call Cleanup() if app is terminating
2015-04-22 19:13:12 -07:00
Dale Stammen
b78f830ed8
cleaned up Draw()
2015-04-22 19:11:42 -07:00
Dale Stammen
4119b0f10d
cleaned up Draw()
2015-04-22 19:11:29 -07:00
Dale Stammen
22daece170
made Cleanup() public
2015-04-22 19:08:11 -07:00
Dale Stammen
c3335551b8
added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE
2015-04-22 19:07:48 -07:00
samuele3hu
7c77bc9587
Add the PolySprite support and adjust the project setting on the different platform
2015-04-23 00:51:47 +08:00
Dale Stammen
0f3ff6f762
Merge branch 'v3' into v3-winrt-typo-fix
2015-04-21 18:18:00 -07:00
Dale Stammen
84a47000b5
rename -win to -winrt
2015-04-21 18:17:18 -07:00
Dale Stammen
aec086a473
convert BGR and RGB to GUID_WICPixelFormat24bppRGB
2015-04-21 18:16:54 -07:00
Dale Stammen
516966a96f
check for PixelFormat::DEFAULT
2015-04-21 18:11:56 -07:00
Dale Stammen
0c47df5df2
fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments
2015-04-21 06:21:32 -07:00
Dale Stammen
83b68ef693
added comment on how back button event is handled
2015-04-20 18:36:58 -07:00
Dale Stammen
50f381f070
added CCLOG message to describe how to handle Windows Phone back button event
2015-04-20 18:30:52 -07:00
Dale Stammen
4169ebf5c8
Windows Phone 8.1 back button and terminate app support
2015-04-20 10:43:34 -07:00
Dale Stammen
e00b0dfbd9
Merge branch 'v3' into v3-winrt-backbutton
2015-04-20 08:17:16 -07:00
htl
2476f2b52d
fixed win32 application return code
2015-04-20 18:27:21 +08:00
WenhaiLin
dc768dbd8c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge
2015-04-20 10:06:48 +08:00
Dale Stammen
ec378b612e
added listener if back button event not handled by app
2015-04-19 18:53:10 -07:00
Dale Stammen
a97d5c5370
added support for hardware back button on Windows Phone 8.1
2015-04-19 16:31:30 -07:00
Vladimir Perminov
694b9adc1e
Add FileUtils::getSuitableFOpen
...
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.
Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename
all fopen use FileUtils::getSuitableFOpen
2015-04-19 14:00:27 +03:00
Dale Stammen
f1f0c5a653
start of back button support
2015-04-17 15:47:52 -07:00
Dale Stammen
79f312d101
call pause on correct thread
2015-04-17 09:31:02 -07:00
Dale Stammen
2ccff5671a
fix for encoding images with WIC
2015-04-17 09:20:23 -07:00
andyque
d3a06de6d6
remove system zlib dependency since we use our own prebuilt version of
...
zlib now.
2015-04-17 17:24:33 +08:00
zhangbin
1f491cf656
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
...
Conflicts:
build/cocos2d-wp8.sln
2015-04-16 17:04:07 +08:00
minggo
97f150a89f
Merge pull request #11452 from MSOpenTech/v3-remove-wp8
...
V3 remove WP8 project files
2015-04-16 14:32:11 +08:00
Dale Stammen
b1c9c34c19
added Windows Image Component support for Windows 8.1 Universal App
2015-04-15 09:19:38 -07:00
Dale Stammen
7d22e49642
only needed if _MSC_VER < 1900
2015-04-15 09:18:48 -07:00
Dale Stammen
68430ce4fa
added Windows Image Component support for Windows 8.1 Universal App
2015-04-15 09:18:23 -07:00
Dale Stammen
b700798287
removed WP8 project files
2015-04-15 07:13:54 -07:00
Wenhai Lin
2dd88e8be5
Fixed JNI illegal start byte error
2015-04-15 18:20:52 +08:00
zhangbin
8c2413aa54
Add submodule js-bindings & html5.
2015-04-14 15:20:46 +08:00
Dale Stammen
272bb35246
Merge branch 'v3' into v3-wp8-fix
2015-04-08 07:29:45 -07:00
andyque
24c0c8d811
fix wp8 compile issue
2015-04-08 18:01:56 +08:00
minggo
4d9e376a18
Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log
...
Log message can't detect image format
2015-04-08 10:52:56 +08:00
Michael Sotnikov
f962e14b43
replace const_cast with mutable in path getters;
...
more getters (is*/get*) became const;
2015-04-07 17:15:15 +03:00
Vladimir Perminov
ba06886e01
GLViewImpl initWithRect bug size
...
glfwCreateWindow not guarantees create windows need size, watch real
create size and change setFrameSize( see declaration glfwCreateWindow)
Example Windows 7, if request height size > Desktop height make window
size: Desktop height - height Caption.
2015-04-06 14:24:22 +03:00
Vladimir Perminov
3931273a58
Log message can't detect image format
...
Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.
Log message if format unknown
2015-04-04 13:19:47 +03:00
Daiki Asahi
fc92acf587
remove interlevel argument.
2015-04-03 16:43:39 +09:00
Huabing.Xu
98371e4fbb
Merge pull request #11267 from WenhaiLin/v3-at01
...
Disable MessageBox when the device does not have an accelerometer on WinRT.
2015-04-03 11:53:07 +08:00
WenhaiLin
fdba25cdde
Disable MessageBox when the device does not have an accelerometer on WinRT
2015-04-03 11:51:00 +08:00
Dale Stammen
d8b6a0aaf9
removed unused method
2015-04-02 09:11:19 -07:00
Dale Stammen
47b338e4e6
fix deprecated warnings
2015-04-02 09:08:26 -07:00
Dale Stammen
957bf48790
fire foreground and background events
2015-04-02 09:07:44 -07:00
WenhaiLin
aaae566b7b
Performance: Fixed lag if Director::setContentScaleFactor is called frequently
2015-04-02 23:35:56 +08:00
Vladimir Perminov
b7279524d6
Win32 correct rename file
...
Old version, check GetLastError even if all ok, but LastError can be set
other code.
Write log info.
2015-03-31 13:52:40 +03:00
minggo
b03900bbbf
fix doxygen comment
2015-03-27 17:09:54 +08:00
SuYaohui
3d772df930
Add comment
2015-03-27 14:43:24 +08:00
SuYaohui
17bd26e9d4
Add comments
2015-03-27 11:39:31 +08:00
WenhaiLin
f13065a038
[ci skip]Update comments
2015-03-25 11:07:11 +08:00
WenhaiLin
153d697f1a
[ci skip]Update comments.
2015-03-25 10:59:04 +08:00
WenhaiLin
89f9ae044d
[ci skip]Update comments
2015-03-24 20:29:13 +08:00
WenhaiLin
9dd778edb0
[ci skip]Update comments
2015-03-24 20:23:51 +08:00
WenhaiLin
2caff4e64d
[ci skip]Update comments
2015-03-24 14:12:58 +08:00
WenhaiLin
1450dfbc7b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen
2015-03-24 11:26:10 +08:00
minggo
4973de2b25
add more doxygen document
2015-03-24 11:15:40 +08:00
minggo
14574bdd41
add doxygen comment of CCFileUtils.h
2015-03-24 10:34:44 +08:00
WenhaiLin
78a8ba7f98
[ci skip]Update comments
2015-03-23 22:17:59 +08:00
SuYaohui
d8a033c2ef
Action,Sprite,TmxTiledMap,UTF8,GLView
2015-03-23 18:37:28 +08:00
Dale Stammen
fc94659fd5
updated precompiled shaders for WP8
2015-03-20 23:50:48 -07:00
andyque
a29a298ec3
fix wrong comment
2015-03-20 09:49:34 +08:00
minggo
0648ac7ca0
Merge pull request #11004 from SuYaoHui/cocosapi
...
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
2015-03-19 21:47:32 +08:00
SuYaohui
5e236fd753
progressTimer,ApplicationProtocol
2015-03-19 21:42:31 +08:00
minggo
8e32933dd3
Merge pull request #10340 from seobyeongky/network_bugfix2
...
receive content data even though status code is not 2xx
2015-03-19 21:12:51 +08:00
SuYaohui
c295952c71
NodeGrid,Config,NS,ApplicationProtocol
2015-03-19 21:03:28 +08:00
lyubomirv
2aec39ad56
Added Bulgarian language.
2015-03-17 15:14:02 +02:00
Dale Stammen
65c83378d0
Merge branch 'v3' into v3-wp8-fix
2015-03-16 20:22:28 -07:00
minggo
f7d5a16734
Merge pull request #10873 from konopka/fix_compiler_override_warnings
...
Fix compiler override warnings
2015-03-17 10:38:19 +08:00
Dale Stammen
e2a5eb2f9f
updated to Angle ddbf057c52
2015-03-16 08:18:26 -07:00
minggo
f25be54e95
Merge pull request #10671 from kpkhxlgy0/v3
...
enable setWritablePath on platform win32 and mac
2015-03-16 14:57:26 +08:00
Martin Konopka
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
Nite Luo
3194da4e7d
Merge pull request #10720 from darkdukey/hide_cursor
...
Hide cursor
2015-03-13 10:48:15 -07:00
byeonggee.seo
a2274162b5
merged
2015-03-12 10:06:53 +09:00
minggo
8e6d9d5dd2
Merge pull request #10740 from newnon/v3_windows_network_path
...
Windows network path fix
2015-03-10 11:25:53 +08:00
Jongryul Kook
0d65dd13be
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
2015-03-09 21:20:17 +09:00
Dale Stammen
a9479a1585
updated WP8 precompiled shaders
2015-03-08 21:42:27 -07:00
Sergey
de284c98ce
MinGW build fix
2015-03-05 11:11:13 +03:00
Sergey Perepelitsa
215fe8a0c9
Windows network path fix
2015-03-05 11:10:03 +03:00
Nite Luo
49912c2f62
clean up the formatting
2015-03-02 23:29:15 -08:00
Chad
395c14f07d
Hide Cursor - Feature Request #8766
...
Added the ability to hide or show the cursor on desktop builds.
2015-03-02 23:21:18 -08:00
kpkhxlgy0
99dea9395d
enable setWritablePath on platform win32 and mac
2015-02-28 18:21:57 +08:00
Nite Luo
dbba9e36a1
Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path
...
Fix win32 resource search path to be relative to the executable.
2015-02-25 20:24:07 -08:00
minggo
5d8071bdcf
Merge pull request #10597 from loadrunner/v3
...
added Romanian language
2015-02-26 10:51:46 +08:00
loadrunner
9e310ba272
added Romanian language
2015-02-25 17:25:19 +02:00
minggo
c2479adc59
Merge pull request #10549 from mogemimi/fix-typo
...
Fix typo in Image::Format
2015-02-25 09:32:58 +08:00
mogemimi
9e7ce0cd85
Fix typo in Image::Format
2015-02-24 02:36:20 +09:00
mannewalis
21dbc29ad1
adding CC_DEPRECATE(version) macro
2015-02-17 13:01:53 -08:00
Dale Stammen
0801160a37
added precompiled Particle3D shaders
2015-02-16 11:28:24 -08:00
minggo
3a4e9ced46
Merge pull request #10442 from Dhilan007/v3-accelerometer-fix
...
Fixed Accelerometer has lagged on iOS
2015-02-12 17:20:07 +08:00
sawada_yasuharu
cf8a7cd6da
Changed the option to be passed to calculate bounding rect size for
...
strings.
As an option, NSStringDrawingUsesLineFragmentOrigin and
NSStringDrawingUsesFontLeading are passed, the result size is differ
from the size which actually strings are rendered.
2015-02-12 15:30:46 +08:00
WenhaiLin
20ad425407
Fixed Accelerometer has lagged on iOS
2015-02-11 16:28:43 +08:00
Vladimir Timofeev
653bf1549d
win32: Search resources in the executable directory by default instead of the current directory. Because new default location is much more predictable.
2015-02-09 02:23:01 +03:00
byeonggee.seo
753335726a
receive content data even though status code is not 2xx
2015-02-03 16:28:23 +09:00
minggo
18a45e36eb
Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix
...
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 13:56:11 +08:00
WenhaiLin
05db3bfd72
Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 11:55:49 +08:00
Wenhai Lin
4a218ea3e2
Fixed game awaked by the clock on Android
2015-01-28 15:30:52 +08:00
minggo
4ac50f2c26
Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix
...
Fixed sets the page's base URL for WebView doesn't work.
2015-01-26 13:51:08 +08:00
Wenhai Lin
81198583f1
Fixed sets the page's base URL for WebView doesn't work.
2015-01-23 18:30:12 +08:00
kompjoefriek
ca48c5e5dd
Fixed lots of compiler warnings
...
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
Dale Stammen
e5b54f8c47
updated precompiled shaders for wp8
2015-01-21 10:50:44 -08:00
minggo
fde86c7fd2
Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix
...
Fixed the alpha channel of text color of system font not take effect
2015-01-21 11:09:27 +08:00
minggo
9f24b9a350
Merge pull request #10090 from Dhilan007/v3-issue10089
...
Fixed lose the precision of label's dimensions
2015-01-21 10:51:27 +08:00
Wenhai Lin
b20d59c596
Fixed the alpha channel of text color of system font not take effect[android]
2015-01-20 17:34:13 +08:00
WenhaiLin
415bbeba21
Fixed the alpha channel of text color of system font not take effect
2015-01-20 16:04:14 +08:00
WenhaiLin
f2c6a48976
Fixed lose the precision of label's dimensions
2015-01-20 11:46:43 +08:00
Dale Stammen
56d8e62409
added support for device orienation change. Fixed gravity for winrt landscape flipped
2015-01-19 09:38:49 -08:00
Dale Stammen
7b6b02d338
catch exception for older winrt tablets not supporting accelerometer report interval
2015-01-16 15:36:16 -08:00
Dale Stammen
5988cb520d
added precompiled shader for ccPositionTextureColor_noMVP_vert and ccUIGrayScale_frag shader for UIScale9Sprite"
2015-01-16 14:59:08 -08:00
Dale Stammen
7b3154a7ee
updated precompiled shaders for WP8
2015-01-16 11:19:32 -08:00
HoneyCat
41f53d6607
added checkfilename in win32 FileUtils
...
make win32 check filename case like linux
2015-01-16 17:24:54 +08:00
WenhaiLin
6a2ac7aaf8
[ci skip]Fixed log level within the CocosPlayClient
2015-01-15 18:21:03 +08:00
Dale Stammen
ef816a1bb9
fixed handling of default font
2015-01-14 11:10:58 -08:00
Dale Stammen
32c14710e7
allow custom shaders for WinRT Universal App
2015-01-14 10:37:04 -08:00
minggo
1e2029598d
Merge pull request #9936 from Dhilan007/v3-cocosplay
...
Integrate CocosPlayClient
2015-01-14 16:10:20 +08:00
WenhaiLin
553cf58312
Remove FileUtilsAndroid::purgeCachedEntries
2015-01-14 16:05:33 +08:00
Dale Stammen
5a4c6d75d8
clean up CC_USE_WEBP disabled for WP8 and WINRT
2015-01-13 14:37:22 -08:00
huangshiwu
f4ac7c4e44
modify WP8 project and update precompileshader
2015-01-14 02:15:04 +08:00
Wenhai Lin
58c45ca144
Integrate CocosPlayClient
2015-01-13 17:30:07 +08:00
Satoshi SUZUKI
b0d1dd2435
FileUtils::fullPathForFilename should return "" if resource is not found.
...
I Think this method should return empty string when the resource is not found.
Because, I cannot check if the file found or not with current implementation.
2015-01-10 19:30:42 +09:00
WenhaiLin
57cd4cd3c6
Fixed VideoPlayer can't play when passing the full path of video resource
2015-01-09 19:14:19 +08:00
WenhaiLin
d92a525bfa
Fixed dead loop when width of label[system font] smaller then one word of the string on android
2015-01-09 16:52:40 +08:00
Huabing.Xu
b5859114b7
Merge pull request #9778 from samuele3hu/v3_4_bug_xmlhttp
...
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-07 17:45:43 +08:00
minggo
4c7377480b
Merge pull request #9837 from minggo/memory-leak
...
fix memory leak
2015-01-07 17:23:28 +08:00
minggo
1dcdd81fc4
fix memory leak
2015-01-07 15:02:27 +08:00
Huabing.Xu
339a8b1abc
class rename for EGLConfigChooser
2015-01-06 16:18:01 +08:00
Huabing.Xu
1180f7a41e
move class cocos2dEGLConfigChooser to Cocos2dxActivity
2015-01-06 12:44:29 +08:00
minggo
b88b9ea994
Merge pull request #9777 from ffskyfan/v3
...
fix the problem that engine can't get data from file on windows
2015-01-06 10:21:36 +08:00
minggo
ef5076983d
Merge pull request #9792 from minggo/memory-leak
...
fix memory leak
2015-01-05 14:20:49 +08:00
minggo
f155386f05
fix memory leak
2015-01-05 13:49:47 +08:00
samuele3hu
832a87f5f0
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-04 17:09:35 +08:00
ffskyfan
cb3b760759
Update CCFileUtils-win32.cpp
...
fix the problem that engine can't get data from file while other app using the file on windows platform
2015-01-04 16:43:10 +08:00
Luis Cabellos
651b7fc13c
Remove warn error on Exit
...
Change the return error on Linux to -1 to standard EXIT_SUCCESS value.
2014-12-31 18:37:59 +01:00
Dale Stammen
79e71b6c50
Merge branch 'v3' into wp8-fix2
2014-12-30 21:25:54 -08:00
Dale Stammen
09efe9be04
removed unused winrt CCPlatformDefine.h
2014-12-30 21:03:33 -08:00
samuele3hu
3795f9cc2a
Rename HttpClient-android.cpp and unify java indent format
2014-12-31 12:03:27 +08:00
samuele3hu
f7ed73c1e1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient
2014-12-31 10:17:12 +08:00
samuele3hu
0e94bdda3a
Use android network module — HttpURLConnection to replace the libcurl on the android platform
2014-12-31 10:15:14 +08:00
Dale Stammen
d33fad0ac7
fixed check for header already included
2014-12-30 16:39:02 -08:00
Dale Stammen
f4cd2e311d
added missing inet_pton() for windows phone
2014-12-30 16:38:18 -08:00
minggo
42e6232113
fix typo and memory leak
2014-12-26 14:25:55 +08:00
minggo
94d70358b7
make FileUtils extendable
2014-12-26 11:34:31 +08:00
minggo
1c87c53ff8
Merge pull request #9636 from musikov/v3-language
...
added Turkish and Ukrainian language;
2014-12-26 09:31:57 +08:00
minggo
3b01762db4
Merge pull request #9638 from yinjimmy/writablepath
...
set default resource root path & writable path
2014-12-26 09:27:59 +08:00
yinjimmy
744a9043f9
set default resource root path & writable path
2014-12-25 20:33:47 +08:00
Mykyta Usikov
d9b5ab4a4c
added Turkish and Ukrainian language;
...
replaced 'tabs' with 'spaces' in Application::getCurrentLanguage();
2014-12-25 12:08:23 +02:00
andyque
60893607cc
fix ci compile error
2014-12-25 15:38:51 +08:00
minggo
0c66e638f7
Merge pull request #8183 from xseekerj/patch-3
...
CCPlatformMacros.h
2014-12-25 14:02:52 +08:00
andyque
6856f03bff
fix webp format premultipliedAlpha error
2014-12-17 14:21:46 +08:00
joewanchen
7b23e3ab1d
remove useless function call.
2014-12-15 19:47:25 +08:00
minggo
a1c60bcf24
Merge pull request #9452 from minggo/java-style
...
[ci skip]use java coding style
2014-12-11 10:55:14 +08:00
minggo
7c07bc6a90
Merge pull request #9449 from Dhilan007/v3-keycode
...
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-11 09:58:57 +08:00
minggo
1d1028a68b
Merge pull request #9410 from andyque/fixEditBox_v3
...
Fix edit box v3
2014-12-10 18:54:20 +08:00
minggo
0e7470505f
replace tab with 4 spaces
2014-12-10 18:32:58 +08:00
Dhilan007
8b78c181ce
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-10 18:11:07 +08:00
minggo
77ed7a47e2
use java coding style
2014-12-10 18:07:46 +08:00
minggo
dd5659b6eb
Merge pull request #9401 from minggo/iss9398-not-close-dir
...
invoke closedir after invoke opendir
2014-12-08 18:10:41 +08:00
andyque
119a68afd9
fix EditBox move animation position is wrong on iPhone6 Plus
2014-12-08 15:34:58 +08:00
minggo
c067338c17
closedir when succeed
2014-12-08 11:36:11 +08:00
minggo
74c80296aa
invoke closedir after invoke opendir
2014-12-08 09:58:58 +08:00
Dale Stammen
1d908f94ab
fixed renameFile for wp8 and winrt to pass file and assetmangers tests
2014-12-05 18:12:25 -08:00
minggo
0d89b9b742
Merge pull request #9368 from huangshiwu/v3_wincpu
...
fix win32 high cpu occupancy rate
2014-12-04 15:17:26 +08:00
minggo
0badda268a
Merge pull request #9366 from Dhilan007/v3-33rc1
...
Fixed label may show nothing when using system font on Mac
2014-12-04 15:11:50 +08:00
huangshiwu
1212b4a6e9
fix win32 high cpu occupancy rate
2014-12-04 14:33:17 +08:00
Wenhai Lin
ed86f65270
Fixed label may show nothing when using system font on Mac
2014-12-03 17:07:51 +08:00
minggo
77b5c40283
Merge pull request #9224 from pjc0247/v3
...
fix C4129 warning
2014-12-03 14:15:38 +08:00
Wenhai Lin
1bfdd757a2
Fixed fail to play background music again after invoking stopBackgroundMusic
2014-12-02 15:03:26 +08:00
Park June Chul
9b792d97c4
Merge pull request #2 from cocos2d/v3
...
update project
2014-11-28 22:52:13 +09:00
minggo
e93ff4f5b7
Merge pull request #8979 from Gamevy/bugfix/release-eaglview-on-ios
...
eaglview release leak in CCEAGLViewImpl-ios
2014-11-26 13:54:49 +08:00
minggo
d7de8a48a3
Merge pull request #9241 from dumganhar/iss8988-left-ctrl
...
issue #8988 : Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHTALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode.
2014-11-26 13:47:36 +08:00
minggo
dbb473fdcb
Merge pull request #9203 from dumganhar/arm64-juno
...
Some updates for neon64 instruction
2014-11-26 11:46:19 +08:00
James Chen
cebfed108c
issue #8988 : Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHT_ALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode.
2014-11-26 10:41:14 +08:00
Dale Stammen
2c8cb4b3bd
updated Application::getCurrentLanguage to work on WP8 and Universal App
2014-11-25 11:21:56 -08:00
Dale Stammen
fac9d2880f
added missing OpenURL support for universal app
2014-11-25 10:05:02 -08:00
Dale Stammen
8da06fb9cc
Merge branch 'v3' into v3-win8.1-appstate
2014-11-25 08:07:29 -08:00
James Chen
528f24010b
Workaround for missing __ctype_get_mb_cur_max function in ndk-r10c
2014-11-25 10:33:16 +08:00
Park June Chul
be60a33d25
fix C4129 warning
2014-11-25 04:52:44 +09:00
minggo
97df35f346
Merge pull request #9207 from dumganhar/iss8984-remove-unused
...
#8984 : Removes unused codes in CCStdC-linux.cpp
2014-11-24 18:48:05 +08:00
minggo
88c3cc2ad9
Merge pull request #9105 from Dhilan007/v3-video-web-fix
...
Fix WebView and VideoPlayer in wrong place on Android 2.3.x
2014-11-24 15:15:18 +08:00
James Chen
cb6d81599b
#8984 : Removes unused codes in CCStdC-linux.cpp
2014-11-24 15:01:57 +08:00
Dale Stammen
fc09fa8798
Merge branch 'v3' into v3-win8.1-appstate
2014-11-21 16:27:01 -08:00
Dale Stammen
a607d41454
implemented lostDevice support when app loses the directx device
2014-11-21 16:24:51 -08:00
Dale Stammen
32fe5d07ae
fixed compiler warning. Don't use _filePath to check tga if it's length is 0
2014-11-21 16:23:54 -08:00
Ricardo Quesada
9fedb14354
Fixes for FileUtils
...
compiles after previous patch
2014-11-21 14:52:13 -08:00
Ricardo Quesada
0f268e7aaa
Merge pull request #9176 from MSOpenTech/v3-winrt-accelerometer-fix
...
Fixed accelerometer for windows store apps device orientation
2014-11-21 11:50:08 -08:00
Bartosz Duszel
fbd27dff9c
changed few loops for C++11 range-based for loop
2014-11-21 20:12:55 +01:00
Dale Stammen
2a86c77066
added foreground, background, lostdevice support
2014-11-21 10:31:57 -08:00
Dale Stammen
9bf15d424f
added CC_PLATFORM_WINRT to enable CC_ENABLE_CACHE_TEXTURE_DATA
2014-11-21 09:52:33 -08:00
Dale Stammen
ff172e0057
fixed accelerometer for windows store apps device orientation
2014-11-20 09:00:22 -08:00
Vladimir Timofeev
a689fc4c7e
sync with upstream
...
Conflicts:
CMakeLists.txt
2014-11-20 12:19:00 +03:00
minggo
9fdd85a1be
Merge pull request #9133 from pyrosphere/fix-wp8-back-key
...
Fix Back Key behaviour and Director::getInstance()->end() on WP8
2014-11-20 11:11:31 +08:00
Dale Stammen
5d2857b3c4
updated angle to commit 4a980d2612
2014-11-19 15:55:18 -08:00
Vladimir Timofeev
1e8aeb7fd2
Minizip
...
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
2014-11-16 22:41:37 +03:00
Filipe Lemos
0898af21ab
Fix Back Key behaviour and Director::getInstance()->end() on WP8
2014-11-16 10:16:16 +00:00
Ricardo Quesada
bc0c3d5a3f
Merge pull request #9085 from jicheol-ryu/v3
...
fix bug - potential memory leak.
2014-11-14 14:17:13 -08:00
Dhilan007
5a8ac8f151
Fix WebView and VideoPlayer in wrong place on Android 2.3.x
2014-11-13 18:15:41 +08:00
minggo
ee31273fa5
Merge pull request #9088 from Dhilan007/v3-audio-Lollipop
...
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() freeze on Lollipop
2014-11-13 16:02:40 +08:00
LinWenhai
48f1bd62d7
remove unrelated modification
2014-11-13 15:43:39 +08:00
LinWenhai
a37549d7bc
Update Cocos2dxMusic.java
2014-11-13 11:00:29 +08:00
wangqm0513
9415b2b930
Update TouchesJni.cpp
...
fixed gamelist can't pull by mouse.
2014-11-12 14:21:48 +08:00
Dhilan007
76c9accec9
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() crash on Lollipop
2014-11-12 13:01:47 +08:00
jicheol-ryu
c94a9ea01a
fix bugs - potential memory leak.
...
const std::string text = std::string((char*)ch,0,len); is using next
string constructor.
string (const string& str, size_t pos, size_t len = npos);
memory leak can occur while type converting char to string.
So we have to use next string constructor.
string (const char* s, size_t n);
http://www.cplusplus.com/reference/string/string/string/
2014-11-12 00:06:30 +01:00
minggo
3b8ddf1b54
Merge pull request #9005 from joshuastray/add-resource-folder-def
...
Update CCFileUtils-linux.cpp
2014-11-07 10:25:14 +08:00
minggo
7565b9b1eb
Merge pull request #8969 from kaylyun/v3
...
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
2014-11-05 17:58:28 +08:00
Jialong Zhai
6e35e91642
Update CCFileUtils-linux.cpp
2014-11-04 18:23:12 +08:00
Unai Orbe
cc2653d657
eaglview shouldn't be released here
2014-10-30 14:51:07 +00:00
Unai Orbe
a2eb8977e0
Uncomment eaglview release CCEAGLViewImpl-ios
...
This is leaking the eaglview when the Director is purged.
In our case, we are leaving the cocos environment on some views which
are implemented with cocoa, and because this eaglview is not being
released, it is getting notifications for keyboard events, and trying to
access stuff on the NULL eaglview, crashing our app.
Uncommnenting this line seems to fix the problem for us, and we haven't
been able to find any nasty side effects.
2014-10-30 11:18:10 +00:00
kaylyun
97c076337a
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
...
Sometimes app directly at the startup on android platform.
2014-10-30 10:21:19 +08:00
Dale Stammen
060779c138
added check for WP8_SHADER_COMPILER
2014-10-28 21:01:26 -07:00
Dale Stammen
a8e0987b8d
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:59:44 -07:00
Dale Stammen
af14b40ba0
must call DisplayInformation::GetForCurrentView() from main UI thread
2014-10-27 13:40:19 -07:00
Dale Stammen
5b69a55121
added check for WP8_SHADER_COMPILER
2014-10-27 11:16:14 -07:00
Dale Stammen
510c8caed7
added DPI support for universal app
2014-10-27 11:12:54 -07:00
Dale Stammen
4dd48d5020
removed mutex. use concurrent_queue for events
2014-10-27 11:08:22 -07:00
Dale Stammen
2eccd58d45
added DPI support for universal app
2014-10-27 11:07:00 -07:00
Dale Stammen
6fb69870f9
fixed compiler warnings for winrt code
2014-10-27 10:57:57 -07:00
Dale Stammen
77c00bc77f
removed use of std::mutex. Now using lock-free concurrent_queue
2014-10-27 08:32:19 -07:00
Dale Stammen
042976265c
updated precompiled shaders for WP8
2014-10-24 07:20:16 -07:00
Dale Stammen
fa6b70cbb8
disabled xaml functions for WP8
2014-10-24 05:59:59 -07:00
Dale Stammen
f42afaa6bb
updated project files with new pch files
2014-10-23 19:40:57 -07:00
Dale Stammen
c82a75d4f7
added xaml support functions
2014-10-23 19:29:38 -07:00
Dale Stammen
2ddb692628
added flyout xaml to support uieditbox on winrt
2014-10-23 19:29:18 -07:00
Dale Stammen
96054e9c29
updated headers for change in pch.h
2014-10-23 19:28:53 -07:00
Dale Stammen
0af2f30d61
fixed WP8_SHADER_COMPILER checks
2014-10-23 08:40:34 -07:00
Dale Stammen
a4294c07c1
added check for WP8_SHADER_COMPILER
2014-10-23 08:32:31 -07:00
Dale Stammen
b5fdf892b2
added text input from keyboard support for winrt
2014-10-23 07:38:46 -07:00
Dale Stammen
cc3b784dd1
added windows 8.1 platform support files
2014-10-23 07:38:04 -07:00
Dale Stammen
1112cad792
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 07:12:51 -07:00
Dale Stammen
3d16bbc6b9
added UIEditBoxEvent. namespace refactor
2014-10-23 07:09:03 -07:00
Dale Stammen
b20015f845
updated for Universal App support
2014-10-23 07:07:58 -07:00
Dale Stammen
06913670dc
use device orientation for acceleration values
2014-10-23 07:04:13 -07:00
Dale Stammen
8af672c588
moved messagebox code to winrt cceglview to handle threading issues
2014-10-23 07:03:41 -07:00
minggo
78fd325ac7
Merge pull request #8889 from Dhilan007/v3-testcase-android
...
Fixed line wrap error for system font on MAC
2014-10-21 16:55:22 +08:00
Dhilan007
90b2d8464b
Fixed line wrap error for system font on MAC
2014-10-21 16:46:00 +08:00
Dhilan007
b741767b37
Rolling back text color of system font on Linux
2014-10-21 14:14:08 +08:00
huanghsiwu
e392bf9b17
fix wp8 debug mode crash - update WP8's precompileshader.h to match shader's modify
2014-10-21 11:14:07 +08:00
Dhilan007
4765ed8494
Fix wrong text color for system font on Linux/Window
2014-10-20 14:33:33 +08:00
minggo
18ca7c936c
Merge pull request #8768 from Dhilan007/v3-33rc
...
Improve Android.mk
2014-10-17 14:09:49 +08:00
Dhilan007
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
minggo
8b1fe93269
Merge pull request #8762 from Dhilan007/v3-33rc
...
disable warn on zero-sized structure[android].
2014-10-17 09:34:41 +08:00
Dale Stammen
41fe4a3e17
dpi for wp8 only
2014-10-16 11:16:26 -07:00
Dhilan007
5595947dc3
disable warn on zero-sized structure[android].
2014-10-16 21:41:52 +08:00
minggo
b4867bf6e5
Merge pull request #8715 from iSevenDays/v3
...
CMakes support for Mac Os X & iOS
2014-10-16 21:16:02 +08:00
Mircea Rila
0678601f61
decrease logging verbosity - CCFileUtils-android
2014-10-16 13:03:39 +03:00
samuele3hu
7fe2b6c0ad
Update the CCFileUtils.h
2014-10-16 11:07:15 +08:00
samuele3hu
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-16 10:59:58 +08:00
samuele3hu
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
minggo
8eed0811fa
Merge pull request #8717 from MSOpenTech/wp8-dll
...
New version of WP8 for cocos2d-x v3.3
2014-10-16 09:33:43 +08:00
Anton Sokolchenko
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
samuele3hu
a0c8ffb943
Modify Xcode project’s configure
2014-10-15 14:32:11 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00
Dale Stammen
2b4d1c204c
updated wp8 precompiled shaders
2014-10-14 18:39:12 -07:00
Dale Stammen
420a19f222
run app after setting delegates
2014-10-14 18:12:24 -07:00
Dale Stammen
d6912c3d84
updated winrt platform files
2014-10-14 16:32:39 -07:00
Dale Stammen
ad9c729f6b
updated winrt include files
2014-10-14 14:20:02 -07:00
Dale Stammen
2ef8b291bf
updated wp8 include files
2014-10-14 14:19:47 -07:00
Dale Stammen
eeeac0a398
updated wp8 include files
2014-10-14 14:19:35 -07:00
Anton Sokolchenko
fc35cc2efe
CMake fix for Mac Os X.
...
You can open project with CLion and see that everything works.
2014-10-15 00:19:29 +03:00
Dale Stammen
ef13db4643
updated pch include files
2014-10-14 14:19:14 -07:00
Dale Stammen
946121ec71
added CC_DLL to export classes
2014-10-14 14:18:56 -07:00
Dale Stammen
adfe072937
fixed include paths
2014-10-14 14:18:31 -07:00
Dale Stammen
37cd3dc7f9
added check for WP8_SHADER_COMPILER
2014-10-14 14:18:14 -07:00
Dale Stammen
bbca4823f5
fixed check for WINRT_NO_WINSOCK
2014-10-14 14:17:49 -07:00
Dale Stammen
7a57ea4cb8
added Windows 8.1 ANGLE support
2014-10-14 14:17:28 -07:00
Dale Stammen
e0157f7471
check for WP8_SHADER_COMPILER
2014-10-14 14:16:52 -07:00
Dale Stammen
fbc25a055c
updated winrt include
2014-10-14 14:16:24 -07:00
Dale Stammen
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
lite3
3419a38961
Merge remote-tracking branch 'upstream/v3' into v3
2014-10-11 17:40:47 +08:00
minggo
5a60e99131
Merge pull request #8577 from ntotani/detach-thread-on-exit
...
call detach method on thread exit
2014-10-11 16:54:59 +08:00
minggo
c01d1b1166
Merge pull request #8646 from huangshiwu/v3_languagecode
...
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
2014-10-11 16:23:49 +08:00
huangshiwu
4dd9120e67
fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string
2014-10-11 15:19:20 +08:00
martell
0d26b33eaa
mingw64: mirgrate to upstream minizip
2014-10-11 04:39:42 +01:00
lite3
e1814d0480
add virtual in FileUtilsAndroid::getNewFilename
2014-10-11 11:20:14 +08:00
Ricardo Quesada
ee3086ff8d
compiler fixes for windows
2014-10-10 17:41:11 -07:00
Dhilan007
7fb448e90f
add 'static' for global function
2014-10-10 15:13:05 +08:00
Dhilan007
250875b081
fixed compile error
2014-10-10 14:03:20 +08:00
Dhilan007
6a8c4f4194
Fixed FileUtils::removeFile doesn't work on iOS
2014-10-10 11:59:35 +08:00
Huabing.Xu
d5e29d285d
fix gel Config error on android
2014-10-09 18:34:14 +08:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
Naoyuki Totani
b0d1fb79b3
call detach method on thread exit
2014-10-08 18:34:06 +09:00
martell
8a4b8afc6c
Android: added support for building libcocos2d
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:35 +01:00
martell
1a7ecbe427
Finalise Mac Support for cmake
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:19 +01:00
martell
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
martell
d9228d31c0
added support for static and shared builds on windows
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:18 +01:00
martell
1ef0f41e0e
Changed WIN32 to _WIN32 to support gnu c++11
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:17:55 +01:00
lite3
21081b9e1a
use reference
2014-09-30 01:07:19 +08:00
lite3
240b922271
remove '../' at path on android.
...
because AAssetManager_open do not support '../' in path.
2014-09-29 19:31:05 +08:00
Huabing.Xu
88679c2437
change tab to space
2014-09-29 18:44:01 +08:00
minggo
0cd2f985e8
Merge pull request #8172 from dabingnn/v3_fixEGLConfigCrashBug
...
fix egl config chooser bug
2014-09-29 18:24:19 +08:00
minggo
8a5829631d
Merge pull request #8171 from huangshiwu/v3_Teivaz
...
Enable screen orientation change handling - by Teivaz
2014-09-29 18:02:03 +08:00
xseekerj
0bfd934d03
CCPlatformMacros.h
...
Added std::nothrow for CREATE_FUNC.
2014-09-27 19:53:44 +08:00
Dale Stammen
24e5df1644
updated wp8 precompiled shaders
2014-09-26 12:16:16 -07:00
Dale Stammen
67377b7d46
added check for WINRT_NO_WINSOCK
2014-09-26 12:05:19 -07:00
Dale Stammen
ef58fa7fd4
fixed winrt file functions to pass app certification tests.
2014-09-26 11:38:17 -07:00
Huabing.Xu
d7a5c464dd
remove test code
2014-09-26 16:37:05 +08:00
Huabing.Xu
7cfcdc1af8
fix egl config chooser bug
2014-09-26 16:23:54 +08:00
huanghsiwu
7a2a44ad88
Enable screen orientation change handling - by Teivaz
2014-09-26 16:16:34 +08:00
minggo
d491d9e6db
Merge pull request #8149 from andyque/fixIOS8EditBox
...
fix ios8 EditBox orientation problem
2014-09-25 13:47:23 +08:00
minggo
2620592d62
Merge pull request #7975 from newnon/v3_openUrl
...
openUrl function for all platform but on windows RT empty function
2014-09-25 13:41:08 +08:00
andyque
34fbca9c50
fix ios8 EditBox orientation problem
2014-09-25 11:46:42 +08:00
minggo
6a437d79b1
Merge pull request #8138 from MSOpenTech/wp8-v3.3
...
WP8 v3.3 bug fixes
2014-09-25 10:39:37 +08:00
minggo
04aa44aeea
Merge pull request #8141 from huangshiwu/v3_wp8test
...
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 09:40:10 +08:00
huanghsiwu
49f1927d5d
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 07:41:51 +08:00
minggo
79446999bb
Merge pull request #8116 from Dhilan007/v3-labelfix
...
Cocos2d-x used a deprecated method to calculates the bounding rect of a string on iOS 7.
2014-09-24 15:03:40 +08:00
Sergey Perepelitsa
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
Dale Stammen
2226aa5c8a
need to reset the accelerometer before trying to enable it again
2014-09-23 10:01:42 -07:00
Guy Kogus
6e91c65e74
Windows Phone 8 can now open URLs.
2014-09-22 17:47:38 +04:00
Guy Kogus
a9a0ff35f6
Added method for converting from std::string to Platform::String.
2014-09-22 17:47:38 +04:00
Sergey
2255cf91ba
openUrl function for all platform but on windows RT empty function
2014-09-22 17:47:38 +04:00