XiaoFeng
722f20c4b6
Update implement remove condition macro check.
2015-11-24 18:29:58 +08:00
pandamicro
8695fbe711
Merge pull request #14172 from njh0602/somefix2
...
Add virtual keyword.
2015-11-11 14:17:27 +08:00
pandamicro
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
Nhuan Vu Duc
fec8a5db02
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
2015-11-06 13:05:40 +07:00
XiaoFeng
1a56668cd3
Fix "TextureCache Test" in js-test crash under Android
2015-11-06 09:49:19 +08:00
mogemimi
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
namhyeonuk
7fe2b87574
CREATE_FUNC macro NULL -> nullptr
2015-10-31 20:18:39 +09:00
Filipe Lemos
61ce3e8a03
Fixed warnings about missing override in CCApplication for iOS/Mac
2015-10-30 10:02:07 +00:00
Filipe Lemos
11fc969ecb
Fixed inconsistency in getVersion() when no version is available on Android
2015-10-29 17:14:32 +00:00
Filipe Lemos
9aa1f7138d
Added override keyword to getVersion
2015-10-29 08:36:03 +00:00
Filipe Lemos
04fa7a8902
Added Application::getVersion() to get the app version.
2015-10-28 17:57:57 +00:00
WenhaiLin
7b758fd780
Fixed text may display of incomplete when Label create with system font on Mac.
2015-10-28 12:06:58 +08:00
pandamicro
d2d60e36d2
Merge pull request #14222 from TheCodez/fix_memoryleak
...
Fix memory leak in Enhance-API
2015-10-27 17:22:11 +08:00
Michael Kösel
561b15e260
Fix memory leak in Enhance-API
2015-10-24 14:26:59 +02:00
mogemimi
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
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
남준현
f49d467465
Add virtual keyword.
2015-10-17 04:46:37 +09: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