mogemimi
0f3b36e834
Fix gcc warnings and type mismatch issues in AudioEngine for Linux
2016-05-20 01:39:40 +09:00
Greg Rynkowski
21fc67b358
Enable WebView's local storage on Android
...
Problem:
cocos2d::experimental::ui::WebView' local storage wasn't working on
Android. On iOS worked fine.
Solution:
Enable local storage of android.webkit.WebView in Android.
References:
https://developer.android.com/reference/android/webkit/WebSettings.html
http://stackoverflow.com/questions/5899087/android-webview-localstorage
2016-05-19 14:43:35 +01:00
minggo
3db84916d1
Merge pull request #15677 from mogemimi/refactor-audioengine
...
Refactor the AudioEngine-Linux to make more maintainable
2016-05-19 18:07:45 +08:00
minggo
9c0acf1e5d
Merge pull request #15619 from VisualSJ/v3_audio
...
audio search path (android)
2016-05-19 18:06:58 +08:00
zilongshanren
b154f274a5
Merge pull request #15410 from 1scaR1/up_v3
...
Make PageView indicator more tunable
2016-05-19 16:19:18 +08:00
mogemimi
09d839be35
Format the code to better align with cocos2d-x code style
2016-05-19 05:17:33 +09:00
mogemimi
7b61aca64e
Fix indentation and remove trailing whitespaces
2016-05-19 03:42:34 +09:00
mogemimi
3a80e7d8fb
Change 2 spaces to 4 spaces indentation
2016-05-19 03:34:04 +09:00
mogemimi
03be0de2fa
Remove unnecessary trailing semicolons
2016-05-19 01:40:00 +09:00
fusijie
36113f507e
add comments for ps.
2016-05-18 22:25:43 +08:00
zilongshanren
9223d1d917
Merge pull request #15668 from zilongshanren/fix-issue-of-tizen
...
fix tizen related issues
2016-05-18 17:20:19 +08:00
zilongshanren
c4e6db4e9b
fix tizen related issues
2016-05-18 16:26:13 +08:00
pandamicro
a03c45ce62
Update network licenses and reformat
2016-05-18 14:29:54 +08:00
minggo
c6034787e4
Merge pull request #15664 from mogemimi/replace-ccassert-macro
...
Replace CCAssert macros with CCASSERT
2016-05-18 11:57:18 +08:00
minggo
a54251b854
Merge pull request #15659 from mogemimi/use-const-reference
...
Use const references whenever possible
2016-05-18 11:55:55 +08:00
mogemimi
320ec027f7
Replace CCAssert macros with CCASSERT
2016-05-18 01:49:35 +09:00
minggo
3e396fedab
Merge pull request #15617 from pandamicro/v3
...
Some modifications merged from Creator
2016-05-17 13:43:41 +08:00
mogemimi
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
pandamicro
c96bd9a4df
Resolve local reference leak and function order
2016-05-17 12:06:28 +08:00
minggo
601460682e
Merge pull request #15641 from mogemimi/add-missing-references
...
Add missing references to avoid unnecessary copies
2016-05-17 10:28:08 +08:00
minggo
abe020e808
Merge pull request #15654 from minggo/ipv6-compatibility
...
Ipv6 compatibility
2016-05-17 09:25:14 +08:00
mogemimi
a1a8feed71
Add missing references to avoid unnecessary copies
2016-05-17 01:15:07 +09:00
zilongshanren
9203630583
Merge pull request #15651 from zilongshanren/fixNativeCotnrolIssuesV2
...
fix UI native control onEnter issue
2016-05-16 16:58:32 +08:00
zilongshanren
3ae5b1075b
fix native control onEnter issue
2016-05-16 16:14:16 +08:00
minggo
88db5d3660
use AF_UNSPEC to support ipv6
2016-05-16 15:15:29 +08:00
minggo
2b480a75bf
use AF_UNSPEC to support ipv6
2016-05-16 14:45:09 +08:00
Ryan Davis
8ca09f7c2a
Fix crash due to reallocation of shared indices memory
2016-05-15 12:30:30 +10:00
Xpol Wan
a7d9dd9a75
Print as Lua 5.1 does and remove duplicate code.
2016-05-14 14:09:58 +08:00
mogemimi
16878a53b1
Suppress MSVC warning C4800
2016-05-13 11:44:17 +09:00
minggo
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
ViusualSJ
ada1d1dfe8
audio search path (android)
2016-05-11 17:24:14 +08:00
pandamicro
6b59dc24c7
Add Image::setPNGPremultipliedAlphaEnabled
2016-05-11 16:36:21 +08:00
pandamicro
1023c8730e
[JSB] Made cc.log overwrite-able
2016-05-11 11:58:24 +08:00
pandamicro
1cbbde5d8b
Fix android LocalStorage return null for empty string value
2016-05-11 11:57:54 +08:00
minggo
48937ca3e6
disable new JSB memory model by default
2016-05-11 11:10:11 +08:00
minggo
bb5d1a5e97
Merge pull request #15607 from minggo/iss-15413
...
remove Content-Type limitation
2016-05-11 10:57:34 +08:00
minggo
2ad6f10bb6
Merge pull request #15609 from pandamicro/v3.11
...
Fix web engine issues and SocketIO connection fail issue
2016-05-11 09:28:24 +08:00
pandamicro
85812b4f5b
Remove client_no_context_takeover extension in WebSocket (not working on Android/iOS/Mac)
2016-05-10 20:35:02 +08:00
minggo
fd160a1611
remove Content-Type limitation
2016-05-10 18:15:57 +08:00
minggo
27060e43b7
Merge pull request #15590 from ntotani/v3
...
add missing lua const values
2016-05-10 14:55:53 +08:00
minggo
36ad79761f
Merge pull request #15596 from dabingnn/v3_fix_animation3D_bug
...
fix animate 3d bug
2016-05-10 14:11:01 +08:00
minggo
f4a7ba836c
Merge pull request #15599 from Naruto/feature/fix_build_error_using_fileutils-apple
...
fix build failed using FileUtilsApple on Application code.
2016-05-10 12:07:16 +08:00
Naruto TAKAHASHI
79b9a191d0
declare explicitly FileUtilsApple destructor
2016-05-09 21:50:52 +09:00
minggo
d086965683
Merge pull request #15598 from minggo/android-package-name
...
[ci skip]set correct package name
2016-05-09 18:17:28 +08:00
minggo
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
Huabing.Xu
e8acf38212
fix animate 3d bug
2016-05-09 15:21:19 +08:00
TAKEDA Yutaka
d17fdfe3cc
CCSprite::createNode bug fix.
2016-05-09 15:42:39 +09:00
mogemimi
bbbb7e498d
Prevent variable shadowing warnings
2016-05-08 12:32:36 +09:00
minggo
5d7cbe622a
Merge pull request #15589 from pandamicro/v3.11
...
Add cc.game.end to close game window
2016-05-07 22:11:46 +08:00
halx99
fc9880ab49
Add captureNode for cocos2d::utils ( #15558 )
...
* Add captureNode for cocos2d::utils
Add captureNode for cocos2d::utils and fix CC_DLL syntax.
* Add test case for utils::captureNode
Add test case for utils::captureNode.
* Store captured image to disk with RGB.
* Trigger jenkins check
2016-05-07 22:10:53 +08:00
Naoyuki Totani
04ebba425f
add missing lua const values
2016-05-07 16:23:23 +09:00
pandamicro
d0fc3ec4c4
Add cc.game.end to close game window
2016-05-07 14:37:36 +08:00
zilongshanren
e4d91f5577
fix tizen videoplayer issue
2016-05-06 18:43:26 +08:00
minggo
f34acca188
Merge pull request #15575 from stevetranby/capturescreen-drain-autorelease
...
Prevent memory leak: force drain on autoreleased `data`.
2016-05-06 16:57:29 +08:00
CocosRobot
d72fadf6cc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-06 05:44:31 +00:00
minggo
38631ab655
Merge pull request #15576 from minggo/sync-15066
...
Fix setPhysicsBody method
2016-05-06 13:38:53 +08:00
mogemimi
694259bf80
Suppress warning C4800 on MSVC
2016-05-06 12:30:16 +09:00
TheCodez
4de7ef1515
Fix setPhysicsBody method
2016-05-06 09:29:57 +08:00
Steve Tranby
7c1e60f0b7
Prevent memory leak: force drain on autoreleased `data`.
2016-05-05 08:00:28 -06:00
minggo
9218329968
Merge pull request #15569 from minggo/issue-15522
...
Fix compile error isnan -> std::isnan
2016-05-05 11:36:24 +08:00
CocosRobot
0445e7c562
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-05 03:07:58 +00:00
minggo
44063b8e85
Merge pull request #15568 from zilongshanren/fix-jsb-related-issues
...
fix jsb 3.11 related issues
2016-05-05 11:01:44 +08:00
minggo
e2c38ed87f
make std::isnan work for winrt
2016-05-05 10:29:31 +08:00
zilongshanren
8c046fea92
fix jsb 3.11 related issues
2016-05-05 10:20:00 +08:00
minggo
03b38bcee2
Merge branch 'fix_isnan' of https://github.com/gelldur/cocos2d-x into issue-15522
2016-05-05 10:17:17 +08:00
mogemimi
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
pandamicro
fcfaafa4a5
Fix SocketIO fail to connect issue on Android
2016-05-04 17:43:36 +08:00
minggo
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
halx99
9ff61f915c
Add findChild for cocos2d::utils ( #15548 )
...
* Add searchNode for cocos2d::utils
Add searchNode for cocos2d::utils
* fix compile error on win32_bak
* convert line terminates to unix sytle.
* Rename searchNode to findChild, and etc.
* fix compile error.
2016-05-04 09:46:00 +08:00
minggo
0eb25af347
Merge pull request #15555 from mogemimi/remove-c-str-calls
...
Reduce unnecessary c_str() calls
2016-05-04 09:43:01 +08:00
minggo
4766e0dd9b
Merge pull request #15545 from minggo/isse-15540
...
avoid remove event listener multiple times
2016-05-04 09:39:38 +08:00
minggo
6260c67941
Merge pull request #15549 from minggo/issue_15525
...
use std::atof() instead
2016-05-04 09:38:42 +08:00
Adrien de Sentenac
1a76c9ea3b
Add OBB (zip) support ( #15515 )
...
* Add OBB support.
OBB must be a zip file with audio and video files stored uncompressed.
* Use introspection to be able to build with Android API level 10.
Using the new audio engine to play sounds from the OBB will only work with API level 12 (Android 3.1) or above.
2016-05-04 09:21:35 +08:00
mogemimi
8429b34010
Reduce unnecessary c_str() calls
2016-05-04 04:18:25 +09:00
dualface
2901f0aea6
fix display.wrapScene()
2016-05-03 21:37:15 +08:00
pandamicro
3d6bddd2c7
Merge pull request #15465 from cezheng/fix/several_network_bugs
...
[BugFixes]Several serious bug fixes related to network/asset_manager
2016-05-03 17:37:32 +08:00
minggo
1bf56d5a78
use std::atof() instead
2016-05-03 15:50:06 +08:00
minggo
f2e5eb332a
Merge pull request #15546 from minggo/issue_15526
...
fix memory leak
2016-05-03 14:02:38 +08:00
minggo
fba4bead70
fix memory leak
2016-05-03 11:24:22 +08:00
minggo
d41207e99a
avoid remove event listener multiple times
2016-05-03 10:56:03 +08:00
minggo
9f678f2f27
Merge pull request #15541 from cocos2d/fix-doxygen-mistakes
...
Fix doxygen format mistakes in enum class Platform
2016-05-03 09:38:58 +08:00
mogemimi
6433172fae
Fix shadow variable warning in GameNode3DReader
2016-05-02 10:57:03 +09:00
Zhe Wang
a640f007ef
Fix doxygen format mistakes in enum class Platform
...
An user reported this error in the forum http://forum.cocos.com/t/api-document/36199/2
I noticed that our doxygen was written in wrong format.
2016-04-30 15:20:24 +08:00
Xpol Wan
f111583214
Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont().
...
* Remove unnecessary memory copy in FileUtils::getFileData()
* Add Data::takeBuffer() to simplify FileUtils::getFileData() and CCFreeTypeFont::loadFont().
2016-04-29 09:31:09 +08:00
minggo
788dae5a2e
Merge pull request #15531 from pandamicro/v3.11
...
Fix clipping node memory management issue and update web engine
2016-04-28 16:15:59 +08:00
pandamicro
d8d6e55756
Fix clipping node memory management issue
2016-04-28 15:14:03 +08:00
Ricardo Quesada
c432b23ef6
fix: removes `friend class Game`
...
fixes Github issue #15221
2016-04-27 18:57:41 -07:00
CocosRobot
198acb9466
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-28 01:56:50 +00:00
zilongshanren
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
Dawid Drozd
0f19bec99d
Fix compile error isnan -> std::isnan #15111
...
Issue: https://github.com/cocos2d/cocos2d-x/issues/15111
2016-04-27 13:15:08 +02:00
minggo
2a4799758d
Merge pull request #15511 from xpol/signed-unsigned-mismatch
...
Fixes signed/unsigned mismatch warnings.
2016-04-27 11:34:10 +08:00
minggo
fc5e537327
Merge pull request #15508 from xpol/remove-use-of-getFileData
...
Remove last internal use of deprecated `FileUtils::getFileData()`.
2016-04-27 09:38:30 +08:00
minggo
51fb49a522
Merge pull request #15512 from minggo/issue-15193
...
use fullpath to play background music
2016-04-27 09:37:45 +08:00
mogemimi
f395cadbac
Add CC_GUI_DLL to suppress warning C4275
2016-04-27 04:08:09 +09:00
Xpol Wan
1cc0130bdd
Fixes signed/unsigned mismatch warnings.
...
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
minggo
b9184ac452
Merge pull request #15509 from minggo/issue-15449
...
remove unsupport flags
2016-04-26 16:03:58 +08:00
minggo
bb4a54b042
use fullpath to play background music
2016-04-26 15:59:30 +08:00
Xpol Wan
bd3c3a7c3d
remove default value for size argument.
2016-04-26 14:54:20 +08:00
Xpol Wan
94944082c4
Fixes warning about deprecated cc_wcslen.
2016-04-26 14:21:25 +08:00
minggo
2319860d38
remove unsupport flags
2016-04-26 14:08:23 +08:00
Xpol Wan
3f8910d80c
Remove last internal use of deprecated `FileUtils::getFileData()`.
2016-04-26 13:57:53 +08:00
xpol
43a94c0693
Add FileUtils::getContents(). ( #15479 )
...
* Add FileUtils::getContents().
* skip FileUtils::getContents() in binding generator config.
* use FileUtils::getContents in CCDataReaderHelper.
* obey the cocos2d-x coding style.
* Explicit constructor.
* More docs.
* More tests.
* Move FileError to FileUtils::Error.
* Fixes wrong buffer size for reading into string and vector.
* Update tests.
* Add note on padding for output buffers.
* FileUtils: implements old methods by using `getContents()`.
methods are:
* FileUtils::getDataFromFile()
* FileUtils::getStringFromFile()
* FileUtils::getFileData()
and follow Android methods are now just calls FileUtils' ones.
* FileUtilsAndroid::getDataFromFile()
* FileUtilsAndroid::getStringFromFile()
* FileUtilsAndroid::getFileData()
* Fixes build error.
* FileUtils::getFileData: Return the size of data.
* Remove old methods form FileUtilsAndroid they are now done in FileUtils.
* Fixes for win32 code.
* Fixes build error in test and add more test.
* Better error message.
* Make template type name more readable.
* Update comments.
* Move internal functions to anonymous namespace.
* Refactor FileUtils test.
* Fix warning about compare signed and unsigned.
* Win32 and WinRT does not use text mode.
That is we don't need simulate convert CRLF to LF.
* Fixes for Win32 and WinRT.
* Update for Win32 and WinRT.
* Win32: return FileUtils:Error::TooLarge when file is large than 2^32-1.
* Win32: remove checkFileName() which has no effect at all.
* WinRT: add FileUtilsWinRT::getContents() using ::CreateFile2.
* WinRT: add override keyword for FileUtilsWinRT::getFileSize().
* Update for coding styles.
* More error strings.
* check read and malloc return codes.
* rename FileUtils::Error to FileUtils::Status.
* Fixes for WinRT, use GetFileInformationByHandleEx to get file size.
* Fixes build error for winrt and cleanup FileUtils::Status.
* Try to fix the build error on Linux.
Status must defined in some header, so move FileUtils.h up.
* Remove support of text mode on WinRT (it is the last platform support text mode).
2016-04-26 13:37:22 +08:00
minggo
2cc6ebc137
Merge pull request #15507 from CocosRobot/update_lua_bindings_1461642261
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 11:49:15 +08:00
CocosRobot
29da95494e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 03:47:27 +00:00
minggo
a6b59c40be
Merge pull request #15496 from treert/patch-2
...
[fix bug] reset UIGrayScale Shader when reload shaders
2016-04-26 11:44:20 +08:00
minggo
86df9b535a
Merge pull request #15493 from njh0602/somefix
...
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
minggo
2f2373be87
Merge pull request #15497 from stevetranby/tilemap-csv-support
...
Add CSV format support to tile maps
2016-04-26 11:39:33 +08:00
minggo
c8e2dc83d1
Merge pull request #15498 from ynaoto/v3
...
Warn if fontDef.charID exceeds 16bits.
2016-04-26 11:27:06 +08:00
minggo
d5e4cc0b88
Merge pull request #15492 from mogemimi/fix-unused-variable-warning
...
Fix unused variable warning when building with Xcode
2016-04-25 15:50:58 +08:00
minggo
8792078bb4
Merge pull request #15500 from mogemimi/fix-warning-c4804
...
Fix compiler warning C4804 under Visual Studio
2016-04-25 13:59:15 +08:00
Josh Bodily
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
mogemimi
d2c46167c3
Fix compiler warning C4804 under Visual Studio
2016-04-25 10:46:33 +09:00
Naoto Yoshioka
d42cb71a27
Warn if fontDef.charID exceeds 16bits.
2016-04-25 01:02:50 +09:00
Steve Tranby
510e7b831e
csv support working test
2016-04-23 17:31:10 -06:00
treert
2c4b634a50
reset UIGrayScale Shader when reload shaders
...
reset GLProgram for UIGrayScale Shader when reload shaders
2016-04-23 13:33:22 +08:00
NamJunHyone
ea2b73c30e
Renamed ignoreAnchorPointForPosition()
2016-04-22 22:29:49 +09:00
NamJunHyone
401f3a84ac
Renamed ignoreAnchorPointForPosition()
2016-04-22 21:36:02 +09:00
mogemimi
71677ee286
Fix unused variable warning when building with Xcode
2016-04-22 20:25:32 +09:00
minggo
5aa83ef1cf
Merge pull request #15490 from mogemimi/fix-signed-unsigned-mismatch
...
Fix warnings about signed/unsigned mismatch
2016-04-22 13:54:52 +08:00
Steve Tranby
0f0c9b627b
Add support for Unsigned with CCValue ( #13785 )
...
Add support for Unsigned with CCValue
2016-04-22 13:49:20 +08:00
mogemimi
a3ad4cddf8
Fix warnings about signed/unsigned mismatch
2016-04-22 12:20:05 +09:00
minggo
16c7a594c8
Merge pull request #14005 from wighawag/draw_node_shader_fix
...
allow to use custom shader uniforms and attributes on drawNode
2016-04-22 10:49:41 +08:00
minggo
2c75a4cf39
Merge pull request #15480 from mogemimi/remove-unary-operator
...
Remove incorrect unary operator to fix warnings
2016-04-21 15:42:29 +08:00
minggo
488ceb485d
Merge pull request #14547 from colajam93/fix-linux-clang-build
...
Add missing header
2016-04-21 15:38:53 +08:00
CocosRobot
361e054d6d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-21 07:07:41 +00:00
minggo
6459c92ee7
Merge pull request #13950 from Almax27/patch-4
...
Added CC_PROPERTY const qualifier
2016-04-21 14:56:01 +08:00
minggo
7de8f761d0
Merge pull request #14123 from jgod/patch-2
...
Check that textureAtlas isn't null before removing quads in SpriteBatchNode
2016-04-21 14:44:32 +08:00
minggo
949112fdc2
Merge pull request #14321 from pandemosth/socketIO_issue_14287
...
Fix SocketIO crash on reconnect
2016-04-21 14:28:21 +08:00
minggo
fcd8aa30f4
Merge pull request #14312 from TimothyZhang/jsb-getDataFromFile-should-return-null-if-read-failed
...
return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile
2016-04-21 14:17:44 +08:00
minggo
de3dac7664
Merge pull request #14090 from SongCF/v3
...
issues #14050 ActionManager memory leak
2016-04-21 14:09:52 +08:00
mogemimi
eae7ec40ef
Remove incorrect unary operator to fix warnings
2016-04-21 14:39:42 +09:00
MURAKAMI Yukio
9514b51057
Console refactor ( #15013 )
2016-04-21 11:31:20 +08:00
Ricardo Quesada
b8eae430fb
Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor
...
extend the RichText
2016-04-20 20:05:29 -07:00
CocosRobot
f4c9ea3902
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-21 01:54:49 +00:00
minggo
481c55adb2
Merge pull request #15466 from wefiends/spriteframe-clone
...
Copy polygonInfo when cloning SpriteFrame
2016-04-21 09:49:00 +08:00
minggo
6b262a55cb
Merge pull request #15472 from mogemimi/fix-deprecation-warning
...
Fix deprecation warning caused by PageView::getPages()
2016-04-21 09:47:49 +08:00
minggo
b0ae128ec3
Merge pull request #15066 from TheCodez/patch-2
...
setPhysicsBody can be called multiple times again
2016-04-21 09:40:28 +08:00
Yukio Murakami
a8ddbdc12c
defaults and append tag support
2016-04-21 10:03:57 +09:00
Ricardo Quesada
775db978da
fix: fix issue 15423 for v3.11
...
Github issue #15423
2016-04-20 08:41:20 -07:00
mogemimi
4dfdd159b7
Fix deprecation warning caused by PageView::getPages()
2016-04-21 00:28:34 +09:00
TheCodez
afdd600045
Fix setPhysicsBody method
2016-04-20 11:46:10 +02:00
CocosRobot
a9184f1047
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-20 09:31:06 +00:00
AlwynC
4c7e4671d9
Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. ( #15194 )
2016-04-20 17:25:31 +08:00
Nicholas Barrios
20b31eb1e8
Copy polygonInfo when cloning SpriteFrame
2016-04-20 03:04:19 -04:00
minggo
0a609e9176
Merge pull request #15461 from ricardoquesada/issue_15423
...
fix: fix crash in win for rich text
2016-04-20 13:41:07 +08:00
Ce Zheng
200c9fda59
fix HTTPAsyncConnection bad memory management
...
Removed a redundant release on certDataRef that caused crash on
NSURLConnectionLoader thread.
Fixed a memory leak of SecCertificateRef
This fixes #15464
2016-04-20 14:04:44 +09:00
Ce Zheng
d848292860
make android downloader taskQueue thread
...
My previous fixes for the android downloader in #14530 are not thread
safe, this commit fixes the problem
2016-04-20 13:42:00 +09:00
minggo
08b000bacf
Merge pull request #14426 from pyrosphere/fix-controller-ios6
...
Fix crash when using cocos2d::Controller on iOS6
2016-04-20 11:45:13 +08:00
minggo
3a7195f4b0
Merge pull request #14485 from cpascal/fix_libexport
...
Fix app-project generates .lib file in Win32
2016-04-20 11:26:25 +08:00
minggo
f49f69dac8
Merge pull request #14525 from elvman/key_none
...
Add enum value for no key
2016-04-20 11:21:43 +08:00
Ce Zheng
7f1b02ab92
Merge branch 'fix/ios_downloader_crashes_with_storage_path_containing_spaces' into fix/several_network_bugs
2016-04-20 12:12:31 +09:00
minggo
095f404738
Merge pull request #14735 from linguofeng/patch-2
...
CCFileUtils-apple.mm Grammatical errors
2016-04-20 11:00:38 +08:00
minggo
9ef6035951
Merge pull request #15460 from mogemimi/add-missing-float-suffix
...
Add missing float suffix to avoid warning C4305
2016-04-20 10:35:56 +08:00
minggo
e16d016c46
Merge pull request #15452 from 1scaR1/fix_osx_sandbox
...
Implement createDirectory for apple platform.
2016-04-20 10:26:45 +08:00
Ricardo Quesada
4bb35f2219
fix: fix crash in win for rich text
...
use `std::locale()` when invoking `std::isXXX` function
to avoid crash
github issue #15423
2016-04-19 13:53:27 -07:00
mogemimi
f9f751834a
Add missing float suffix to avoid warning C4305
2016-04-20 03:54:47 +09:00
Julien Jorge
a3f28a18df
Uniformize image support macro usage.
...
All images format implementation but WIC test the value of a CC_USE_<FORMAT>
preprocessor macro to verify if the implementation must be available or not.
WIC support is checked against the definition of the macro only,
independently of its value, thus making the implementation available even
if CC_USE_WIC = 0.
This commit makes the tests of the CC_USE_WIC macro identical to the tests
of the other similar image format macros.
2016-04-19 14:15:43 +02:00
minggo
29df93c5e4
Merge pull request #15458 from WenhaiLin/v3-0419
...
Fixed crash and actions may not have been executed.
2016-04-19 18:25:00 +08:00
minggo
09e476af9a
Merge pull request #15450 from mogemimi/fix-deprecation-warning
...
Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning
2016-04-19 16:51:52 +08:00
Wenhai Lin
a8847ccf5e
Fixed crash and actions may not have been executed.
2016-04-19 16:11:54 +08:00
Бесшапошников Никита
a3717b6907
Add error logging of incorrect directory creating.
2016-04-19 10:17:31 +03:00
mogemimi
87be03fe9b
Fix compilation error with Platform Toolset v120 for WinRT
2016-04-19 16:13:12 +09:00
minggo
776ee8ac5a
Merge pull request #14843 from cezheng/fix/ios_downloader_crashes_with_storage_path_containing_spaces
...
fix iOS downloader crash when storage path contains spaces
2016-04-19 13:46:02 +08:00
minggo
03ad0f01c9
Merge pull request #15001 from mogemimi/refactor-httprequest
...
Refactor HttpRequest and HttpResponse
2016-04-19 11:23:59 +08:00
minggo
5c567c54b4
Merge pull request #15198 from perminovVS/v3-dev-wrong-log-detect-image-type
...
Wrong log message if use tga image
2016-04-19 11:00:55 +08:00
minggo
f24eb55378
Merge pull request #15454 from tomi-payne/v3
...
Update CCSprite3D.cpp
2016-04-19 10:55:38 +08:00
minggo
f3d8d043a1
Merge pull request #15447 from xpol/use-decltype-to-avoid-side-effect-warnings
...
Use decltype and std::remove_pointer to avoid side effect warnings.
2016-04-19 10:53:15 +08:00
minggo
660002c239
Merge pull request #15446 from xpol/fixes-integer-cast-warings
...
Fixes some integer cast warnings.
2016-04-19 10:27:37 +08:00
minggo
df9a9292a2
Merge pull request #15453 from mogemimi/add-missing-dllexport
...
Add missing dllexport to avoid warning C4275
2016-04-19 10:26:58 +08:00
minggo
b182adae5b
Merge pull request #15448 from xpol/remove-internal-use-of-getFileData
...
Fixes deprecated warnings
2016-04-19 10:24:49 +08:00
minggo
5f6f35fb91
Merge pull request #15451 from xpol/fixes-format-warnings
...
Fixes format warnings.
2016-04-19 10:21:10 +08:00
minggo
3dbabdee05
Merge pull request #15099 from feijing566/v3
...
Add "id" for parser object
2016-04-19 10:18:04 +08:00
tomi-payne
fbadcf188a
Update CCSprite3D.cpp
...
Fixed Sprite3DCache::removeSprite3DData error
2016-04-19 10:11:29 +08:00
mogemimi
24a09a5ae7
Add missing dllexport to avoid warning C4275
2016-04-19 04:01:13 +09:00
mogemimi
d1871d1ca7
Refactor HttpRequest and HttpResponse
2016-04-19 02:58:42 +09:00
mogemimi
19c2893509
Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning
2016-04-18 19:50:59 +09:00
minggo
f3fd111200
Merge pull request #14944 from mxenabled/josh/export_wicimageloader
...
Export WICImageLoader form DLL
2016-04-18 18:33:39 +08:00
minggo
93d331f1e8
Merge pull request #14965 from elloop/fix_opengl_log_function
...
fix opengl log function.
2016-04-18 18:32:00 +08:00
minggo
5bd592ca34
Merge pull request #15231 from SteveKChiu/v3
...
Fix calculation of base64Encode outLength
2016-04-18 17:54:14 +08:00
Xpol Wan
dc0f7bf903
Fixes format warnings.
2016-04-18 17:52:58 +08:00
Бесшапошников Никита
e555ed5b9e
Implement createDirectory for apple platform.
2016-04-18 12:52:20 +03:00
xiaofeng11
061fc2f287
Fix on win32 platform if cpp-tests' windows been minisized, after window restore, content size is wrong. ( #15236 )
2016-04-18 17:15:56 +08:00
minggo
37655ea271
Merge pull request #15091 from mogemimi/fix-null-conversion
...
Fix return value of VertexAttribBinding::init()
2016-04-18 16:52:15 +08:00
minggo
6cc80f28fc
Merge pull request #15096 from fnz/volume_control
...
Set music volume control as default
2016-04-18 16:48:55 +08:00
Xpol Wan
bd263d6be4
Fixes deprecated warnings
...
* remove all internal use of FileUtils::getFileData().
2016-04-18 16:45:46 +08:00
minggo
7749ba6de8
Merge pull request #15444 from xpol/fixes-warings-unused-static-consts-in-cpp
...
Fixes warning about unused static constants.
2016-04-18 16:37:10 +08:00
xpol
24db45e925
Fixes some warnings in Lua manual bindings. ( #15443 )
...
1. Use __Type for deprecated classes.
2. Refactored LuaStack::luaLoadChunksFromZIP() and use FileUtils:getDataFromFile().
3. Fixes wrongly compare NULL with char array.
2016-04-18 16:35:50 +08:00
Xpol Wan
9ea3bc4aa8
Use decltype and std::remove_pointer to avoid side effect warnings.
2016-04-18 16:07:48 +08:00
Xpol Wan
810e855f44
Fixes some integer cast warnings.
2016-04-18 16:01:19 +08:00
zilongshanren
001a0ee812
remove useless warning log of stencil buffer. ( #15396 )
...
1. disable GC for Native object
2. improve js tests of label
2016-04-18 15:43:54 +08:00
Xpol Wan
8c3137b07f
Fixes warning about unused static constants.
2016-04-18 15:38:51 +08:00
minggo
b88dc87b0a
Merge pull request #15428 from mogemimi/fix-indent
...
Fix indentation for readability
2016-04-18 15:20:54 +08:00
Dale Stammen
69bd994760
added missing _USRJSSTATIC preprocessor define ( #15438 )
2016-04-18 15:10:35 +08:00
xpol
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
Stephen Phillips
7b35f31016
Fixed typo in UILayout using clipping rect x instead of y coordinate.
2016-04-15 13:45:21 +01:00
minggo
14c57c524f
Merge pull request #15429 from minggo/sync-v3
...
fix: compile in Windows
2016-04-15 10:06:47 +08:00
Ricardo Quesada
3eb7d62e6e
fix: compile in Windows
...
Github issue #15372
2016-04-15 09:33:19 +08:00
mogemimi
0825b1cc96
Fix indentation for readability
2016-04-15 04:31:19 +09:00
Xpol Wan
cb0e768f32
Fixes warning: field 'isVertsOwner' will be initialized after field 'rect'.
2016-04-14 17:09:37 +08:00
xpol
3780064a82
Allow inherit form platform fileutils ( #15304 )
...
* Allow inherit form FileUtilsLinux, FileUtilsWin32 and FileUtilsWinRT.
* Removed objc from CCFileUtils-apple.h
define FILEUTILS_APPLE_ENABLE_OBJC to enable FileUtilsApple:setBundle() for compatibility.
* Smart pointers heal us all.
* Add config macro in ccConfig.h and prefix with CC_.
* enabled by default.
* use #if rather than #ifndef.
* Do not deprecate setBundle.
2016-04-14 11:59:24 +08:00
minggo
6e7ab0fb46
Merge pull request #15395 from Sai628/v3
...
Bug fix: CCValue operator overloading of Comparison "==" in case Type::VECTOR
2016-04-14 11:58:19 +08:00
Dale Stammen
fe84af5dbd
added zlib.dll
2016-04-12 17:18:47 -07:00
CocosRobot
7d9946a9cc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-11 09:56:18 +00:00
zilongshanren
abfce2617e
Merge pull request #15399 from geemedia/pageview-turning-time-configurable
...
Make PageView page turning event time tweak configurable.
2016-04-11 04:50:46 -05:00
Бесшапошников Никита
23d074ea34
Make PageView indicator more tunable:
...
-add possibility to change texture of index nodes
-add possibility to change color of index nodes
-add possibility to change scale of index nodes
2016-04-11 12:28:47 +03:00
James Chen
f3e6e8331a
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener.
2016-04-11 11:54:15 +08:00
Juan Luis Boya García
9c4f3ffa8d
Make selectedSprite optional in JSB too
2016-04-11 11:53:53 +08:00
Бесшапошников Никита
54e457f1be
Fixed ccui scroll widgets constants for JS bindings
2016-04-11 11:29:00 +08:00
Ricardo Quesada
fea84b8af3
fix: use chipmunk v6.2 API whenever possible
...
fix: make it more compatible with chipmunk v6.2 code
fix: make it more compatible with chipmunk v6.2.2
2016-04-11 11:12:34 +08:00
pandamicro
79cfe8ac0e
Fix a issue in cc.CallFunc JSB implementation
2016-04-11 11:12:13 +08:00
CocosRobot
150ec2e7ce
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-11 11:11:54 +08:00
pandamicro
f9f9551645
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-11 11:11:34 +08:00
pandamicro
bb2cfc7308
Update engine version
2016-04-11 11:11:17 +08:00
mogemimi
4f32df255d
Fix return value of VertexAttribBinding::init()
2016-04-10 08:05:19 +09:00
Adrien de Sentenac
0030beca7a
Make PageView page turning event time tweak configurable.
2016-04-08 11:06:36 -04:00
Бесшапошников Никита
9acde1bc06
Fixed ccui scroll widgets constants for JS bindings
2016-04-08 15:34:25 +03:00
Sai628
dfc12c8351
Bug fix: CCValue operator overloading of Comparison "==" in case Type::VECTOR
2016-04-08 14:11:39 +08:00
Wenhai Lin
f3d824843b
Refine 'CCActionXXXX' ( #15319 )
...
add more check to be more stronger and simplify the codes
2016-04-08 13:40:36 +08:00
pandamicro
f18763033d
Merge pull request #15390 from pandamicro/v3
...
Fix a issue in cc.CallFunc JSB implementation
2016-04-08 09:54:13 +08:00
zilongshanren
36c5ae4d9c
Merge pull request #15389 from CocosRobot/update_lua_bindings_1460042601
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-08 09:30:58 +08:00
Ricardo Quesada
c4230f839e
Merge pull request #15392 from ricardoquesada/chipmunk_js_fix
...
Chipmunk js fix
2016-04-07 16:24:28 -07:00
Ricardo Quesada
f243cc4ce3
fix: use chipmunk v6.2 API whenever possible
...
fix: make it more compatible with chipmunk v6.2 code
fix: make it more compatible with chipmunk v6.2.2
2016-04-07 16:22:49 -07:00
colajam93
d023a3ad1a
Add missing header
2016-04-08 02:16:22 +09:00
pandamicro
f1108bfbe3
Fix a issue in cc.CallFunc JSB implementation
2016-04-07 23:49:57 +08:00
CocosRobot
416d2531fc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-07 15:25:41 +00:00
pandamicro
e6d4beef8a
Merge pull request #15388 from pandamicro/v3
...
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
pandamicro
1ada222c36
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-07 22:40:32 +08:00
pandamicro
817f4f4871
Update engine version
2016-04-07 22:36:29 +08:00
minggo
6ac9a42e6c
Merge pull request #15383 from mogemimi/fix-implicit-conversion
...
Fix implicit conversion issues with Xcode 7.3
2016-04-07 17:58:30 +08:00
minggo
d8764ab730
Merge pull request #15200 from perminovVS/v3-dev-wic-image-loader-bad-hresult
...
WICImageLoader incorrect use S_FALSE constant
2016-04-07 17:31:15 +08:00
pandamicro
9de585077a
Merge pull request #15369 from ntrrgc/develop
...
Make selectedSprite optional in JSB too
2016-04-07 17:07:03 +08:00
minggo
aa53e9d8eb
Merge pull request #15381 from dumganhar/patch-removeAllEventlistener
...
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener.
2016-04-07 16:34:07 +08:00
mogemimi
c0e4780e77
Fix implicit conversion issues with Xcode 7.3
2016-04-07 17:01:17 +09:00
James Chen
514ac58bf3
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener.
2016-04-07 15:50:59 +08:00
CocosRobot
dfe3dc5e14
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-07 07:46:49 +00:00
minggo
328331df4f
Merge pull request #15179 from mogemimi/remove-const-from-return
...
Remove unnecessary const from return types in PU and Lua
2016-04-07 15:41:00 +08:00
James Chen
6dff5fdc13
std::shared_ptr<bool> -> std::shared_ptr<std::atomic<bool>>
...
The reference count field in shared_ptr is threadsafe but the value field is not. So we need to wrap a std::atomic for preventing potential thread racing.
2016-04-07 15:06:19 +08:00
Nam Hyeon Uk
7f2b0edc04
Vector iterator declaration & initializer list constructor
...
* Vector iterator typedef -> alias declaration
* Vector constructor with initializer list
* fix indent
2016-04-07 13:47:01 +08:00
JANG SUN HYUK
107cef0667
getRandomObject() in Vector, Map is changed
...
* getRandomObject is changed
https://github.com/cocos2d/cocos2d-x/issues/15270
getRandomObject issue in Vector
* Update CCMap.h
* Update CCVector.h
2016-04-07 11:46:54 +08:00
minggo
43a70f0a92
Merge pull request #15342 from xpol/allow-easy-decrypt-plist-files
...
Allow plist and other ValueMap files be (easy) decrypted.
2016-04-07 11:02:20 +08:00
minggo
4bee2c4e79
Merge pull request #15361 from stevetranby/iterator-erase
...
Iterator erase pattern
2016-04-07 10:34:55 +08:00
minggo
0732c3892d
Merge pull request #15375 from mogemimi/fix-memory-leak-cocostudio
...
Fix memory leak in DataReaderHelper
2016-04-07 10:21:30 +08:00
Ricardo Quesada
ed42305c26
fix: works if no ';' is the the end of defines
...
Github issue #15376
2016-04-06 13:27:59 -07:00
Ricardo Quesada
a0e260bf8b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2016-04-06 10:52:16 -07:00
Ricardo Quesada
9fae3a5ed3
Merge pull request #15204 from perminovVS/v3-dev-gl-program-feature
...
GLProgram replaceDefines correct and other feature
2016-04-06 10:34:44 -07:00
Ricardo Quesada
ae369c1b68
fix: compile in Windows
...
Github issue #15372
2016-04-06 10:26:46 -07:00
mogemimi
7ec409c3bb
Fix memory leak in DataReaderHelper
2016-04-07 02:22:06 +09:00
minggo
944307a5f8
Merge pull request #15260 from mxenabled/dennacerise/color_constructor
...
Add optional alpha parameter to Color4B and Color4F constructors
2016-04-06 11:50:02 +08:00
mogemimi
985155749b
Remove unnecessary const from return types in PU and Lua
2016-04-06 12:36:20 +09:00
minggo
6b167a1aa1
Merge pull request #15335 from mogemimi/fix-typos
...
Fix typos in comments and strings
2016-04-06 11:32:46 +08:00
mogemimi
a184c88e9d
Add missing virtual destructor in ILocalizationManager
2016-04-06 01:40:41 +09:00
Juan Luis Boya García
73b900a77f
Make selectedSprite optional in JSB too
2016-04-05 12:58:50 +02:00
CocosRobot
81448cd1b8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-02 12:06:57 +00:00
zilongshanren
3192267af0
Merge pull request #15358 from zilongshanren/fixTextFieldPasswordStyle
...
fix textField password bug
2016-04-02 20:01:45 +08:00
Steve Tranby
24fd25e143
Iterator erase pattern
2016-04-01 18:29:21 -06:00
pandamicro
3d7d5de95d
Merge pull request #15317 from pandamicro/v3
...
Fix Socket IO handshake issue with latest version libwebsocket
2016-04-01 22:27:57 +08:00
zilongshanren
8587440e31
remove unneed c_str call
2016-04-01 10:01:37 +08:00
zilongshanren
90087ae5a7
improve textfield code
2016-04-01 09:31:18 +08:00
zilongshanren
dcb7c58216
fix textField password bug
2016-04-01 00:52:55 +08:00
pandamicro
d93fbea0f6
Fix Socket IO connection issue on iOS
2016-03-31 21:21:20 +08:00
minggo
5f4e8a65c4
Merge pull request #15348 from minggo/action_issue
...
some bugs fixed of Repeat
2016-03-31 14:47:54 +08:00
minggo
67e2eb12eb
Merge pull request #15355 from xiaofeng11/v3
...
rollback chipmunk export change
2016-03-31 11:47:06 +08:00
肖峰
5b10ab3c2d
rollback chipmunk export change
2016-03-31 11:01:58 +08:00
zilongshanren
016979af3b
fix TextField password issue
2016-03-30 18:19:28 +08:00
minggo
a11bf8b32e
Merge pull request #15352 from minggo/js_version
...
[ci skip]upgrade engine version
2016-03-30 15:19:11 +08:00
minggo
48d24f14d7
upgrade engine version
2016-03-30 15:17:49 +08:00
minggo
fcd64e081d
some bugs fixed of Repeat
...
1. action may be ran more than specified times
2. instant action will ran one frame later
2016-03-30 14:05:22 +08:00
Xpol Wan
cd1c26ecd1
Allow plist and other ValueMap files be (easy) decrypted.
...
The origin implementation of `FileUtilsApple::getValueMapFromFile()` reads the contents of file and parse it by calling one Apple API.
This make it harder to decrypt user encrypted plist files.
This commit use the `FileUtils::getDataFromFile()` to get read file data first then use `getValueMapFromData()`
to parse it into a ValueMap. Where `FileUtils::getDataFromFile()` can be overwrite by user's decoding file utils (say `DecodingFileUtils`).
I know that user's `DecodingFileUtils` can also overwrite `getValueMapFromFile`, but this pr make the author of `DecodingFileUtils` less suffering.
2016-03-29 21:39:16 +08:00
肖峰
44331137d8
Fix in cpp-test bugs test scene 13 crash
2016-03-29 16:45:16 +08:00
zilongshanren
6e3d69dded
Merge pull request #15336 from cocos2d/v3.10
...
V3.10
2016-03-29 11:23:11 +08:00
mogemimi
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
Wenhai Lin
392d1e858f
Merge pull request #15314 from WenhaiLin/v3-0323
...
Refine 'CCFontXXXX'
2016-03-25 21:55:00 +08:00
Wenhai Lin
c3a8cabe5d
refine
2016-03-25 21:21:09 +08:00
pandamicro
7e87b8b389
Fix Socket IO handshake issue with latest version libwebsocket
2016-03-25 17:13:28 +08:00
minggo
ffdfcd4aa9
Merge pull request #15311 from MSOpenTech/v3-winrt
...
Win10 UWP and Windows 8.1 fixes for v3.11
2016-03-25 09:42:13 +08:00
Wenhai Lin
a93cbe8a32
Refine 'CCFontXXXX'
2016-03-24 23:05:22 +08:00
Wenhai Lin
66576f19dc
Merge pull request #14230 from mogemimi/fix-memory-leak-fontfnt
...
Fix memory leak in FontFNT
2016-03-24 19:59:14 +08:00
Dale Stammen
ee05081f3a
fixed include paths
2016-03-23 12:14:12 -07:00
Dale Stammen
12e34ca9d4
updated to v3.11
2016-03-23 12:13:44 -07:00
Dale Stammen
bd72d7a6de
updated chipmunk include path
2016-03-23 12:12:44 -07:00
zilongshanren
db00d4944c
Merge pull request #15293 from zilongshanren/fixDetachIME
...
fix systemFontDirty and lineBreakMode issue
2016-03-23 16:37:53 +08:00
mogemimi
de0582844e
Fix memory leak in FontFNT
2016-03-23 15:17:05 +09:00
minggo
3c676d9712
Merge pull request #15037 from Shulepov/spriteframecache_pixel_format
...
SpriteFrameCache: take pixelFormat into account if specified
2016-03-23 09:48:35 +08:00
CocosRobot
6e12d8c98a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-22 12:58:39 +00:00
Xpol Wan
a225130010
Fixes windows universal build.
2016-03-22 18:51:58 +08:00
Xpol Wan
ae3fbcce79
Manually fixes include path for generated code.
2016-03-22 16:08:28 +08:00
Xpol Wan
71f0537734
Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths
2016-03-22 16:07:02 +08:00
Xpol Wan
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
zilongshanren
ff6b7080f5
fix systemFontDirty and lineBreakMode issue
2016-03-22 14:47:33 +08:00
CocosRobot
35645d8c26
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-22 06:24:54 +00:00
zilongshanren
400e77808c
Revert "UIEditBox attachWithIME, detachWithIME make working"
2016-03-22 14:18:39 +08:00
zilongshanren
a15a39095f
fix system font dirty issue
2016-03-21 22:31:23 +08:00
CocosRobot
97130dc084
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-21 12:56:42 +00:00
Xpol Wan
32e408487f
Fixes import path for m and mm files.
2016-03-21 20:12:58 +08:00
Xpol Wan
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
Xpol Wan
768f02bae3
revert pch.cpp for windows 8.1 and windows 10.
2016-03-21 11:00:32 +08:00
Xpol Wan
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
minggo
dcb3aa20c1
Merge pull request #15237 from njh0602/somefix
...
remove unnecessary scope operator
2016-03-18 18:31:53 +08:00
CocosRobot
e2f820df25
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-18 09:11:18 +00:00
zilongshanren
7993ad93d2
fix jsb API inconsistency.
...
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
2016-03-18 16:18:40 +08:00
zilongshanren
56878bd441
Merge pull request #14532 from xpol/refactor-utf-module
...
Overhaul UTF modules and add full set of UTFs conversion functions.
2016-03-18 14:00:47 +08:00
zilongshanren
6ce5ee24b4
Merge pull request #15274 from zilongshanren/fixJsBindings-deprecated
...
fix polygon api typo
2016-03-18 13:44:40 +08:00
zilongshanren
2bb4847848
Merge pull request #15251 from xpol/detect-apple-platforms
...
Detect Apple platforms
2016-03-18 13:44:24 +08:00
Xpol Wan
4bbfb56983
Try fixes binding generator error.
2016-03-18 10:21:38 +08:00
zilongshanren
589d7e47bf
fix polygon api typo
2016-03-17 17:16:56 +08:00
zilongshanren
a1b4cd845f
Revert "Fix incorrect function name of getTrianglesCount"
2016-03-17 16:38:17 +08:00
zilongshanren
11ed05a0be
Merge pull request #15245 from mogemimi/fix-function-name
...
Fix incorrect function name of getTrianglesCount
2016-03-17 16:08:40 +08:00
CocosRobot
c250ac8bfd
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-17 05:53:10 +00:00
zilongshanren
034410f5c5
Merge pull request #15259 from mxenabled/steerlink/ccnode_do_enumerate
...
Enumerate getChildren() instead of _children.
2016-03-17 13:47:57 +08:00
mogemimi
2f75effe96
Add backwards compatibility for 'getTriaglesCount'
2016-03-17 14:22:09 +09:00
zilongshanren
d6f9ed93d6
add bindings
2016-03-17 11:56:48 +08:00
zilongshanren
f5119a8dea
Merge pull request #15262 from CocosRobot/update_lua_bindings_1458186037
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-17 11:44:02 +08:00
CocosRobot
69960024e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-17 03:42:52 +00:00
zilongshanren
ad7ac83128
Merge pull request #15240 from newnon/v3_not_needed_define
...
fix unneeded define that breaks some libraries to build on windows
2016-03-17 11:40:51 +08:00
zilongshanren
535d3b3c32
Merge pull request #15241 from newnon/v3_gl_program_imageview
...
GLProgram for ImageView
2016-03-17 11:39:58 +08:00
zilongshanren
00ec3690b2
Merge pull request #15242 from newnon/v3_cursor_support_for_textfield
...
Cursor support for text field
2016-03-17 11:39:11 +08:00
zilongshanren
18992b0404
Merge pull request #15252 from xiaofeng11/v3_studioRef
...
Remove cocos2dx.h reference from all cocos studio related files
2016-03-17 11:38:20 +08:00
YooJaehong
7eeccbc771
UIEditBox attachWithIME, detachWithIME make working
...
(android, iOS tested)
2016-03-17 10:26:53 +09:00
Denna Lawrence
737455fda6
Add optional alpha parameter to Color4B and Color4F constructors
2016-03-16 16:08:49 -06:00
sheldon.teerlink
c54513bb13
Enumerate getChildren() instead of _children.
2016-03-16 15:03:33 -06:00
XiaoFeng
0a657cd219
Remove cocos2dx.h reference from all cocos studio related files
2016-03-16 14:02:08 +08:00
Xpol Wan
0211c372b4
Update comment.
2016-03-16 13:30:11 +08:00
Xpol Wan
bfb97739e2
Detect Apple platforms correctly.
2016-03-16 13:15:41 +08:00
mogemimi
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
Sergey
8541dead20
Cursor support for text field
2016-03-14 18:09:04 +03:00
Sergey
980d5fec68
GLProgram for ImageView
2016-03-14 17:05:39 +03:00
Sergey
0d67d5d533
fix unneeded define that breaks some libraries to build on windows
2016-03-14 16:58:01 +03:00
dimon4eg
b7779180b1
fix annoying "callBackName cannot be found" log
2016-03-14 12:11:23 +02:00
NamJunHyone
98cbc6c359
remove unnecessary scope operator
2016-03-14 18:33:58 +09:00
XiaoFeng
06ac05259b
More fix to compile libjscocos2dx as dll under win32
2016-03-14 12:06:14 +08:00
Vladimir Perminov
5c1a272178
Remove comment // S_FALSE is succeeded
2016-03-13 19:30:13 +03:00
Steve K. Chiu
4769890d4e
Fix calculation of outLength
...
The order of integer arithmetic is important, the original code fail to
calculate the length correctly, e.g. inLength 20 for base64Encode should
output 28, not 30. It is fixed and simplified with this commit.
2016-03-12 15:42:52 +08:00
CocosRobot
16edf90f70
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-11 14:40:00 +00:00
zilongshanren
1409adc07a
Merge pull request #15205 from mogemimi/fix-mojibake-and-typo
...
Fix typos in the documentation
2016-03-11 22:33:31 +08:00
zilongshanren
5a3a4c356f
Merge pull request #15195 from perminovVS/textfiled-support-cursor-v1.2
...
Textfiled support cursor v1.2
2016-03-11 22:32:55 +08:00
Vladimir Perminov
fa7d9c7163
Remarks zilongshanren
...
Copy constructor remove from StringUTF8
StringUTF8::set change to StringUTF8::replace
TextFieldTTF::setCursorUse change to TextFieldTTF::setCursorEnabled
TextFieldTTF::_cursorUsechange to TextFieldTTF::_cursorEnabled
2016-03-11 15:09:50 +03:00
pandamicro
0424ab2db5
Merge pull request #15222 from xiaofeng11/v3_depsUpdate
...
update deps
2016-03-11 16:20:09 +08:00
XiaoFeng
3acea03924
Update deps lib and chipmunk manual binding to support both libcocos2dx and libjscocos2dx compiled as dll file under win32 system
2016-03-11 15:44:28 +08:00
xiaofeng11
7b338c2f4c
Merge pull request #15223 from geron-cn/v3bugfixs
...
fix bug: eventframe can be enter one time when event time has a single frame.
It's OK, merged
2016-03-11 13:34:21 +08:00
geron-cn
b3ee96ebd2
fix bug: https://github.com/cocos2d/cocos2d-x/issues/15084
2016-03-11 12:56:58 +08:00
Ricardo Quesada
9477bfd801
Merge pull request #15135 from dumganhar/ws-close-fix
...
Closes websocket connection by dispatching a 'resetDirector' event.
2016-03-10 17:39:47 -08:00
mogemimi
582835b670
Fix typos in the documentation
2016-03-11 00:34:32 +09:00
geron-cn
7824acc34e
fix scrollview bugs:
...
- fix bar's position not right after size changed
- fix bar setAutoHideEnabled some time not right
2016-03-10 18:06:20 +08:00
geron-cn
0bd9d1638d
Squashed commit of the following:
...
commit 976d28b4d1c71576799ecd4d7cc51e39f3d15b2d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 9 18:58:17 2016 +0800
avoid warning
commit 1c0ad1a56262bdb37f76badc7b40925e413999f3
Merge: 4604c47 b9b3049
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 9 18:52:43 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
commit 4604c47ded82a83b675d1f418fe0015683e6a57b
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 9 18:51:02 2016 +0800
fix bugs:
- fix there is a bar dot after init a scrollview with scrollbar
- fix some time var can not auto hide after scroll
commit e70b093d8e8a18b532c50c23f4c43b0131933ea4
Merge: 45268ac f2c9994
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Mar 7 15:32:08 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
commit 45268ac10bf579b16a0beb8ad45b55512b47b49f
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Mar 7 15:30:47 2016 +0800
remove inline
commit a1c70265dfc2fd0ffbe8ff81a987af7d0bbc7a06
Merge: 8269019 b5a44bc
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Mar 4 10:48:41 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
commit 8269019874ca1bd0d265dff14e105e56bcc15bb2
Merge: 46f2e8c
a6b02fc
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 18:43:40 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
2016-03-09 19:08:18 +08:00
xiaofeng11
b9b3049acb
Merge pull request #15213 from FrostPolaris/v3
...
Fix the bug that TextField may be set with a multi-line localized text.
It's OK, merged.
2016-03-09 18:34:03 +08:00
pandamicro
849a2ee544
Merge pull request #15215 from minggo/firefox-remote-debug
...
[ci skip]fix a bug that will miss packets
2016-03-09 16:59:03 +08:00
minggo
e44f4d8d61
fix a typo
2016-03-09 16:07:57 +08:00
minggo
8079c55d88
fix bug that will lost incoming packets
2016-03-09 16:03:55 +08:00
beichen.liu
8f9233be00
Fix the bug that TextField may be set with a multi-line localized text.
2016-03-09 09:31:34 +08:00
Vladimir Perminov
7011c3a7e4
GLProgram replaceDefines correct and other feature
2016-03-07 17:05:20 +03:00