f3aef10d33
Should be const reference for data/string args to be written.
2016-01-27 11:22:46 +08:00
c75cfcbbfa
Export WICImageLoader form DLL
2016-01-21 15:35:51 -07:00
790c7b4b79
Merge pull request #14891 from mogemimi/fix-extra-tokens-warning
...
Fix warning: extra tokens at end of #ifdef directive
2016-01-21 10:51:01 +08:00
4d128a83f4
Merge pull request #14659 from elvman/resizable_window
...
Resizable window
2016-01-21 10:49:33 +08:00
2ed4965b6d
Merge pull request #14751 from newnon/v3_get_version_windows
...
getVersion win32 implementation
2016-01-21 10:42:19 +08:00
74f9f3fd0e
Merge pull request #14905 from WenhaiLin/v3-remove-CocosPlayClient
...
Remove CocosPlayClient
2016-01-20 18:24:16 +08:00
a64be12646
added missing getFileSize() method for winrt
2016-01-19 12:36:10 -08:00
718d2c690b
Remove CocosPlayClient
2016-01-18 17:58:04 +08:00
b14a3730ca
Fix warning: extra tokens at end of #ifdef directive
2016-01-17 03:17:00 +09:00
f9e8ae0f09
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-01-13 21:14:38 +08:00
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
770f3d7f8e
Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK
2015-12-29 18:31:20 +08:00
492389fd5b
Update CCPlatformConfig.h
2015-12-28 16:03:48 -08:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
728682d68e
Fix variable type mismatch.
2015-12-25 17:18:15 +08:00
dea99211fb
Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10
2015-12-25 11:44:11 +08:00
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
bac68bd0b8
getVersion win32 implementation
2015-12-20 00:09:45 +03:00
278bbb77c5
CCFileUtils-apple.mm Grammatical errors
...
`termniate` -> `terminate`
2015-12-18 17:34:52 +08:00
b30553e933
WebP loading improvements WebP loaded as premultiplied alpha if it have alpha
2015-12-17 12:07:56 +03:00
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
23bf815cfa
Fix 3d touch compile error in lower version Xcode
2015-12-14 14:26:52 +08:00
fc84306bcb
Always update design resolution
2015-12-14 01:20:38 +02:00
4b33d730de
Calculate frame size with zoom factor
2015-12-14 00:53:46 +02:00
718422c1d9
Set frame size on window resize
2015-12-14 00:20:29 +02:00
f6c2758801
Merge pull request #14409 from xiaofeng11/v3_combine_opengl
...
Combine Studio change for openGL related operation
2015-12-03 23:03:40 -08:00
0e34a864b2
Merge pull request #14528 from xiaofeng11/v3_3dtouch
...
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-03 22:21:48 -08:00
e23432c6fa
Merge pull request #14530 from cezheng/fix/downloader_bug_ios_android
...
Fix Downloader bug iOS & Android
2015-12-03 18:46:43 +08:00
5dfc8f6a26
Remove default arguments
2015-12-02 11:02:27 +08:00
18666a9b41
Merge pull request #14393 from xiaofeng11/v3_combine_3d
...
Combine Studio change for 3d components
2015-12-02 09:47:12 +08:00
d174a98afa
Add a buffer queue for Android Downloader to prevent out of memory
...
When the AssetManagerEx start downloading, it used to create all the
download tasks all at once. When the app has a large number of asset
files, it is likely to crash due to out of memory when creating
threads for each of the download tasks. This commit adds a buffer
queue to the downloader to use the `countOfMaxProcessingTasks`
property from hints, preventing all the tasks from starting all at once.
2015-12-01 16:25:50 +09:00
bb832f8d60
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-01 13:02:53 +08:00
60624b8fd5
fix Keyboard fails to hide on iOS.
...
ticket: https://github.com/cocos2d/cocos2d-x/issues/14477
2015-11-28 15:37:58 +08:00
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
c4b995fe59
updates to JniHelper, refactoring of existing JNI calls
2015-11-27 12:00:33 +03:00
f0cc8e7f25
Fix keyboard won't dismiss on iOS issue
2015-11-27 15:44:35 +08:00
c0f7ecfcde
User GetModuleFileNameW in all condition, it is more safe than _get_wpgmptr
2015-11-25 09:49:19 +08:00
722f20c4b6
Update implement remove condition macro check.
2015-11-24 18:29:58 +08:00
f4d317f1fd
Combine Studio change for get program file full path.
2015-11-19 15:21:14 +08:00
acd3b5cbc4
Combine Studio change for openGL related operation
2015-11-17 13:38:42 +08:00
8695fbe711
Merge pull request #14172 from njh0602/somefix2
...
Add virtual keyword.
2015-11-11 14:17:27 +08:00
ac06c9f8bb
Merge pull request #14260 from pyrosphere/add-app-version
...
Added Application::getVersion() to get the app version.
2015-11-11 14:13:42 +08:00
f604f66539
Update only frame size on window resize
2015-11-11 04:42:58 +02:00
eb8b761381
Add option to create resizable window
2015-11-11 01:17:48 +02:00
d86d32fb09
constexpr for signature, garbage collection and compile-time error for unsupported argument types
2015-11-10 23:39:16 +03:00
80e8b58b53
easy jni
2015-11-07 23:57:05 +03:00
fec8a5db02
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
2015-11-06 13:05:40 +07:00
1a56668cd3
Fix "TextureCache Test" in js-test crash under Android
2015-11-06 09:49:19 +08:00
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
7fe2b87574
CREATE_FUNC macro NULL -> nullptr
2015-10-31 20:18:39 +09:00
61ce3e8a03
Fixed warnings about missing override in CCApplication for iOS/Mac
2015-10-30 10:02:07 +00:00
11fc969ecb
Fixed inconsistency in getVersion() when no version is available on Android
2015-10-29 17:14:32 +00:00
9aa1f7138d
Added override keyword to getVersion
2015-10-29 08:36:03 +00:00
04fa7a8902
Added Application::getVersion() to get the app version.
2015-10-28 17:57:57 +00:00
7b758fd780
Fixed text may display of incomplete when Label create with system font on Mac.
2015-10-28 12:06:58 +08:00
d2d60e36d2
Merge pull request #14222 from TheCodez/fix_memoryleak
...
Fix memory leak in Enhance-API
2015-10-27 17:22:11 +08:00
561b15e260
Fix memory leak in Enhance-API
2015-10-24 14:26:59 +02:00
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
a7e5946b7d
Merge pull request #14154 from Dimon4eg/fix-crash-in-web-view-on-android
...
Fix crash in web view on android
2015-10-22 10:35:00 +08:00
7e43e28ca2
Fix crash in java code only
2015-10-21 16:55:25 +03:00
4012dd8455
Fix naming typos
2015-10-21 15:56:47 +09:00
d8e10981db
added check to see if app is already visible
2015-10-20 10:38:42 -07:00
34831d48ce
Fix memory leak in GLViewImpl
2015-10-19 19:46:45 +09:00
be45e0bc50
Merge pull request #14174 from noshbar/v3
...
CPPCheck fixes, correct deallocation, array size.
2015-10-19 10:05:01 +08:00
fdebb373b1
updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5
2015-10-16 15:36:34 -07:00
f49d467465
Add virtual keyword.
2015-10-17 04:46:37 +09:00
88bcaad518
General fixes:
...
- changed some delete operations to be deletions of arrays where applicable
- changed some "free" operations to "delete" where memory was allocated with "new"
CCPUScriptCompiler.cpp:
- added checks to see if temp1 and temp2 are non-null before dereferencing them
FileServer.cpp:
- changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
2015-10-16 21:43:09 +02:00
4c7edd457e
set _hasPremultipliedAlpha to false
2015-10-13 15:45:24 +08:00
5b35796093
Merge pull request #14091 from yangws/v3
...
Fix textfield input Chinese error with specific IME on Android.
2015-10-12 14:54:56 +08:00
c2571f950c
Merge pull request #14003 from zilongshanren/fixWebViewCallback
...
fix ui::WebView callback operate OpenGL issue.
2015-10-10 11:32:02 +08:00
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
90ef4be103
Fix textfield input chinese error with specific IME on Android.
2015-10-09 12:06:22 +08:00
7fd2ad7548
remove unneeded final temp string
2015-10-08 11:47:11 +08:00
c787e2c1b0
Merge pull request #14073 from mogemimi/fix-compiler-warning
...
Fix -Wformat-security warning on Xcode
2015-10-08 11:01:15 +08:00
8c04c01953
Fix -Wformat-security warning on Xcode
2015-10-05 19:53:03 +09:00
49e8abbc58
added #if _MSC_VER < 1900
2015-10-04 09:32:48 -07:00
b38eec4d47
Merge pull request #13999 from igorzel/FixIntegerOverflowInIosDevice
...
Fix crash (integer overflow) in Device::getTextureDataForText (ios)
2015-10-04 11:00:07 +08:00
32eeb560c3
clean up include files for WINRT platforms
2015-10-02 18:49:41 -07:00
5c0d6691ca
Fix bug: FileUtils::GetFileSize can't treat multi-char path.
2015-09-25 14:50:20 +08:00
bee52e378d
fix ui::WebView callback operate OpenGL issue.
...
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
2015-09-23 11:22:36 +08:00
40a6789765
Fixed integer overflow in Device::getTextureDataForText (in CCDevice-ios.mm)
...
There was the problem when “height” and “width” were typecast to short
integer. So for values more than sizeof(short) we had integer overflow.
Steps to reproduce:
Create simple application with EditBox. Start it. Add 1000 (just
example) characters at a time to the EditBox. Method
Device::getTextureDataForText will be called and there will be integer
overflow for “height” and “width”. As a result application will crash
later.
2015-09-22 13:25:43 +03:00
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
deacab9222
Merge pull request #13990 from MSOpenTech/v3-win10-fix
...
V3 Win10 UWP fixes
2015-09-22 01:57:53 +08:00
d5151952bb
fixed compiler warning
2015-09-21 10:43:28 -07:00
9246d50a7f
Merge pull request #13234 from perminovVS/v3-dev-check-create-window
...
glfwCreateWindow not guarantee create
2015-09-20 23:22:47 +08:00
83db28ac9e
Added const qualifier to CC_PROPERTY get method
...
This macro is inconsistent with others, get methods should be const.
2015-09-19 01:54:52 +01:00
7ac0b861c9
Merge pull request #13905 from perminovVS/win32-remove-dir-correct-point
...
FileUtilsWin32 removeDirectory correct remove file begins with point
2015-09-18 18:14:20 +08:00
6a975fe641
Merge pull request #13599 from perminovVS/winrt-mouse-support
...
WinRT support mouse
2015-09-18 17:26:15 +08:00
06b74695c2
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
...
Fix bags, can't open file on windows platforms, if this contains utf8
chars
2015-09-17 23:30:32 +03:00
fdacdcae07
FileUtilsWin32 removeDirectory correct remove file begins with point
...
Need check fileName . and .. for delete folders and files begin name.
2015-09-17 22:36:43 +03:00
583e780e29
Correct all templates
2015-09-17 22:09:41 +03:00
1be5402050
Merge branch 'v3' into addiOSMultiline-support
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
2015-09-16 21:49:55 +08:00
ea585f4b7d
Fix compile problems.
2015-09-16 09:34:24 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
556175df1e
add iOS EditBox multiline support
...
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.
Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
2015-09-15 13:52:39 +08:00
bd80eb6f46
CCDownloader-android implements Data Task Download.
2015-09-10 18:03:15 +08:00
7e2fe05050
CCDownloader-android implements File Task Download.
2015-09-10 15:56:06 +08:00
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
f9c20caa67
Merge pull request #13603 from perminovVS/correct-key-code
...
Desktop and WinRT use correct keyboard codes
2015-09-04 14:39:44 +08:00
ab5b634976
Merge pull request #13625 from frranck/patch-4
...
Update CCImage.cpp
2015-09-03 00:10:16 +08:00
527e254617
Remove glfwError
2015-09-02 18:41:23 +03:00
c1ac27fffb
glfwError no static member
2015-09-02 15:02:23 +03:00
c0f40ad4a5
fix Android EditBox font size issue
2015-09-02 18:25:30 +08:00
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
8e195723e6
Update CCImage.cpp
...
When you're creating a sprite (e.g. with Sprite* Sprite::create(filename))
There's no way to test the file before, without getting "a unsupport image format!" thrown.
2015-08-30 09:40:15 +02:00
b5688f504c
Desktop and WinRT use correct keyboard codes
...
Desktop:
GLFW_KEY_ENTER equals KEY_ENTER ( GLFW_KEY_KP_ENTER = KEY_KP_ENTER)
WinRT:
VK_PRIOR equals KEY_PG_UP ( not KEY_KP_PG_UP )
2015-08-27 23:46:24 +03:00
bf40c1acd1
WinRT support mouse event
...
Mouse event implemented similar Desktop version.
Left button send mouse event and touch.
Support other mouse button and scroll wheel.
2015-08-27 21:34:25 +03:00
b5c289c622
WinRT support Show/Hide mouse cursor
2015-08-27 21:19:59 +03:00
30d52d1394
Fix #13591
2015-08-27 17:12:07 +09:00
d6045fdbea
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
2015-08-27 10:40:04 +08:00
09a1211c96
use isWindowsPhone() to check for Windows Phone platform
2015-08-26 09:47:59 -07:00
4cb3d88232
added isWindowsPhone() to correctly detect Windows 10 phone
2015-08-26 09:19:28 -07:00
fcae139857
removed old WP8_SHADER_COMPILER defines
2015-08-26 08:50:11 -07:00
24282e6e55
Merge pull request #13397 from perminovVS/v3-dev-winrt-correct-unicode
...
Correct use and convert unicode from utf8. WinRT
2015-08-24 11:36:30 +08:00
c47de9d04f
make new render surface current after device lost
2015-08-20 13:26:03 -07:00
8493365be7
updates to pass Windows App Certification tests
2015-08-18 11:06:47 -07:00
ee7b9377de
removed old wp8 code that breaks Win10 WACK tests
2015-08-17 18:40:07 -07:00
24d06bb1c9
More use StringUtf8ToWideChar and PlatformStringFromString
2015-08-17 23:04:05 +03:00
a16d04fb53
CCUtf8ToUnicode and CCUnicodeToUtf8 deprecated
2015-08-16 13:08:00 +03:00
d70a21aa25
Correct use and convert unicode from utf8
...
Move StringUtf8ToWideChar and StringWideCharToUtf8 to CCWinRTUtils(
Replace CCUtf8ToUnicode)
Use StringUtf8ToWideChar for convert utf8 to unicode
Use StringWideCharToUtf8 for convert unicode to utf8
2015-08-16 12:51:41 +03:00
a0c270234b
Replace tab with spaces
2015-08-14 21:17:51 +08:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
be1d3ccc67
Merge pull request #13324 from zilongshanren/fix-editbox-soft-keyboard-backissue
...
fix ui::TextField status error.
2015-08-12 13:57:10 +08:00
763976d50c
fix ui::TextField status error.
...
1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox.
2. Reorder the event handling in ui::TextField.
2015-08-12 11:05:07 +08:00
f3f67a10f9
Merge pull request #13232 from perminovVS/v3-dev-get-file-extension
...
Add getFileExtension to FileUtils
2015-08-11 15:54:55 +08:00
b2bf8469f0
Fix EditBox turning black when soft keyboard hide.
...
I disable a optimization when users start to type, the resize layout's
doLayout event should be stoped.
But it has bugs. If we could find reliable soft keyboard show/hide
event detection method, we could enable this optimization again.
2015-08-11 11:42:37 +08:00
f6569f24f4
Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix
...
Re-implement Editbox on Android platform.
2015-08-09 10:25:19 +08:00
a35e89225e
Re-implement Editbox on Android platform.
...
This PR also fixed issue:
https://github.com/cocos2d/cocos2d-x/issues/9572
For the new EditBox:
1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.
When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.
2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.
3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
2015-08-07 17:27:15 +08:00
ba02d9df1d
fix engine crash because of wrong initialisation on some android device
2015-08-07 16:37:41 +08:00
0d778386f4
Merge pull request #13208 from dabingnn/v3_fixViewportCompile
...
Make viewport constructor more compile friendly
2015-08-06 17:45:23 +08:00
8585120abb
glfwCreateWindow not guarantee create
...
Need check glfwCreateWindow and show info, if there is a problem
2015-08-05 23:06:16 +03:00
7cacdaeaf1
Add getFileExtension to FileUtils
...
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.
More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )
And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
2015-08-05 22:21:16 +03:00
881adf6f36
Merge pull request #13217 from jianglong0156/fixTextFieldBug
...
fix textfield and editbox can not input emoticon
2015-08-05 17:41:19 +08:00
47fe470647
Merge pull request #13213 from jianglong0156/improUtfFunction
...
add api getStringUTFCharsJNI newStringUTFJNI
2015-08-05 17:26:52 +08:00
42ed314463
fix textfield and editbox can not input emoticon
...
fix textfield and editbox can not input emoticon and improve the api comments
2015-08-05 17:03:06 +08:00
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
5f9a3b97fb
fix viewport constructor error in old compiler to make it more compatible.
2015-08-05 10:57:27 +08:00
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
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
d20052cc22
Fix line wrapper in CCDevice
2015-08-04 11:07:04 +08:00
f48a9fb9f0
getDPI for Mac Implemented
2015-08-03 17:12:52 +05:30
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
f74438372c
Merge pull request #11293 from perminovVS/v3-dev-screen-size-bug
...
GLViewImpl initWithRect bug size
2015-07-31 18:43:23 +08:00
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
e1d4d22353
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-29 18:43:11 +08:00
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
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
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
9edd66d4a7
Label:support font that contains GB2312 char map.
2015-07-28 16:28:32 +08:00
2deb492d36
compiles and runs on Xcode 7
2015-07-23 14:28:23 -07:00
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
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
14a419d725
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after activity recreate.
2015-07-20 11:14:06 +08:00
66dadea0cd
Rollback log level
2015-07-17 15:56:51 +08:00
f0b29814c3
Label:support font that contains GB2312 char map.[android]
2015-07-16 21:35:10 +08:00
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
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
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
ea773cac20
Fixed setAnimationInterval JNI bug.
2015-07-14 15:11:35 +08:00
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
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
06bf6ffa90
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-14 09:35:01 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
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
e65b01bdc0
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-13 17:06:01 +08:00
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
8bc68395de
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586
2015-07-13 11:00:18 +08:00
142d354485
[ci skip]Replace tab with spaces.
2015-07-10 21:03:43 +08:00
b459940bb8
[ci skip]Replace tab with spaces.
2015-07-10 20:47:21 +08:00
c68469a611
Update Nibiru SDK.
2015-07-10 20:42:05 +08:00
34aa7a0bb1
Remove unused variable.
2015-07-10 16:40:02 +08:00
1711a70869
Merge v3 branch.
2015-07-10 16:39:36 +08:00
187c72e2b9
[ci skip] replace tab with 4 space.
2015-07-10 16:17:34 +08:00
2d27091398
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
...
add write api in FileUtils
2015-07-10 15:13:21 +08:00
52293ad451
Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'.
2015-07-10 14:37:42 +08:00
02226c6a26
Fix bug: Clipping node doesn't work on Android 5.0.
2015-07-09 16:49:26 +08:00
d55c0c64c5
add std::nothrow
2015-07-08 15:19:17 +08:00
7e26c381c6
remove invalid code
2015-07-08 14:36:37 +08:00
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
4bd1fa7d37
Fixed crash cause by the case of file name on WIN32.
2015-07-07 10:08:47 +08:00
ad1fc88fa8
compiles on Xcode 7
2015-07-06 16:30:29 -07:00
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
4499b60446
Refine setAnimationInterval from double to float.
2015-07-06 14:57:42 +08:00
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
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
363da2beab
Fixed : #12645 iOS: depth/stencil buffers attributes are ignored
2015-07-02 12:07:24 +03:00
a28ad6939d
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-02 16:19:33 +08:00
7684c208e0
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:41:44 -07:00
eb668f63ce
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:39:31 -07:00
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
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
ed029d264f
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
2015-06-23 18:40:39 +08:00
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
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
79aa300448
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
2015-06-23 13:42:32 +08:00
b275ce2283
Label:Fixed IllegalArgumentException on Android 2.3.x
2015-06-23 13:38:06 +08:00
55b86b2e14
add more docs for samsung enhanced API
2015-06-19 18:09:42 +08:00
c249f7cb69
keep old behavior
2015-06-15 19:48:12 +08:00
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
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
518de1ff57
[ci skip]Android Studio projects:Fixed compile error.
2015-06-15 14:42:45 +08:00
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
19ef0e0983
Fix indent
2015-06-12 13:01:13 +08:00
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
6dfe937cae
Merge pull request #11892 from dabingnn/v3FrameBufferObject
...
V3 frame buffer object
2015-06-11 14:04:30 +08:00
10352c40b2
Merge branch 'v3' into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
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
b79eec0b20
fix grid bug for viewport
2015-06-09 17:24:30 +08:00
ef4978f0cd
move viewport to experimental namespace
2015-06-09 16:21:50 +08:00
6fec9c40b0
SimpleAudioEngine:Fixed thread safety problem on android.
2015-06-09 15:07:35 +08:00
97b387560b
revert some accidental changes
2015-06-09 14:06:11 +08:00
f1d879f7ed
remove old path When added existing new searchPath
2015-06-08 13:34:45 +08:00
133ef90c09
Merge branch 'v3Viewport' into v3FrameBufferObject
...
# Conflicts:
# cocos/renderer/CCFrameBufferObject.h
2015-06-06 18:16:22 +08:00
6216e74a38
Merge pull request #12165 from gyf19/v3
...
HttpClient Android supports gzip
2015-06-04 22:00:13 +08:00
ad1f7c472c
add render buffer render target for color attachment
2015-06-04 11:18:35 +08:00
38c9490f4d
don't delete rendering thread. SpiderMonkey needs to stay on same thread
2015-06-03 09:19:05 -07:00
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
88697bf136
Remove unused function.
2015-06-02 16:38:06 +08:00
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
9d8225aae8
Improve UserDefault's robustness on Android.
2015-06-01 15:09:11 +08:00
27d0f6328f
origin code of viewport
2015-06-01 14:26:08 +08:00
09b52331d1
issue #12078 : added renderer group and removed core and support group.
2015-06-01 13:43:56 +08:00
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
05d33ac0c8
removed old WP8 files
2015-05-28 14:08:25 -07:00
ef39251d14
issue #12078 : added platform group
2015-05-28 15:47:40 +08:00
bbfc33dfd2
format
...
format
2015-05-28 11:03:49 +08:00
9e477303f1
delete useless TAG
...
delete useless TAG
2015-05-28 10:55:10 +08:00
0007799794
modify Enhance API
...
modify Enhance API
2015-05-28 10:47:12 +08:00
9ee4b4af1e
Merge branch 'v3' into v3-winrt-audio
2015-05-27 11:54:21 -07:00
4501a53cfa
Added MP3 support to simple audio engine
2015-05-27 10:57:26 -07:00
999de9072a
Merge pull request #12003 from minggo/remove-unneeded-function
...
remove uneeded function
2015-05-25 16:33:38 +08:00
db0caf68c6
remove uneeded function
2015-05-25 09:50:48 +08:00
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
aa7876aefc
remove deprecated methods
2015-05-20 07:55:10 -07:00
cada493685
remove deprecated methods
2015-05-20 07:51:52 -07:00
a569d877ba
[ci skip]Remove unnecessary code.
2015-05-20 18:05:46 +08:00
df3548673f
Remove unnecessary files.
2015-05-20 10:19:32 +08:00
e700ef6d30
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
...
Add Android Studio support
2015-05-18 16:17:24 +08:00
26f094b1a7
Remove unnecessary files
2015-05-18 16:02:05 +08:00
6dd3108e42
Rename module
2015-05-18 15:01:20 +08:00
bfb3fbb1c0
Revert _checkPath
2015-05-17 19:24:57 +03:00
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
dc8492948e
Add Android Studio support
2015-05-15 16:37:43 +08:00
68ec7c8ca1
Add enhance service API
...
Add enhance service API
2015-05-15 14:29:22 +08:00
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
989848a358
fixes memory leak
...
improves performance a little bit
2015-05-14 17:24:27 -07:00
0a3e6338f1
Merge pull request #11834 from pandamicro/v3_origin
...
Sync fixes in Cocos2d-JS
2015-05-14 13:38:18 +08:00
8577055d5a
Implement localStorage.clear on Android
2015-05-14 10:40:25 +08:00
9d7e5e5edc
Fix crash in web view if illegal character in url (Android only)
2015-05-13 14:56:07 +03:00
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
5e87bd307b
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
...
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
f1fe802442
updated winrt keyboard support to support physical keyboard
2015-05-12 09:20:10 -07:00
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
a718c11eb6
Merge pull request #11724 from andyque/fix-binding-generator
...
fix upstream compile error
2015-05-07 11:47:20 +08:00
db95034798
fix android compile error
2015-05-07 10:37:19 +08:00
dfe30e159f
Need JNIEXPORT for -fvisibility=hidden
2015-05-06 14:24:48 +09:00
26c9be7881
Add FileUtils::getSuitableFOpen[window-universal]
2015-05-04 16:06:04 +08:00
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
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
1950498b0a
Replace tab with space.
2015-04-29 18:41:10 +08:00
1d9ff11837
VideoPlayer:Fixed can't play video on Android 2.3.x
2015-04-29 18:32:59 +08:00
2d2f0aac59
fix indent
2015-04-27 16:25:24 +08:00
8c4cecca0d
fix indent and translate Chinese comment to English
2015-04-27 16:22:54 +08:00
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
9496a48800
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3
2015-04-24 18:29:23 +08:00
61cf0ad28b
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
2015-04-23 15:46:19 +08:00
ac8755868d
need to call Cleanup() if app is terminating
2015-04-22 19:13:12 -07:00
b78f830ed8
cleaned up Draw()
2015-04-22 19:11:42 -07:00
4119b0f10d
cleaned up Draw()
2015-04-22 19:11:29 -07:00
22daece170
made Cleanup() public
2015-04-22 19:08:11 -07:00
c3335551b8
added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE
2015-04-22 19:07:48 -07:00
7c77bc9587
Add the PolySprite support and adjust the project setting on the different platform
2015-04-23 00:51:47 +08:00
0f3ff6f762
Merge branch 'v3' into v3-winrt-typo-fix
2015-04-21 18:18:00 -07:00
84a47000b5
rename -win to -winrt
2015-04-21 18:17:18 -07:00
aec086a473
convert BGR and RGB to GUID_WICPixelFormat24bppRGB
2015-04-21 18:16:54 -07:00
516966a96f
check for PixelFormat::DEFAULT
2015-04-21 18:11:56 -07:00
0c47df5df2
fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments
2015-04-21 06:21:32 -07:00
83b68ef693
added comment on how back button event is handled
2015-04-20 18:36:58 -07:00
50f381f070
added CCLOG message to describe how to handle Windows Phone back button event
2015-04-20 18:30:52 -07:00
4169ebf5c8
Windows Phone 8.1 back button and terminate app support
2015-04-20 10:43:34 -07:00
e00b0dfbd9
Merge branch 'v3' into v3-winrt-backbutton
2015-04-20 08:17:16 -07:00
2476f2b52d
fixed win32 application return code
2015-04-20 18:27:21 +08:00
dc768dbd8c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge
2015-04-20 10:06:48 +08:00
ec378b612e
added listener if back button event not handled by app
2015-04-19 18:53:10 -07:00
Xpol Wan