minggo
16a1605927
Merge pull request #15690 from halx99/patch-2
...
change if (fontName.c_str()) to if(!fontName.empty())
2016-05-23 16:04:14 +08:00
minggo
5caea3a197
Merge pull request #15692 from mogemimi/prevent-c4996-warning
...
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-23 14:14:38 +08:00
Vladimir Perminov
b6d72e33d8
Fix password style text in UTF-16 ( #15620 )
...
* Fix password style text in UTF-16
Label used UTF-16 in internal.
Need string in UTF-8.
* Set correct char for Max and iOS
* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +08:00
mogemimi
ad3c305172
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-22 07:05:35 +09:00
halx99
86d148c24c
change if (fontName.c_str()) to if(!fontName.empty())
...
fix warnning, change if (fontName.c_str()) to if(!fontName.empty()), The first expression's value always true.
2016-05-20 23:10:28 +08:00
minggo
2c9716d714
Merge pull request #6927 from TimothyZhang/fix-cc-utf8-to-utf16
...
fixed bug of cc_utf8_to_utf16() when length!=-1
2016-05-20 14:59:06 +08:00
minggo
797cd50a6e
Merge pull request #15683 from hopstertv/enable-webview-local-storage-on-android
...
Enable WebView's local storage on Android
2016-05-20 14:40:22 +08:00
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