pandamicro
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
dimon4eg
7e43e28ca2
Fix crash in java code only
2015-10-21 16:55:25 +03:00
mogemimi
4012dd8455
Fix naming typos
2015-10-21 15:56:47 +09:00
Dale Stammen
d8e10981db
added check to see if app is already visible
2015-10-20 10:38:42 -07:00
mogemimi
34831d48ce
Fix memory leak in GLViewImpl
2015-10-19 19:46:45 +09:00
pandamicro
be45e0bc50
Merge pull request #14174 from noshbar/v3
...
CPPCheck fixes, correct deallocation, array size.
2015-10-19 10:05:01 +08:00
Dale Stammen
fdebb373b1
updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5
2015-10-16 15:36:34 -07:00
Dirk de la Hunt
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
yangxiao
4c7edd457e
set _hasPremultipliedAlpha to false
2015-10-13 15:45:24 +08:00
pandamicro
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
pandamicro
c2571f950c
Merge pull request #14003 from zilongshanren/fixWebViewCallback
...
fix ui::WebView callback operate OpenGL issue.
2015-10-10 11:32:02 +08:00
mogemimi
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
Vincent Yang
90ef4be103
Fix textfield input chinese error with specific IME on Android.
2015-10-09 12:06:22 +08:00
zilongshanren
7fd2ad7548
remove unneeded final temp string
2015-10-08 11:47:11 +08:00
pandamicro
c787e2c1b0
Merge pull request #14073 from mogemimi/fix-compiler-warning
...
Fix -Wformat-security warning on Xcode
2015-10-08 11:01:15 +08:00
mogemimi
8c04c01953
Fix -Wformat-security warning on Xcode
2015-10-05 19:53:03 +09:00
Dale Stammen
49e8abbc58
added #if _MSC_VER < 1900
2015-10-04 09:32:48 -07:00
pandamicro
b38eec4d47
Merge pull request #13999 from igorzel/FixIntegerOverflowInIosDevice
...
Fix crash (integer overflow) in Device::getTextureDataForText (ios)
2015-10-04 11:00:07 +08:00
Dale Stammen
32eeb560c3
clean up include files for WINRT platforms
2015-10-02 18:49:41 -07:00
Vincent Yang
5c0d6691ca
Fix bug: FileUtils::GetFileSize can't treat multi-char path.
2015-09-25 14:50:20 +08:00
zilongshanren
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
igorzel
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
Martin Taylor
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
pandamicro
deacab9222
Merge pull request #13990 from MSOpenTech/v3-win10-fix
...
V3 Win10 UWP fixes
2015-09-22 01:57:53 +08:00
Dale Stammen
d5151952bb
fixed compiler warning
2015-09-21 10:43:28 -07:00
pandamicro
9246d50a7f
Merge pull request #13234 from perminovVS/v3-dev-check-create-window
...
glfwCreateWindow not guarantee create
2015-09-20 23:22:47 +08:00
pandamicro
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
pandamicro
6a975fe641
Merge pull request #13599 from perminovVS/winrt-mouse-support
...
WinRT support mouse
2015-09-18 17:26:15 +08:00
Vladimir Perminov
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
Vladimir Perminov
583e780e29
Correct all templates
2015-09-17 22:09:41 +03:00
andyque
1be5402050
Merge branch 'v3' into addiOSMultiline-support
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
2015-09-16 21:49:55 +08:00
Vincent Yang
ea585f4b7d
Fix compile problems.
2015-09-16 09:34:24 +08:00
Vincent Yang
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
andyque
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
Vincent Yang
bd80eb6f46
CCDownloader-android implements Data Task Download.
2015-09-10 18:03:15 +08:00
Vincent Yang
7e2fe05050
CCDownloader-android implements File Task Download.
2015-09-10 15:56:06 +08:00
pandamicro
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
pandamicro
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
pandamicro
ab5b634976
Merge pull request #13625 from frranck/patch-4
...
Update CCImage.cpp
2015-09-03 00:10:16 +08:00
Vladimir Perminov
527e254617
Remove glfwError
2015-09-02 18:41:23 +03:00
Vladimir Perminov
c1ac27fffb
glfwError no static member
2015-09-02 15:02:23 +03:00
andyque
c0f40ad4a5
fix Android EditBox font size issue
2015-09-02 18:25:30 +08:00
WenhaiLin
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
WenhaiLin
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
frranck
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
Vladimir Perminov
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
Vladimir Perminov
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
Vladimir Perminov
b5c289c622
WinRT support Show/Hide mouse cursor
2015-08-27 21:19:59 +03:00
Neo Kim
30d52d1394
Fix #13591
2015-08-27 17:12:07 +09:00
pandamicro
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