Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,685 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

13058 Commits

Author SHA1 Message Date
pandamicro 8d8ac60625 Merge pull request #14761 from pandamicro/v3.10 
Correct return type to adopt GC Rooting API
 2015-12-21 11:46:59 +08:00
pandamicro 616f5c0a01 Correct return type to adopt GC Rooting API 2015-12-21 11:07:40 +08:00
pandamicro 4e36e24993 Correct return type to adopt GC Rooting API 2015-12-21 10:42:54 +08:00
mogemimi aac1558b75 Fix typos in documentation, comments and strings 2015-12-21 08:22:41 +09:00
pandamicro 81918f51ea Fix event handle function issue with compartment 
and  Fix a crash issue caused by malformed js usage
 2015-12-21 00:16:17 +08:00
pandamicro 8d712a4c45 Expose CC_ENABLE_GC_FOR_NATIVE_OBJECTS 2015-12-21 00:16:17 +08:00
pandamicro 34c7331b99 Issue fixes for new memory model 2015-12-21 00:16:17 +08:00
pandamicro 6a6407f711 Pass native references to script scope 2015-12-21 00:16:16 +08:00
pandamicro 8ddaf310ef Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
pandamicro e1bc6640f4 Implement full GC relied memory model 2015-12-21 00:14:51 +08:00
pandamicro 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
pandamicro 1071f63ac7 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-12-20 22:45:51 +08:00
Sergey bac68bd0b8 getVersion win32 implementation 2015-12-20 00:09:45 +03:00
pandamicro f747075a83 Merge pull request #14748 from pandamicro/v3.10 
Temporary disable forceGC on win32
 2015-12-19 23:27:12 +08:00
pandamicro 8f836162aa Temporary disable forceGC on win32 2015-12-19 22:45:57 +08:00
pandamicro 386b850871 Fix issue in MenuItem init usage 2015-12-19 22:45:22 +08:00
pandamicro ae48253da6 Fix UI addEventListener issue 2015-12-19 22:44:25 +08:00
fanli ffbac99dc5 fix script samples error with controlButton 2015-12-19 22:22:41 +08:00
CocosRobot 0f90f74df9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-19 09:12:27 +00:00
zilongshanren 94ee0734a5 Merge pull request #14721 from newnon/v3.10_slider_missprint 
slider misprint fix
 2015-12-19 17:06:26 +08:00
zilongshanren 4fda883c3b Merge pull request #14742 from xiaofeng11/v3.10 
Fix TextField won't show security text when first time set password enable
 2015-12-19 17:01:43 +08:00
zilongshanren 795637c0c5 Merge pull request #14743 from liamcindy/v3_ui_LoadingBar 
fix loadingbar direction changed error
 2015-12-19 16:59:42 +08:00
Liam 8bf7908e93 fix loadingbar direction changed error 2015-12-19 15:59:27 +08:00
XiaoFeng d8817f3cbb Fix TextField won't show security text when first time set password enable 2015-12-19 15:44:39 +08:00
pandamicro 6481a0f3c1 Merge pull request #14740 from xiaofeng11/v3.10 
Bug Fix & h5 engine ref update
 2015-12-19 14:13:37 +08:00
XiaoFeng a139221618 Synchronize parser match modify from h5 engine 
Update h5 engine ref
 2015-12-19 13:56:12 +08:00
zilongshanren b480e9191d Merge pull request #14729 from newnon/v3.10_scale9sprite_cropped_spriteframes_support 
Scale9Sprite cropped sprite frames support
 2015-12-19 13:07:25 +08:00
zilongshanren 8d967982cd Merge pull request #14723 from newnon/v3.10_web_socket_crash_fix 
fix web socket crash
 2015-12-19 10:11:58 +08:00
Sergey 9e6657d6b2 fix scale9error error 2015-12-18 22:40:12 +03:00
mogemimi 12ece31121 Mark the old functions as CC_DEPRECATED_ATTRIBUTE 2015-12-19 01:21:56 +09:00
mogemimi 689ee1081a Fix spelling of function name 2015-12-19 01:07:08 +09:00
CocosRobot b5141a28bd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-18 13:28:14 +00:00
XiaoYang 593a619dc8 Merge pull request #14715 from liamcindy/v3_textureCache 
update for 3D object render, revert old changes
 2015-12-18 21:22:31 +08:00
xiaofeng11 2ee5c88f9a Merge pull request #14733 from xiaofeng11/v3.10 
Update h5 sub-module ref
 2015-12-18 19:06:59 +08:00
linguofeng 278bbb77c5 CCFileUtils-apple.mm Grammatical errors 
`termniate` -> `terminate`
 2015-12-18 17:34:52 +08:00
XiaoFeng a13a0c35d3 Update h5 sub-module ref 
Synchronize studio parser match change from h5 modify
 2015-12-18 15:40:21 +08:00
zilongshanren eb72760b85 Merge pull request #14726 from xiaofeng11/v3.10 
Fix TextField missing default password style text setting
 2015-12-18 14:42:21 +08:00
pandamicro 4d9beb9d77 Merge pull request #14699 from WenhaiLin/v3-new-nothrow 
Adds `std::nothrow` to the `new` statements
 2015-12-18 14:38:28 +08:00
zilongshanren 2a6cec25fa Merge pull request #14701 from WenhaiLin/v3-label-letterfix 
Fixed label's letter can't be hide by `setVisible(false)`.
 2015-12-18 11:41:51 +08:00
Liam fb312a761c update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00
kci d3898991af fix some logical error 2015-12-18 11:03:23 +09:00
zilongshanren 1e8a0e0acc Merge pull request #14719 from newnon/v3.10_fix_android_include 
fix include in cocos network module
 2015-12-18 09:53:09 +08:00
Sergey 98fe1d46cc Scale9Sprite now fully support cropped sprite frames in both mode simple & slice 2015-12-18 00:32:59 +03:00
XiaoFeng 6c08dd920e Fix TextField missing default password style text setting 2015-12-17 18:29:23 +08:00
Sergey Perepelitsa b30553e933 WebP loading improvements WebP loaded as premultiplied alpha if it have alpha 2015-12-17 12:07:56 +03:00
Sergey 3e049f8049 slider misprint fix 2015-12-17 12:06:39 +03:00
Sergey 89f4a1208b fix font for EditBox in iOS & Mac 2015-12-17 12:02:39 +03:00
Sergey b4f762befa fix include in cocos network module 2015-12-17 11:50:54 +03:00
Sergey a172cce874 fix web socket crash 2015-12-17 11:48:25 +03:00
kci 9e77fb0834 fix build fail error 2015-12-17 16:24:29 +09:00
kci 8a39c1a06a Windows/osx/linux build fail bug fixed 2015-12-17 15:40:16 +09:00
Xpol Wan 41d4a41920 crystax-ndk-10.3.0 needs <stdint.h> to be included here. 2015-12-17 12:08:14 +08:00
Ricardo Quesada d943381c65 Update spidermonkey_specifics.h 
updated docstrings
 2015-12-16 20:03:09 -08:00
Ricardo Quesada 1ba3f2badb minor fixes 2015-12-16 17:47:50 -08:00
Ricardo Quesada f023d5a378 no more uthash 
Instead of using two uthash entires, it uses two unordered_map entries.
Benefits are:

easier to debug. I can inspect the contents of the unorderd_map with the
debugger
less memory. I don't need to allocate two proxies. I only allocate one
proxy and I added it into both maps
If also fixes an important bug when unrooting objects. Unroot was
cleaning the heap object. So now proxy adds a _jsobj, which is a raw
pointer. Needed under certain cases.
 2015-12-16 17:37:44 -08:00
kci afc50be1ed Fix #14428 CCRenderTexture does not work properly on some devices which does not support "GL_OES_packed_depth_stencil". 2015-12-17 10:34:51 +09:00
pandamicro b079705dcd Merge pull request #14702 from pandamicro/v3.10 
Fix Downloader callback bug on iOS9
 2015-12-17 01:05:10 +08:00
pandamicro 58902f0711 Fix issue in URLSession:task:didCompleteWithError: 2015-12-16 21:19:46 +08:00
pandamicro ffcf45ef78 Improved solution for Downloader status code issue on iOS 9 2015-12-16 17:45:40 +08:00
Wenhai Lin 66b0a0e9b1 Adds `std::nothrow` to the `new` statements 2015-12-16 17:06:56 +08:00
zilongshanren 89c620eb4b Merge pull request #14696 from WenhaiLin/v3-labelfix 
Improved robustness in release mode
 2015-12-16 17:00:45 +08:00
pandamicro a8a9c8ec92 Merge pull request #14694 from ricardoquesada/v3_10_js_fixes 
ccvector_to / ccmap_to converted to new API
 2015-12-16 16:34:51 +08:00
pandamicro 7303895866 Improve error message for Downloader and add test case 2015-12-16 15:43:18 +08:00
pandamicro 05da27338a Merge branch 'fix/ios9_downloader_bug' of github.com:cezheng/cocos2d-x into v3.10 2015-12-16 15:24:42 +08:00
Wenhai Lin dfdc202171 refine 2015-12-16 15:08:48 +08:00
Wenhai Lin b91882f150 Fixed label's letter can't be hide by `setVisible(false)`. 2015-12-16 14:59:33 +08:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
yangxiao 74b480c1b6 fix setflip for batch sprite 2015-12-16 13:45:37 +08:00
Wenhai Lin e5952ad440 Improved robustness in release mode 2015-12-16 11:53:59 +08:00
Ricardo Quesada eb8e755362 removes logs 2015-12-15 18:21:44 -08:00
Ricardo Quesada 43a573f4fd ccvector_to / ccmap_to converted to new API 
and more fixes
 2015-12-15 17:37:48 -08:00
GuoLunHao 7d72f66f5b add 'js_module_register.cpp' and 'lua_module_register.cpp' in Compile Sources on iOS Targets' Build Phases 2015-12-15 21:00:24 +08:00
Joachim Grill 98079b49e8 updated javascript bindings 2015-12-15 11:18:32 +01:00
Joachim Grill ba45e2df33 updated lua bindings; updated file format description 2015-12-15 10:56:10 +01:00
XiaoYang 727d857c88 Merge pull request #14674 from super626/tilemap 
fix fast tilemap blend function
 2015-12-15 17:23:53 +08:00
CocosRobot 8cb2ec6187 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-15 04:31:50 +00:00
pandamicro 6e20c3cc4f Merge pull request #14681 from pandamicro/v3.10 
Fix ComponentJS proxy management issue in JSB
 2015-12-15 12:26:12 +08:00
Ce Zheng 6d58fc05d9 Fix Downloader callback bug on iOS9 
On iOS 9 when server returns a response with HTTP status 403 caused the
downloader to callback successfully and saving the error message to the
storage path. This commit adds a check on the HTTP status code and
do failure callback if status code is 4xx or 5xx.
 2015-12-15 13:16:24 +09:00
pandamicro 64276bd664 Fix ComponentJS proxy management issue in JSB 2015-12-15 11:48:44 +08:00
pandamicro 280a8e9d9c Merge pull request #14663 from xiaofeng11/v3.10 
Update all version number to v3.10
 2015-12-15 10:48:51 +08:00
Dale Stammen 46b926a18e added missing _USRJSSTATIC preprocessor define for ARM builds 2015-12-14 14:55:33 -08:00
mogemimi 18aec7e942 Fix deprecation warning in FontFNT 2015-12-15 02:25:32 +09:00
Joachim Grill 4dd3595b1e added test with plist file containing anchor points 2015-12-14 16:17:41 +01:00
Joachim Grill 033b9aabf0 read sprite anchor point from plist file 2015-12-14 15:42:18 +01:00
pandamicro 0e7a02d025 Merge pull request #14670 from pandamicro/v3 
Fix evalString doesn't return result issue
 2015-12-14 17:26:34 +08:00
zilongshanren bc29bde5ae Merge pull request #14653 from liamcindy/v3_ui_pageView 
update pageview to support adjust child size
 2015-12-14 17:00:58 +08:00
yangxiao b6ec4c9c5d fix fast tilemap blend function 2015-12-14 16:51:53 +08:00
yangxiao eee7726f5f fix setflip for batch sprite 2015-12-14 15:35:26 +08:00
Liam 508d54ec3c fix pageview child size 2015-12-14 15:29:02 +08:00
肖峰 23bf815cfa Fix 3d touch compile error in lower version Xcode 2015-12-14 14:26:52 +08:00
zilongshanren 0dd4433104 Merge pull request #14669 from zilongshanren/fixCustomSize 
fix #12249
 2015-12-14 13:56:50 +08:00
zilongshanren 6781c96fe0 Merge pull request #14661 from zilongshanren/v3.10 
fix scale9sprite global zorder issue.
 2015-12-14 13:56:29 +08:00
pandamicro 662c7fbec5 Made API consistent with old version 2015-12-14 13:55:17 +08:00
pandamicro cbce4d37c3 Merge pull request #14671 from ricardoquesada/more_js_fixes 
More js fixes
 2015-12-14 13:41:59 +08:00
zilongshanren 96db089b64 Merge pull request #14665 from zilongshanren/fixMemoryLeak 
fix memory leaks of stencileStateManager
 2015-12-14 13:34:17 +08:00
pandamicro 330b588215 Fix evalString doesn't return result issue 2015-12-14 13:13:54 +08:00
pandamicro 41218a65e7 Merge pull request #14668 from pandamicro/v3 
Sync v3 and Fix win32 js project crash issue
 2015-12-14 13:12:42 +08:00
zilongshanren 838bd242ce fix #12249 2015-12-14 11:53:09 +08:00
zilongshanren 3e64e09e69 fix memory leaks of stencileStateManager 2015-12-14 10:40:09 +08:00
xiaofeng11 1c53920a13 Merge pull request #14660 from chengstory/#24345 
Fix #24345
 2015-12-14 10:38:13 +08:00
XiaoFeng 4815ec8b9a Update version number to v3.10 2015-12-14 10:32:29 +08:00
pandamicro 445442c964 Upgrade spider monkey to solve win32 js project crash issue 2015-12-14 10:27:11 +08:00
zilongshanren 0f5aac5754 fix typo 2015-12-14 10:14:39 +08:00
zilongshanren 8c9b03112e fix scale9sprite global zorder issue. 
1. it also fix the positiong issue when call setScale9Enabled(false)
 2015-12-14 10:09:06 +08:00
XiaoYang d904246aa8 Merge pull request #14613 from super626/v3 
fix 3d model bug
 2015-12-14 10:04:25 +08:00
Elviss Strazdins fc84306bcb Always update design resolution 2015-12-14 01:20:38 +02:00
Elviss Strazdins 4b33d730de Calculate frame size with zoom factor 2015-12-14 00:53:46 +02:00
Elviss Strazdins 718422c1d9 Set frame size on window resize 2015-12-14 00:20:29 +02:00
zilongshanren b1d700ad33 fix bmfont size error 2015-12-13 13:59:42 +08:00
CocosRobot 0473dd88fc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-13 03:12:14 +00:00
pandamicro 2ef0197534 Merge pull request #14643 from GuoLunHao/v3.10 
fix compile error and link error on ios/Mac platform
 2015-12-12 23:46:32 +08:00
mogemimi 07673f71cd Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
Ricardo Quesada c5058aa2f9 more conversions 2015-12-11 17:18:20 -08:00
Ricardo Quesada 47911e0c24 more js fixes 
fixes in how ref count is measured
opengl bindings converted to new API
 2015-12-11 15:18:09 -08:00
CocosRobot 71f9ead981 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-11 17:52:29 +00:00
Ricardo Quesada fd321530e5 restores autobindings 2015-12-11 08:59:35 -08:00
XiaoFeng 49d03d9de1 Synchronize js parsers modification from html5 version 2015-12-11 18:22:02 +08:00
Ricardo Quesada 8b2dfb1a4b Mooooores fixes 
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
 2015-12-10 22:15:44 -08:00
zilongshanren d75767bfc4 Merge pull request #14639 from liamcindy/v3_ui_text 
update for text effect clone
 2015-12-11 13:54:46 +08:00
Liam 4c5c6e6d9b update for code format 2015-12-11 12:04:54 +08:00
zilongshanren 6f3721a68c Merge pull request #14638 from liamcindy/v3_ui_scrollView 
fix scrollview render error
 2015-12-11 10:55:17 +08:00
Ricardo Quesada 96d391ea30 Squashed commit of the following: 
commit aff4e27200a77db60b13ea30c2457558e5f53059
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 17:58:41 2015 -0800

    compiles with new GC model

commit 1fa69cd71231d56371cd45a378e50a1888308b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 17:41:15 2015 -0800

    Animation3D works Ok

commit d439969caf7e6fe83a74e37d078c4361a08cb816
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 13:39:50 2015 -0800

    Sprite3d create: converted to new API

commit aabe449e4a968fad882c44df9be787eb7c3bfcec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 13:27:33 2015 -0800

    ouch...

commit 688ab610a8cb7607bc3c51b8ca01d800ef3c9794
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 13:12:25 2015 -0800

    Spawn/Sequence init* were not bound

    Fixed. Now JS Scheduler Test works Ok
 2015-12-10 18:02:55 -08:00
Ricardo Quesada 2420c942c3 Merge pull request #14617 from chengstory/#24345 
Fix #24345
 2015-12-10 09:19:30 -08:00
GuoLunHao 5872745593 fix compile error and link error on ios/Mac platform 2015-12-10 16:43:01 +08:00
Liam 8c2b4c78db fix scrollview render error 2015-12-10 13:37:07 +08:00
Liam e92db43e14 update for text clone 2015-12-10 13:17:31 +08:00
pandamicro aa66e3a97c Merge pull request #14629 from MSOpenTech/v3-winrt-3.10 
V3.10 winrt updates
 2015-12-10 10:05:23 +08:00
pandamicro cb22de5a09 Merge pull request #14590 from pandemosth/issue_14589 
Fixes #14589 allocation issue with remote images
 2015-12-10 10:04:29 +08:00
CocosRobot 6727719cb7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-10 01:47:27 +00:00
pandamicro ceac1d9d6a Merge pull request #14626 from dumganhar/v3 
Bug fix for shouldStartLoading method, should return value from JS
 2015-12-10 09:36:28 +08:00
Dale Stammen 35c855a565 updated dll name to v3.10 2015-12-09 17:33:14 -08:00
Slack-Moehrle ea2354932c Merge pull request #14614 from mogemimi/fix-doc-and-comment-typo 
Fix typo in documentation and comments
 2015-12-09 14:08:57 -05:00
James Chen 65eb5fa4ba Bug fix for shouldStartLoading method, should return value from JS, also fix that webview callback is already in Cocos Thread, don't need to post to cocos thread for running again. 2015-12-09 22:40:57 +08:00
pandamicro 936ff936e2 Merge pull request #14621 from GuoLunHao/v3 
fix the link error and compile error in windows and android platform
 2015-12-09 20:25:15 +08:00
lunhao.guo ae980c19d2 fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +08:00
zilongshanren 666281754d Merge pull request #14616 from zilongshanren/fixLoadingBarScale9Rendering 
Refactoring Scale9 ui widgets to use the latest RenderingType feature.
 2015-12-09 18:34:57 +08:00
zilongshanren bb515dce58 fix issue 12249 2015-12-09 17:15:09 +08:00
zhangcheng 2a806a82c6 Fix #24345 
TMX Iso Zorder and TMX Ortho Zorder rendering error in TestCPP.
 2015-12-09 15:07:58 +08:00
zilongshanren e37e1909f2 don't remove optimize code for capInsets 2015-12-09 15:00:41 +08:00
zilongshanren df44b164ef change layout scale9 rendering type to simple 2015-12-09 14:38:53 +08:00
zilongshanren 4c99bdf04f change imageview non-s9 to simple rendering type 2015-12-09 14:26:12 +08:00
zilongshanren df2ebfbc9c change uibutton nons9 to simple rendering mode 2015-12-09 14:21:26 +08:00
Ricardo Quesada 2251b52929 Merge pull request #14611 from ricardoquesada/js_get_or_create_jsobject 
js_get_or_create_jsobject() and other stuff
 2015-12-08 20:48:58 -08:00
Ricardo Quesada 96ee343884 fixes for windows 2015-12-08 20:07:13 -08:00
zilongshanren 9fd5985581 add simple rendering mode to slider 2015-12-09 11:32:52 +08:00
zilongshanren a671bf7ce9 loading bar use new scale9 feature 2015-12-09 10:41:31 +08:00
mogemimi f280a31323 Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
zilongshanren ea5dacedd0 Merge pull request #14608 from xiaofeng11/v3_310fix 
Bug fix & make test case more clear.
 2015-12-08 18:05:36 +08:00
yangxiao 6e1f38fdc4 fxi model bug 2015-12-08 16:32:06 +08:00
Ricardo Quesada e675657cae improved docstrings 2015-12-07 19:14:10 -08:00
Ricardo Quesada 13dc967b03 js_get_or_create_jsobject() and other stuff 
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()

Squashed commit of the following:

commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 19:04:24 2015 -0800

    logging added (and commented)

    will be useful in the future

commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 19:00:09 2015 -0800

    new js_get_or_create_jsobject<T>

    Specializes Template on cocos2d::Ref.
    When Ref, it calls the `jsb_ref` functions

commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 13:31:52 2015 -0800

    singletons converted

commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 12:20:07 2015 -0800

    getDescendants() converted
 2015-12-07 19:05:23 -08:00
zilongshanren 5ef1c92420 Merge pull request #14609 from zilongshanren/fixLabelClampIssue 
fix horizontal clamp and shrink issue
 2015-12-07 19:45:19 +08:00
XiaoFeng 73d0f8a46e Bug fix & make test case more clear. 
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
 2015-12-07 18:36:28 +08:00
zilongshanren 6f7e5a5c06 Merge pull request #14607 from liamcindy/v3_issuseRevert 
revert error changes
 2015-12-07 18:16:49 +08:00
zilongshanren 6c17ef4baf fix horizontal clamp and shrink issue 2015-12-07 18:13:03 +08:00
Liam 15072a6dd3 revert error changes 2015-12-07 16:21:12 +08:00
James Chen 462796d2dd Bug fix for ActionNode in CocosStudio, please don't use weak reference. 2015-12-07 15:06:50 +08:00
CocosRobot 7e803cbd0a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-07 03:30:43 +00:00
zilongshanren c9d32a83b8 Merge pull request #14597 from mogemimi/fix-api-spelling 
Fix misspelled APIs in v3.10
 2015-12-07 11:07:13 +08:00
enh a318e31222 We should not intercept touch event if scrollview's _direction is NONE 2015-12-06 22:51:22 +08:00
Ricardo Quesada d02f4afd4a using new bindings templates 
ignores createInstance() from ui
 2015-12-05 22:26:54 -08:00
mogemimi c7640c8aaf Replace 'resoucedata' with 'resourcedata' in JS Binding 2015-12-05 18:59:54 +09:00
mogemimi 745f54b421 Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
mogemimi 09c6e5d2f7 Replace 'Disabeld' with 'Disabled' 2015-12-05 18:59:54 +09:00
Ricardo Quesada aebfefd7a8 Merge branch 'v3' into js_more_conversions 2015-12-04 19:01:20 -08:00
Ricardo Quesada cd8631ef09 sfunction "create" uses new optimized code 
...although this code should never be called
 2015-12-04 18:42:31 -08:00
Pan Demosthenous 54ac5d8d2e fix allocation issue with remote images 2015-12-05 10:10:58 +11:00
pandamicro d371ec2c8a Merge pull request #14585 from CocosRobot/update_lua_bindings_1449222153 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-04 17:53:46 +08:00
pandamicro 51acfa8908 Merge pull request #14581 from xiaofeng11/v3_xf 
Add missing lua engine export declaration.
 2015-12-04 17:51:38 +08:00
CocosRobot d5e54bdb81 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 09:48:13 +00:00
pandamicro 6ff2586f26 Merge pull request #14574 from super626/v3 
Fix Sprite3D::setMaterial when multiple meshes exist
 2015-12-04 17:38:56 +08:00
pandamicro 1820a006ba Merge pull request #14502 from xiaofeng11/v3_combine_2d 
Combine Studio change for 2d components
 2015-12-04 16:05:24 +08:00
XiaoFeng 8f9ea8a87e Add missing lua engine export declaration. 2015-12-04 15:23:59 +08:00
XiaoFeng 71217fd393 Fix indent 2015-12-04 15:14:47 +08:00
CocosRobot d09eae92f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 07:13:02 +00:00
Ricardo Quesada 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
XiaoFeng 1171c6aaa1 Remove desktop only function, set ondraw serial function in DrawNode override able. 2015-12-04 14:55:54 +08:00
Ricardo Quesada 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
yangxiao 8d546828f4 fix Sprite3D::setMaterial 2015-12-04 10:54:43 +08:00
XiaoFeng 6fb65b5610 Editing code as comment. 
Move CocosStudioExtension path and update related files.
 2015-12-04 10:43:39 +08:00
CocosRobot fd2d616aed [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 02:03:46 +00:00
zilongshanren 01644cb46e Merge pull request #14569 from mogemimi/fix-docs-typo 
Fix typos in documentation
 2015-12-04 09:55:30 +08:00
XiaoFeng 2da192a1c2 Remove cocostudio header file from sprite and particle, and adjust tests 
Fix compile error under iOS & Mac
 2015-12-04 09:26:14 +08:00
Ricardo Quesada 49882ed91c js_cocos2dx_CCGLProgram_createWithString converted to new JSAPI 2015-12-03 15:49:56 -08:00
Ricardo Quesada b87975096e GLProgram converted to new JSAPI 2015-12-03 15:47:39 -08:00
Ricardo Quesada 67948ff8c8 adds jsb_ref_get_or_create_jsobject() 
kind of replaces js_get_or_create_jsobject for Ref objets.
Benefits: friendly with the new JS API
takes less space (no template)
 2015-12-03 15:40:52 -08:00
Ricardo Quesada 37b4c3fe6a CallFuncN converted to new JS API 2015-12-03 15:24:37 -08:00
Ricardo Quesada 013f5b8d33 layerMultiplex converted to new JS API 2015-12-03 15:15:47 -08:00
Ricardo Quesada 3100cba5a1 Animation ported to JS 2015-12-03 15:02:39 -08:00
Ricardo Quesada cc6e72fe7c MenuToggleItem converted 2015-12-03 14:54:38 -08:00
Ricardo Quesada e5032dccc0 rootObject/unrootObject working again 2015-12-03 14:49:23 -08:00
Ricardo Quesada bd943c5415 Sequence/Spawn converted to use new API 2015-12-03 13:56:00 -08:00
CocosRobot 3edadc035b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 21:34:13 +00:00
Ricardo Quesada 3646d1e9fc Adds init(array) for Sequence and Spawn 
it also makes the code cleaner.
this is needed for JS
 2015-12-03 12:16:21 -08:00
Shun Lin d0ce2473a1 Merge pull request #14499 from xiaofeng11/v3_combine_safety 
Change ASSERT to safety mode
 2015-12-04 00:04:36 +08:00
mogemimi be213bf306 Fix typos in documentation 2015-12-03 21:03:00 +09:00
zilongshanren ea42c09243 Merge pull request #14566 from zilongshanren/fixIssue14564 
fix scale9sprite be culled unexpectedly
 2015-12-03 19:17:40 +08:00
pandamicro c304348c34 Merge pull request #14565 from pandamicro/v3 
Add js test case for fix, improve template
 2015-12-03 18:48:34 +08:00
pandamicro 91909081da Merge pull request #14542 from pandemosth/issue_14539 
Fix for Issue 14539
 2015-12-03 18:47:17 +08:00
pandamicro 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
zilongshanren 73d00b9262 fix scale9sprite be culled unexpectedly 
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
 2015-12-03 17:53:02 +08:00
pandamicro 4cc4dd3a9f Fix Rooting API usage issue in cocos2d_specifics 2015-12-03 16:48:25 +08:00
Liam 07bc48c1b8 revert glprogram 2015-12-03 16:29:02 +08:00
CocosRobot b1fd2277d8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 07:53:26 +00:00
pandamicro d0cd5ee9ab Merge pull request #14562 from ricardoquesada/js_fixes 
JS bindings fixes for Menu, Sprite and Label
 2015-12-03 15:44:01 +08:00
XiaoFeng 70b9183ddb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 
Conflicts:
	tools/bindings-generator
 2015-12-03 14:35:36 +08:00
XiaoFeng 32b81a69f5 Add test for new API 
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
 2015-12-03 14:21:00 +08:00
pandamicro 9deee44965 Merge pull request #14548 from mogemimi/fix-deprecation-warning 
Fix deprecation warning in SkeletonRenderer
 2015-12-03 13:18:15 +08:00
Ricardo Quesada 58e4d3c487 JS Menu fixes 2015-12-02 17:30:54 -08:00
Ricardo Quesada 48523572b7 label JS fixes 2015-12-02 17:23:23 -08:00
Ricardo Quesada 6e50cf883f Sprite::create() using new API... 
...also code easier to understand
 2015-12-02 16:45:28 -08:00
Ricardo Quesada c321d35a9a Squashed commit of the following: 
commit 000a025fb4027c26bf05f7296e2d1fbbf21abe6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Dec 2 10:38:27 2015 -0800

    updated submodule

commit b5f45a62b48493f05d75aea865158c371241973d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 19:21:34 2015 -0800

    ooops... thanks Panda

commit 85f0b9c01d5281970f748b6460107bc0ca82cdf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 18:19:16 2015 -0800

    better macro name for GC. Thanks panda

commit e42ad74a664dd2b85cbf4463a6fef8f6abc06664
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 17:10:32 2015 -0800

    RepeatForever, Repeat and Speed converted

commit 3a8130ffc06301c91c836539736bbae456f05b4d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 14:31:32 2015 -0800

    cherry-picking changes to disable retain/release from GC

commit 3ed6e00dc2d9d46248d9374a1f9874cd0b2ba67d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 12:31:04 2015 -0800

    fixes autorelease issues on rebind

commit b65f5f6b16c1542c28b04d66377a27233c6cf214
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 12:23:33 2015 -0800

    my JS changes... again
 2015-12-02 14:45:13 -08:00
mogemimi d4233dd63a Fix deprecation warning in SkeletonRenderer 2015-12-03 00:09:47 +09:00
zilongshanren 3fc0d327bf Merge pull request #14544 from CocosRobot/update_lua_bindings_1449037532 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-02 18:27:03 +08:00
zilongshanren 706e005c3d Merge pull request #14543 from zilongshanren/fixLabelOverflowShrink 
fix label clamp when scaled with bmfont
 2015-12-02 18:26:46 +08:00
XiaoFeng a804c67a12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 
Conflicts:
	cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
 2015-12-02 15:07:58 +08:00
CocosRobot edd786e7f6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-02 06:30:18 +00:00
XiaoYang 867664197e Merge pull request #14526 from super626/v3 
3D Normal Map Support
 2015-12-02 14:22:20 +08:00
zilongshanren ed55d41858 fix label clamp when scaled with bmfont 2015-12-02 13:48:20 +08:00
Pan Demosthenous ef931b61af correct typo in method name of doDestroy 2015-12-02 15:23:05 +11:00
Pan Demosthenous 528a94d36f fixes a crash in destructor of CCDownloader-apple when completing a data download 2015-12-02 15:21:42 +11:00
Pan Demosthenous 151e7a7a53 CCDownloader-apple : call onTaskFinish when the download session completes for a data task 2015-12-02 15:16:00 +11:00
yangxiao ebd5c1cca7 resolve conflict and fix checktexture bug 2015-12-02 11:26:05 +08:00
肖峰 5dfc8f6a26 Remove default arguments 2015-12-02 11:02:27 +08:00
pandamicro 70dd2af5d5 Merge pull request #14518 from mogemimi/fix-memory-leak-texture-cache 
Fix memory leak when initWithImage() failed
 2015-12-02 10:20:04 +08:00
CocosRobot 0c67171b9d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-02 02:05:32 +00:00
xiaofeng11 18666a9b41 Merge pull request #14393 from xiaofeng11/v3_combine_3d 
Combine Studio change for 3d components
 2015-12-02 09:47:12 +08:00
XiaoFeng e5d57b4fa2 update binding-generator sub module & code 2015-12-01 22:30:36 +08:00
yangxiao 54e13c3acd update comment 2015-12-01 17:47:34 +08:00
Ce Zheng ecf94a3dc4 Add a buffer queue to iOS Downloader 
Upon calling NSURLSessionDownloadTask's resume, the task's timeout
countdown starts. When the AssetManagerEx starts downloading, it creates
all the tasks all at once and just `resume` upon creation. When the
number of asset files is very large, later tasks tend to end up in
'request timed out -1001' error before they can even start downloading.
This commit adds a buffer queue to prevent all the NSURLSessionTasks to
start all at once.
 2015-12-01 17:24:26 +09:00
Ce Zheng 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
XiaoFeng ea077c5141 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim 
Conflicts:
	cocos/scripting/js-bindings/manual/js_manual_conversions.h
 2015-12-01 15:12:32 +08: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
CocosRobot e891b03eee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-01 04:32:19 +00:00
pandamicro 81f590e52a Merge pull request #14478 from pandamicro/v3 
Improved JS bindings with more secured memory management
 2015-12-01 12:24:21 +08:00
mogemimi d539e6c797 Fix memory leak when initWithImage() failed 2015-12-01 12:48:54 +09:00
yangxiao 23f03bc65f update comment 2015-12-01 10:47:25 +08:00
yangxiao 11f1bd6e28 builtin material normal map support 2015-12-01 10:37:53 +08:00
Elviss Strazdins a89976dead Add enum value for no key 2015-12-01 03:01:42 +02:00
xiaofeng11 423726995c Merge pull request #23 from liamcindy/pull_14393 
update sprite 3d test
 2015-11-30 16:56:33 +08:00
pandamicro 17bdfb4050 Fix android compilation issue 2015-11-30 15:20:57 +08:00
Liam 4d379ed9bd revert ccplane 2015-11-30 14:53:37 +08:00
Liam e0349ae975 update sprite 3d test 2015-11-30 14:48:19 +08:00
XiaoFeng cbbfc69ad4 Add missing studio change for Director::drawScene 2015-11-30 11:19:02 +08:00
zilongshanren 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
zilongshanren 01e619f686 Merge pull request #14476 from cesarpachon/linuxAudioEngine 
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudio…
 2015-11-28 14:27:15 +08:00
xiaofeng11 fdd3bacde1 Merge pull request #14509 from pmaloman/v3_Wrong_assert_in_ComponentContainer 
Fixed assert statement. Added name to physic component.
 2015-11-28 13:33:38 +08:00
XiaoFeng 89ef6da5b5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 
Conflicts:
	cocos/2d/CCFontFNT.h
 2015-11-28 12:48:55 +08:00
zilongshanren 2571b87bda Merge pull request #14505 from xiaofeng11/v3_iOSFix 
Fix keyboard won't dismiss on iOS issue
 2015-11-28 11:41:41 +08:00
pandamicro 43c68aa16b Fix Chipmunk bindings issue 2015-11-27 22:38:16 +08:00
PavlOm 6e0525156b no message 2015-11-27 23:33:20 +10:00
fnz ca5ef5795e fixes to local storage 2015-11-27 14:28:26 +03:00
XiaoFeng 150d907636 Add missing changes to Particle 3d 2015-11-27 19:01:30 +08:00
fnz 8c691430c1 conflicts resolved 2015-11-27 13:19:10 +03:00
CocosRobot 5c9084fd7d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-27 09:41:59 +00:00
zilongshanren 0f8c3e0c1c Merge pull request #14435 from zilongshanren/improve-label-layout-v2 
Add Overflow to Label
 2015-11-27 17:31:40 +08:00
fnz c4b995fe59 updates to JniHelper, refactoring of existing JNI calls 2015-11-27 12:00:33 +03:00
XiaoFeng 71871bacf9 Add aabb dirty mark when load from file 2015-11-27 15:53:26 +08:00
肖峰 f0cc8e7f25 Fix keyboard won't dismiss on iOS issue 2015-11-27 15:44:35 +08:00
肖峰 8b631f5c9f Fix compile failed on mobile platform 2015-11-27 15:19:50 +08:00
XiaoFeng 2d28b78e41 Add 3 missing class export 
Change clearShader logic.
 2015-11-27 14:58:18 +08:00
pandamicro e13e0cb886 Fix getJSObject issues 2015-11-27 14:54:25 +08:00
Xpol Wan d6ddb365b6 Remove boring logs in cocos studio supporting module. 
They are helpless for debugging, we should use break points for debugging.
 2015-11-27 14:43:25 +08:00
songchengjiang b55f040ec6 fix macro definition error 2015-11-27 14:23:17 +08:00
minggo 2a877ff234 Merge pull request #14429 from xiaofeng11/v3_combine_misc 
Combine Studio change for get program file full path.
 2015-11-27 14:15:37 +08:00
XiaoFeng 8e4276469c Add comment to new function 2015-11-27 14:08:27 +08:00
XiaoFeng a61fe711e2 Update 2015-11-27 14:01:43 +08:00
songchengjiang 642e19baef unify (No)Normal Mapping shaders 2015-11-27 13:15:33 +08:00
XiaoFeng ec1d76b15e Fix compile error 2015-11-27 13:08:22 +08:00
XiaoFeng 9e50c010e9 Fix win8.1 project compile error 2015-11-27 11:49:35 +08:00
XiaoYang 92d7ccfbca Merge pull request #14471 from super626/v3 
release default fbo
 2015-11-27 11:33:07 +08:00
cesarpachon 40f6f76030 AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries 2015-11-26 22:22:05 -05:00
Neo Kim 3f9b40c093 Fix #14440 2015-11-26 22:22:04 -05:00
Xpol Wan 520aa9d351 Remove duplicated code by introduce a private doSetResponseCallback. 2015-11-26 22:22:04 -05:00
Xpol Wan 4bedfa4f14 Fixes boring deprecated warning. 
I know I duplicated the code but there is no cpp for me to move body into.
 2015-11-26 22:22:04 -05:00
pandamicro 1ee7b11e31 Refactor jsb_new_proxy and jsb_get_js_proxy with RootedObject 2015-11-27 10:20:51 +08:00
pandamicro 8320c2f702 Use rooted object for js_proxy new and get 2015-11-27 10:19:13 +08:00
pandamicro d23ffe4fc7 Fix some issue of js_type_class usage 2015-11-27 10:16:11 +08:00
songchengjiang fc4c3ec650 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-11-27 09:34:31 +08:00
pandamicro 73c3a5dcf5 Activate DEBUG to test 2015-11-27 01:35:07 +08:00
pandamicro ae2b75c8be Fix issues causing by temporary RootedObject passed as function parameters 2015-11-27 01:35:06 +08:00
zilongshanren c50d686319 Merge pull request #14493 from xiaofeng11/v3_button 
Fix button texture loaded mark has set to wrong value bug
 2015-11-26 21:45:47 +08:00
XiaoFeng d69453fa54 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine 2015-11-26 19:04:13 +08:00
XiaoFeng 24dc9f3392 update code as comment 2015-11-26 17:39:57 +08:00
XiaoFeng 58dd27efd3 add missing return type 2015-11-26 17:33:45 +08:00
XiaoFeng f5f09133e6 Change ASSERT to safety mode 2015-11-26 16:49:01 +08:00
XiaoFeng 108d145bf0 Add missing luaval and color3b conversion function export 2015-11-26 15:08:49 +08:00
XiaoFeng 52f696945d Remove condition MACRO and remove ASSERT in Sprite::initWithFile function 
Remove CameraFlag define for Cocos Studio only
 2015-11-26 14:47:37 +08:00
CocosRobot 51cfbca523 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-26 06:02:24 +00:00
zilongshanren c3604aa865 Merge pull request #14470 from zilongshanren/fixListViewClippingIssue 
Fix list view clipping issue
 2015-11-26 13:51:51 +08:00
XiaoFeng d744c167b7 Fix button texture loaded mark has set to wrong value bug 2015-11-26 13:49:32 +08:00
zilongshanren 5221f8a6fc improve the code by code review suggestions. 2015-11-26 12:03:18 +08:00
zilongshanren 44d8aec4c9 Merge pull request #14484 from xiaofeng11/v3_fix 
Change component resource load logic
 2015-11-26 09:49:40 +08:00
XiaoFeng 397fa809da Add default line width to create function 2015-11-26 09:32:57 +08:00
CocosRobot da9e8548a0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 17:29:11 +00:00
XiaoFeng 9ec451ca31 Update CCDrawNode, remove condition MACRO 2015-11-25 23:26:57 +08:00
XiaoFeng 928dc3ab1f Add lua value conversion function for cocos studio 2015-11-25 23:03:25 +08:00
Standil 30a8873429 Fix app-project generates .lib file 2015-11-25 23:59:49 +09:00
XiaoFeng 145943068f Add missing function export 2015-11-25 22:35:02 +08:00
XiaoFeng 9811d6efcf Combine studio change for LuaBinding, jsb and simulator 2015-11-25 21:52:44 +08:00
XiaoFeng eb47d28266 Change component resource load logic, won't dependent on sprite edit in other studio combine PR 2015-11-25 20:07:50 +08:00
zilongshanren 584a5d7407 fix alphaThreshold undefined issue 2015-11-25 18:27:38 +08:00
zilongshanren b1490c96b6 Merge branch 'v3' into fixListViewClippingIssue 2015-11-25 18:25:40 +08:00
CocosRobot 06c7b94440 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 09:28:43 +00:00
zilongshanren b0d88a552a Merge pull request #14419 from xiaofeng11/v3_combine_ui 
Combine Studio change for UI components
 2015-11-25 17:19:54 +08:00
pandamicro c202834312 Clean up manual bindings code, remove JS_THIS_OBJECT and JS_SET_RVAL 2015-11-25 14:33:43 +08:00
pandamicro 69b2b5720b Use JS::PersistentRooted instead of JS::Heap to prevent delegates and wrappers internal js object from GC 
More elegant and secured way, potential crashes exists in previous implementation
 2015-11-25 14:32:19 +08:00
zilongshanren 03046d6fbd change the default alphaThreshold 2015-11-25 14:31:32 +08:00
zilongshanren 759c0bbf31 rename CCStencilBitsManager to StencilStateManager 2015-11-25 14:24:27 +08:00
pandamicro be2a3077c2 Remove useless manual bindings for addEventListener functions in UI 2015-11-25 14:15:45 +08:00
zilongshanren 5fef088695 refactor stencil state management code 2015-11-25 14:14:17 +08:00
pandamicro 23f27534f6 Solve a possible memory leak in HttpRequest 2015-11-25 14:03:56 +08:00
XiaoFeng 09606e96cd Add comment for new function 2015-11-25 11:33:24 +08:00
XiaoFeng d0cd640ac8 Update 2015-11-25 11:15:17 +08:00
songchengjiang 9241797acb support normal mapping material 2015-11-25 10:45:03 +08:00
XiaoYang 4ba6279a98 Merge pull request #14469 from super626/terrain 
fix bug: Terrain::getIntersectionPoint when there is offset
 2015-11-25 09:53:47 +08:00
XiaoFeng c0f7ecfcde User GetModuleFileNameW in all condition, it is more safe than _get_wpgmptr 2015-11-25 09:49:19 +08:00
zilongshanren 866c992f41 add cocos2d namespace 2015-11-24 21:41:45 +08:00
zilongshanren 3cc3325df8 Merge pull request #14414 from WenhaiLin/v3-win32-audiofix 
AudioEngine[WIN32]:Fixed `FinishCallback` may not been invoked when the sound play completes.
 2015-11-24 21:08:46 +08:00
XiaoFeng 27f6d6a6ba Remove condition macro check. 2015-11-24 19:17:38 +08:00
XiaoFeng 722f20c4b6 Update implement remove condition macro check. 2015-11-24 18:29:58 +08:00
yangxiao aa38dfba89 release default fbo 2015-11-24 18:11:16 +08:00
zilongshanren 9c2130e88a fix Layout and ClippingNode nested rendering issue 2015-11-24 18:01:50 +08:00
pandamicro 930405d52c Remove useless manual bindings for MenuItems 2015-11-24 16:32:02 +08:00
yangxiao 1ac82fa273 fix terrain ray trace bug when there is offset 2015-11-24 15:13:52 +08:00
CocosRobot ded045ae26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-24 07:01:07 +00:00
pandamicro 378cfa35b6 Merge pull request #14394 from super626/v3 
Terrain: char* to string
 2015-11-24 14:53:00 +08:00
zilongshanren 8d1f1a9933 Merge pull request #14457 from zilongshanren/testEditBoxScaleSize 
Fix edit box setPlaceholderFontName and scale font size issue
 2015-11-24 11:33:52 +08:00
zilongshanren 7676b1cb73 improve label layout logic 2015-11-23 17:47:30 +08:00
yangxiao e8d853934b terrain lua bindings 2015-11-23 14:33:39 +08:00
François Dupayrat 12df5ae1cc Fix wrong variable use for setPlaceholderFontName 
1. fix editbox scale not affect native font size
 2015-11-23 11:49:22 +08:00
XiaoFeng 23d8b63fca update header file to fix studio UI js binding compile error 2015-11-23 11:41:42 +08:00
zilongshanren 689c0f4af3 Merge pull request #14327 from wohaaitinciu/editbox-win32 
Fix a fatal bug in EditBox implement for platform win32
 2015-11-23 11:35:40 +08:00
Xpol Wan e145255479 Overhaul UTF modules and add full set of UTFs conversion functions. 2015-11-21 11:26:24 +08:00
zilongshanren 9328a7c1d0 fix scalesprite opacity issue. 
Ref: https://github.com/cocos2d/cocos2d-x/issues/14436
 2015-11-20 17:35:29 +08:00
zilongshanren 7ee82f20fc fix getLetter crash issue. 
1. make vertical clamp works in non-wrap mode.

2. make the lineHeight and letterSprite scale work correct.
 2015-11-20 16:39:48 +08:00
Neo Kim 4829a037f7 Fix #14440 2015-11-20 15:57:26 +09:00
zilongshanren 8c25749366 minor improvement 2015-11-20 10:54:05 +08:00
Filipe Lemos 7803669e7a Reverted curly braces change for consistency. 2015-11-19 16:17:54 +00:00
zilongshanren 386c734b25 Merge pull request #14423 from xpol/fixes-boring-warnings 
Fixes boring deprecated warning.
 2015-11-19 18:29:12 +08:00
zilongshanren 19257d6120 Add Overflow feature char map font. 
1. fix single line clamp.
 2015-11-19 18:14:46 +08:00
pandamicro 21d0ff846c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-11-19 17:20:42 +08:00
pandamicro 0893d7d4ff Fix text color parser for TextField widget 2015-11-19 17:17:17 +08:00
pandamicro fbcf0680ae Merge pull request #14430 from cocos2d/V3.9 
V3.9
 2015-11-19 17:06:07 +08:00
zilongshanren ccdb2a75f9 Add Label Overflow and wrap option. 
Squashed commit of the following:

commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 19 10:30:54 2015 +0800

    add char map font test

commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 18 15:00:17 2015 +0800

    system font overflow is not supported

commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 18 11:04:15 2015 +0800

    add system font test

commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Nov 17 10:29:35 2015 +0800

    Finish resize height mode

commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 16 11:01:27 2015 +0800

    fix wrap issue

commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date:   Sat Nov 14 08:28:57 2015 +0800

    horizontal shrink still has a issue

commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 13 11:42:34 2015 +0800

    finish shrink without wrap

commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 13 10:09:46 2015 +0800

    update shrink

commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 12 17:55:15 2015 +0800

    refactor shrink logic

commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 11 18:25:34 2015 +0800

    add resize overflow type

commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 11 11:49:51 2015 +0800

    no wrap, shrink is working.

commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Nov 10 16:16:27 2015 +0800

    add overflow type to label.

    1. optimize the testcase

commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 17:22:34 2015 +0800

    finish bmfont wrap by char

commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 17:04:51 2015 +0800

    finish bmfont wrap by word

commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 11:29:21 2015 +0800

    add BMFont size support

commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 09:58:01 2015 +0800

    add font size support for BMFONT

commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 6 16:36:27 2015 +0800

    add toggle wrap option.

    1. make hirozontal clamp working

commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 6 15:12:59 2015 +0800

    tweak label layout

commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 5 11:11:02 2015 +0800

    finish the test skeleton

commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 4 16:38:54 2015 +0800

    add setFontSize api to label.

    1. add new chinese-english bmfont
    2. beautify base test

commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 4 11:27:18 2015 +0800

    add label layout test skeleton
 2015-11-19 16:06:13 +08:00
XiaoFeng b6b35e0c74 Fix name space. 2015-11-19 15:47:36 +08:00
XiaoFeng f4d317f1fd Combine Studio change for get program file full path. 2015-11-19 15:21:14 +08:00
XiaoFeng 32f21ca5be Binding ResouceData structure to js to fix auto compile error 2015-11-19 14:31:39 +08:00
CocosRobot d5b07e5b60 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-19 03:14:03 +00:00
zilongshanren 7ea90c2d41 Merge pull request #14033 from m-yukio/feature/fixed-richtext 
Support the new line element. Fixed a problem of UIRichText.
 2015-11-19 11:05:08 +08:00
XiaoFeng 5369f9a84d Add header file to make this pr can pass jenkins auto build 2015-11-19 10:14:27 +08:00
Filipe Lemos aa4c4a9e6c Fix crash when using cocos2d::Controller on iOS6 2015-11-18 20:48:51 +00:00
Jeff Wang 9cbcd00798 some properties should be set 2015-11-18 22:47:26 +08:00
Xpol Wan 0b5a3465bc Remove duplicated code by introduce a private doSetResponseCallback. 2015-11-18 17:52:24 +08:00
Xpol Wan b33aa00109 Fixes boring deprecated warning. 
I know I duplicated the code but there is no cpp for me to move body into.
 2015-11-18 17:47:07 +08:00
zilongshanren 02b59f020e Fix onEndEditing issue in script. 
Issue: https://github.com/cocos2d/cocos2d-x/issues/14332
 2015-11-18 15:05:13 +08:00
XiaoFeng bb83fe4596 Combine Studio change for UI components 2015-11-18 13:38:29 +08:00
肖峰 2d97647177 update framework number 2015-11-18 10:55:10 +08:00
WenhaiLin 42fa33dc6e AudioEngine[WIN32]:Fixed `FinishCallback` may not been invoked when the sound play completes. 2015-11-17 23:44:52 +08:00
XiaoFeng 50889c1c6c Save _vertShader & _fragShader for PC platform only to decrease memory usage for mobile platform. 2015-11-17 14:29:56 +08:00
XiaoFeng acd3b5cbc4 Combine Studio change for openGL related operation 2015-11-17 13:38:42 +08:00
CocosRobot 0794c7a43c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 04:09:43 +00:00
zilongshanren 5d8cfa889c Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview 
Change PageView to derive from ListView
 2015-11-17 12:02:10 +08:00
zilongshanren 0b3a342222 Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets 
Set focus for widgets
 2015-11-17 11:24:27 +08:00
zilongshanren 097f7a34e0 Merge pull request #14379 from mogemimi/fix-deprecated-warnings 
Fix deprecated warnings
 2015-11-17 11:19:07 +08:00
pandamicro c4f9804f5b Merge pull request #14404 from CocosRobot/update_lua_bindings_1447728669 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-17 10:56:58 +08:00
pandamicro efde3c3a0e Merge pull request #14403 from pandamicro/v3 
Fix issue in ComponentJS::~ComponentJS
 2015-11-17 10:56:37 +08:00
CocosRobot 3ee2e7a490 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 02:56:26 +00:00
zilongshanren a5b7674b4d Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4 
improve scale9sprite
 2015-11-17 10:48:09 +08:00
pandamicro c77ea57fb1 Merge pull request #14399 from xiaofeng11/v3_combine_mac32compatible 
Combine Studio change for compatible with 32 bit Mac System
 2015-11-17 10:44:40 +08:00
pandamicro 5bc73c6ede Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-11-17 10:42:05 +08:00
XiaoFeng e3c120eef4 Combine Studio change for compatible with 32 bit Mac System 2015-11-16 18:25:26 +08:00
XiaoFeng e313f7be8b Combine Studio change for ActionTimeline 2015-11-16 15:56:23 +08:00
XiaoFeng eb644ee79f Combine Studio change for 3d components 2015-11-16 15:05:43 +08:00
pandamicro 974bdba154 Fix issue in ComponentJS::~ComponentJS 2015-11-16 11:50:48 +08:00
XiaoFeng d47a79c0e4 Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
Neo Kim b99b3d1112 Remove `CC_DLL` in front of `createSpriteFromBase64()` in ccUtils.h to avoid compilation error on windows platform 2015-11-15 23:02:43 +09:00
Neo Kim 603d788fbf PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
Neo Kim b0ae23d567 PageView - Add more comments 2015-11-15 22:49:42 +09:00
Neo Kim ad134a6363 PageView - Fix that the indicator's direction is not appropriate when `PageView::setDirection()` is called before `PageView::setIndicatorEnabled(true)`. 2015-11-15 22:49:42 +09:00
mogemimi 9ec1e2069a Fix deprecated warnings 2015-11-13 14:38:48 +09:00
XiaoFeng 140eaf7b6c Fix function name in cpp file 2015-11-13 09:09:02 +08:00
XiaoFeng 4c8066e39f Normalize function names. 2015-11-12 18:23:56 +08:00
yangxiao 39a6f1e8f1 char* to string 2015-11-12 18:08:29 +08:00
XiaoFeng 1546a062a1 Update 2015-11-12 10:57:22 +08:00
XiaoFeng c40a2a3301 Combine Studio change for 2d components 2015-11-12 09:49:49 +08:00
CocosRobot 4ccc6ce5de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-11 06:53:45 +00:00
pandamicro 8695fbe711 Merge pull request #14172 from njh0602/somefix2 
Add virtual keyword.
 2015-11-11 14:17:27 +08:00
pandamicro 6fc7aca423 Merge pull request #14153 from Fraggle/patch-1 
PMA Handling issue
 2015-11-11 14:14:22 +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
pandamicro 3963e8a774 Merge pull request #14333 from nhuanvd/cocos2dxactivity_bugfix 
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
 2015-11-11 14:10:24 +08:00
pandamicro 5ff7cac4ae Merge pull request #14298 from TheCodez/patch-1 
Fix #14298
 2015-11-11 14:04:40 +08:00
Elviss Strazdins f604f66539 Update only frame size on window resize 2015-11-11 04:42:58 +02:00
Elviss Strazdins eb8b761381 Add option to create resizable window 2015-11-11 01:17:48 +02:00
fnz d86d32fb09 constexpr for signature, garbage collection and compile-time error for unsupported argument types 2015-11-10 23:39:16 +03:00
Neo Kim 94637bef2f PageView - Change to keep some of the original API names because it makes more sense. 2015-11-10 21:35:01 +09:00
Neo Kim 9cbbd283c7 PageView - Deprecate the APIs related to custom scroll threshold. 2015-11-10 21:35:01 +09:00
Neo Kim 049607b5d8 Replace tab indents to 4 spaces. 2015-11-10 21:03:51 +09:00
XiaoFeng 1f0c498bcb Fixed actionNode position error bug 2015-11-09 19:45:17 +08:00
pandamicro c08b4a0f9d Merge pull request #14343 from super626/v3 
fix cull face for render queue
 2015-11-09 12:51:39 +08:00
yangxiao 9d2fca6d34 fix cull face for render queue 2015-11-09 10:42:12 +08:00
fnz 80e8b58b53 easy jni 2015-11-07 23:57:05 +03:00
XiaoFeng c0c35c603e Update version number & RELEASE_NOTES.md, prepare 3.9 release 2015-11-06 18:38:09 +08:00
Nhuan Vu Duc fec8a5db02 Fix cannot add view to mFrameLayout when extends Cocos2dxActivity 2015-11-06 13:05:40 +07:00
zhangcheng 8183d34b68 revert old timelineParser-2.x.js and add "||false" to it. 2015-11-06 12:50:36 +08:00
zhangcheng 76ed15591f Update web submodule to latest. 2015-11-06 11:56:45 +08:00
pandamicro 81cb13a159 Merge pull request #14328 from xiaofeng11/v3 
Fix "TextureCache Test" in js-test crash under Android
 2015-11-06 10:56:31 +08:00
XiaoFeng 139d8b5310 Remove unused code 2015-11-06 10:10:09 +08:00
XiaoFeng 1a56668cd3 Fix "TextureCache Test" in js-test crash under Android 2015-11-06 09:49:19 +08:00
Jeff Wang c1a64e9243 new implementation of EditBoxImpl-win32 2015-11-06 02:14:34 +08:00
yangxiao 3016bf696a fix updateVerticesForLOD 2015-11-05 15:18:46 +08:00
Pan Demosthenous a4c4c64069 cleanup SIOClientImpl when an unexpected close happens 2015-11-05 13:08:33 +11:00
CocosRobot f7803cba19 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-04 11:09:49 +00:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
pandamicro 7d93b419fd Merge pull request #14303 from xiaofeng11/v3_fix 
Fix ComponentTest in la-test can not load lua file under iOS & Android
 2015-11-04 13:52:14 +08:00
pandamicro e13c9a8d8d Merge pull request #14313 from super626/v3 
Function genMaterial keeps old state block
 2015-11-04 13:45:36 +08:00
yangxiao 16a79ed9df function genMaterial keeps old state block 2015-11-04 11:10:28 +08:00
Dale Stammen dfe56769a1 added missing Light3DReader files 2015-11-03 08:04:55 -08:00
pandamicro 4d0098c6be Merge pull request #14299 from mogemimi/fix-docs-typo 
Fix typos in documentation
 2015-11-03 18:12:21 +08:00
XiaoFeng 3223a97b26 Fix ComponentTest in la-test can not load lua file under iOS & Android 2015-11-03 15:49:46 +08:00
liamcindy 872141d547 update for light3d reader 2015-11-03 13:34:21 +08:00
mogemimi 8f632365c3 Fix typos in documentation 2015-11-03 04:43:44 +09:00
Michael Kösel 4f89828625 Removed PhysicsBody::update from PhysicsWorld 2015-11-02 14:18:21 +01: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
pandamicro c80f523637 Merge pull request #14269 from pandamicro/v3 
[ci skip]Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
 2015-10-30 17:20:58 +08:00
pandamicro 246eab11a1 Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser 2015-10-30 17:19:21 +08:00
zilongshanren 3e2094981f add scale9sprite rendering type test 2015-10-30 14:01:01 +08:00
pandamicro b58e656620 Merge pull request #14264 from super626/v3 
Fix: Mesh::setGLProgramState may modify state block
 2015-10-30 10:11:23 +08:00
zilongshanren f84c2de1e2 add sprite and scale9sprite batch test 2015-10-30 09:58:02 +08:00
Filipe Lemos 11fc969ecb Fixed inconsistency in getVersion() when no version is available on Android 2015-10-29 17:14:32 +00:00
zilongshanren 1417534194 add rendering type to scale9sprite 2015-10-29 23:13:36 +08:00
zilongshanren 7c82f9fe88 cache slice sprite calculation 2015-10-29 21:53:58 +08:00
Filipe Lemos 9aa1f7138d Added override keyword to getVersion 2015-10-29 08:36:03 +00:00
zilongshanren 9a14ad5b14 fix a small bug related to non slice anchorPoint 2015-10-29 14:27:27 +08:00
yangxiao 11f5e6cf96 setGLProgramState should not modify state block 2015-10-29 14:22:13 +08:00
yangxiao 16d9cf1af9 setStateBlock implement 2015-10-29 14:21:25 +08:00
pandamicro c0ecf7f7aa Merge pull request #14262 from liamcindy/3.9_light_js 
update for light3d js reader
 2015-10-29 13:52:33 +08:00
pandamicro 617f5265f1 Merge pull request #14256 from pandamicro/v3 
Use generational gc friendly API in JSTouchDelegate
 2015-10-29 12:34:42 +08:00
zilongshanren ccf4cb5a74 improve scale9sprite 2015-10-29 10:41:58 +08:00
pandamicro ac54c9b7de Merge pull request #14261 from liamcindy/3.9_light 
update for light3d reader
 2015-10-29 10:08:32 +08:00
unknown f2f6d25408 update for light3d js reader 2015-10-29 10:04:56 +08:00
unknown 917edbcf62 update for light3d reader 2015-10-29 09:53:54 +08:00
Filipe Lemos 04fa7a8902 Added Application::getVersion() to get the app version. 2015-10-28 17:57:57 +00:00
Neo Kim e59b7b74be PageView - Add `scrollToItem()` having only one parameter. 2015-10-28 16:57:54 +09:00
Neo Kim 69b794d284 PageView - Remove `_indicatorEnabled` flag. Null `_indicator` means that it is disabled. 2015-10-28 16:57:53 +09:00
Neo Kim 9ed617c978 PageView - Add API descriptions 2015-10-28 16:56:36 +09:00
Neo Kim b72e4118f0 PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files. 2015-10-28 16:56:36 +09:00
Neo Kim e3fcd6722a PageViewIndicator - Add some getter and setters. 2015-10-28 16:56:36 +09:00
Neo Kim 8abd1ab600 PageView - The indicator should be created before `ListView::init()` 2015-10-28 16:56:36 +09:00
Neo Kim 2d2d17172c PageViewIndicator - Fix that indexes were upside down in vertical view. 2015-10-28 16:56:36 +09:00
Neo Kim 1897051664 PageView - Add `setDirection()` and `setIndicatorEnabled()` methods. 2015-10-28 16:56:36 +09:00
Neo Kim eefdffc032 PageViewIndicator - Add `setDirection()` method. 2015-10-28 16:56:36 +09:00
Neo Kim 368a3048c4 PageView - Add `setIndicatorPosition()`. 2015-10-28 16:56:36 +09:00
Neo Kim fc0fe976f7 PageView - Complete `handleReleaseLogic()` method. 2015-10-28 16:56:36 +09:00
Neo Kim b19ed5a3b5 ScrollView - Change `moveInnerContainer()` to virtual method. 2015-10-28 16:56:36 +09:00
Neo Kim b3f33de071 ListView - Change `calculateItemDestination()` to a class method. 2015-10-28 16:56:35 +09:00
Neo Kim c684016ee6 PageView - Implementing page view indicator 2015-10-28 16:56:35 +09:00
Neo Kim 4dbfb79110 Add `onItemListChanged()`method. 2015-10-28 16:56:35 +09:00
Neo Kim 0ee09fcfce PageView - Implement the page indicator 2015-10-28 16:56:35 +09:00
Neo Kim 30e2e46f20 PageView - Add `PageViewIndicator` which indicates current page among total pages. 2015-10-28 16:56:35 +09:00
Neo Kim 76acb91861 Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places. 2015-10-28 16:56:35 +09:00
Neo Kim a2bc0d4859 ScrollViewBar - Change wording in comment. 2015-10-28 16:56:35 +09:00
Neo Kim b9a4449494 PageView - Add `handleReleaseLogic()` for page view. 2015-10-28 16:56:35 +09:00
Neo Kim 46c0a43105 ScrollView - Use a vector in `scrollChildren()` instead of two floats. 2015-10-28 16:56:35 +09:00
Neo Kim 84d0625b93 ScrollView - Remove redundant codes. 2015-10-28 16:56:34 +09:00
Neo Kim 5de6aa78ec ScrollView - Remove the return value of `scrollChildren()`. 2015-10-28 16:56:34 +09:00
Neo Kim 30d39af5fa Refactor `jumpTo` methods to use `moveInnerContainer()`. 2015-10-28 16:56:34 +09:00
Neo Kim e67250e162 ScrollView - Create `moveInnerContainer()` to replace `moveChildren()` and `moveChildrenToPosition()`. All move related logic will be integrated into one. 2015-10-28 16:56:34 +09:00
Neo Kim 97acf52cc8 PageView - Replace the legacy methods of `PageView` with the ones of `ListView`. 2015-10-28 16:56:34 +09:00
Neo Kim e567259826 PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`. 2015-10-28 16:56:34 +09:00
pandamicro 7d832b0753 Merge pull request #14238 from pandamicro/v3 
Add cc.Director.EVENT_BEFORE_UPDATE
 2015-10-28 15:50:37 +08:00
pandamicro 06b828250a Merge pull request #14241 from yuyangame/patch-1 
fix cc.game.config['showFPS'] bug
 2015-10-28 15:48:21 +08:00
pandamicro 893edbaf24 Merge pull request #14246 from WenhaiLin/v3.9 
Fixed text may display of incomplete when Label create with system font on Mac.
 2015-10-28 15:47:45 +08:00
pandamicro b6b9364a84 Merge pull request #14232 from xiaofeng11/v3 
Fix FadeOutDownTilesTest won't show last tile
 2015-10-28 15:44:28 +08: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 68d75a519a Use generational gc friendly API in JSTouchDelegate 2015-10-28 11:55:28 +08:00
CocosRobot 09cbc2145d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-28 03:29:16 +00:00
Kvial 27773b6f1a fix cc.game.config['showFPS'] bug 
```javascript
//project.json
{
...
'showFPS' : false,
...
}
```

```javascript
//CCBoot.js
...
config[CONFIG_KEY.showFPS] = config[CONFIG_KEY.showFPS] || true;// this property will be set to true
...
```
 2015-10-27 20:36:05 +08:00
XiaoFeng 6029635493 Remove comment out codes 2015-10-27 18:43:51 +08:00
pandamicro 616eae2b6d Add cc.Director.EVENT_BEFORE_UPDATE 2015-10-27 17:32:57 +08:00
pandamicro 535c4bcd1d Merge pull request #14236 from CocosRobot/update_lua_bindings_1445937846 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-10-27 17:31:43 +08:00
CocosRobot 35f7f3cb2f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-27 09:29:42 +00:00
pandamicro aa9f0d5bd5 Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist 
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
 2015-10-27 17:28:22 +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
pandamicro c491ddf1e8 Merge pull request #14235 from pandamicro/v3 
Fix cc.DrawNode.drawPoly
 2015-10-27 17:19:50 +08:00
pandamicro a3c2904e7f Fix cc.DrawNode.drawPoly 2015-10-27 16:46:25 +08:00
XiaoFeng f374df408e Fix FadeOutDownTilesTest won't show last tile 2015-10-27 14:41:31 +08:00
Joachim Grill 94ab41ceb3 use "const string &" in SpriteFrameCache 2015-10-26 09:36:01 +01:00
XiaoFeng 036585ef95 Fix ActionManagerEx some times crash when reload action frames. 2015-10-26 10:38:17 +08:00
CocosRobot 5760e43387 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-26 01:45:38 +00: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 ade1d0ef8d Merge pull request #14214 from pandamicro/spriteframecache 
Fixed memory leak in CCSpriteFrameCacheHelper
 2015-10-23 09:29:37 +08:00
fuyifan 5065a542f7 fix the issue #14113 2015-10-23 00:00:18 +08:00
pandamicro 530321fe70 #14124 Improved JSCallbackWrapper with generational GC and fix the issue 2015-10-22 17:00:57 +08:00
pandamicro 175f4c02ad Merge pull request #14197 from xiaofeng11/v3_xf 
Fix CCDownloader-curl will crash in js-test & Fix broken image link in TextureCacheTest.js
 2015-10-22 14:45:20 +08:00
pandamicro 0a6360eee0 Merge pull request #14196 from geron-cn/v3 
AnchorPointFrame animation performance diffrent
 2015-10-22 14:37:26 +08:00
XiaoFeng 6beb982665 Adjust code execute order, used a simple and safe way to avoid access fail bug. 2015-10-22 14:36:26 +08:00
pandamicro 65fafef044 Merge pull request #14209 from pandamicro/v3 
Disable bitcode for all targets
 2015-10-22 12:55:25 +08:00
pandamicro 4633a93631 Disable bitcode for all targets 2015-10-22 12:18:51 +08:00
pandamicro 05b277752c Merge pull request #14105 from WenhaiLin/v3.9-rc 
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system not enough memory"
 2015-10-22 10:36:02 +08: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
pandamicro f98d0cc115 Merge pull request #14166 from webcrawler/my_fix_branch 
remove duplicate include
 2015-10-22 10:33:05 +08:00
pandamicro 6925e423e3 Merge pull request #14204 from mogemimi/fix-naming-typos 
Fix naming typos
 2015-10-22 10:25:07 +08:00
pandamicro f2898ecf30 Merge pull request #14207 from super626/terrain 
fix shader on pc
 2015-10-22 10:10:10 +08:00
yangxiao cca25f5b5c fix shader on pc 2015-10-22 09:29:12 +08:00
pandamicro d3664b9616 #14128 Fix cc.loader.getRes crash caused by null type 2015-10-22 01:16:56 +08:00
pandamicro 43c19fd1e7 Merge pull request #14205 from pandamicro/v3 
Fix Scheduler API inconsistency
 2015-10-21 22:11:16 +08:00
pandamicro 9eeda122e9 Fix Scheduler API inconsistency 2015-10-21 22:10:48 +08:00
dimon4eg 27d5ad920e Update comment 2015-10-21 16:55:45 +03:00
dimon4eg 7e43e28ca2 Fix crash in java code only 2015-10-21 16:55:25 +03:00
dimon4eg 82bcbb0325 Revert: Fix crash in web view on android 2015-10-21 16:54:41 +03:00
pandamicro 558ac3cfa0 Made CC_CONSTRUCTOR_ACCESS public only when script binding is enabled 2015-10-21 16:05:31 +08:00
mogemimi 4012dd8455 Fix naming typos 2015-10-21 15:56:47 +09:00
pandamicro d8baf75748 Merge pull request #14195 from liamcindy/v3.9_light 
fix light3D reader error
 2015-10-21 13:45:37 +08:00
Dale Stammen d8e10981db added check to see if app is already visible 2015-10-20 10:38:42 -07:00
Dimon4eg 6581954b5b Merge pull request #1 from Dimon4eg/v3 
merge
 2015-10-20 12:48:16 +03:00
pandamicro 7466c4c71e Merge pull request #14194 from super626/v3 
check light enable or not when switching shader
 2015-10-20 17:09:37 +08:00
XiaoFeng 428db9c458 update js binding version info 2015-10-20 17:04:31 +08:00
XiaoFeng 18b7b533ce Update 3.9 beta0 change log & version info 2015-10-20 16:46:31 +08:00
XiaoFeng 7e54a91ee6 Fix CCDownloader-curl will crash in js-test 
Fix broken image link in TextureCacheTest.js
 2015-10-20 16:28:03 +08:00
pandamicro 7443cf915d Merge pull request #14185 from mogemimi/fix-memory-leak 
Fix some memory leaks
 2015-10-20 15:56:39 +08:00
geron-cn be8a158bd7 fix bug: #23532 AnchorPointFrame animation performance diffrent with cocos studio 2015-10-20 15:49:12 +08:00
Liam 7280a963b3 fix light3D reader error 2015-10-20 15:24:34 +08:00
yangxiao a4d67867d7 check light enable or not when switching shader 2015-10-20 15:11:39 +08:00
CocosRobot 6a0e1b323f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-20 02:42:17 +00:00
mogemimi c3194ac34d Fix memory leak in TMXLayer 2015-10-19 19:47:36 +09:00
mogemimi 34831d48ce Fix memory leak in GLViewImpl 2015-10-19 19:46:45 +09:00
pandamicro f4a2a53f6d Merge pull request #14184 from xiaofeng11/v3_xf 
Fix EventListenerCustom registered by UILabel never has been released bug
 2015-10-19 17:13:25 +08:00
XiaoFeng 762e25ad33 Remove unused parameter 2015-10-19 16:06:39 +08:00
XiaoFeng ffb2cfa9e0 Fix EventListenerCustom registered by UILabel never has been released bug 2015-10-19 14:07:50 +08:00
pandamicro 82881bf92f Merge pull request #14109 from loadrunner/label3 
Added line spacing/leading feature to Label
 2015-10-19 10:55:53 +08:00
pandamicro be45e0bc50 Merge pull request #14174 from noshbar/v3 
CPPCheck fixes, correct deallocation, array size.
 2015-10-19 10:05:01 +08:00
pandamicro 4395886133 Merge pull request #14175 from MSOpenTech/v3-winrt-angle 
V3 winrt angle update to fix issue #9980
 2015-10-19 01:27:03 +08:00
pandamicro e8a22237e6 Merge pull request #14173 from njh0602/somefix 
Simple merge() version
 2015-10-18 22:59:23 +08:00
pandamicro cde67d1261 Merge pull request #14162 from mogemimi/fix-warnings 
Fix warnings on Xcode 7
 2015-10-18 22:56:12 +08:00
pandamicro c365fc5883 Merge pull request #14180 from pandamicro/v3 
Fix issue for web engine upgrade
 2015-10-18 22:48:16 +08:00
pandamicro cfb1ee2b11 Improved logic of jsb_boot.js to sync with the web engine behavior 2015-10-18 22:45:53 +08:00
pandamicro 11890d6c4b Fix issue for web engine upgrade 2015-10-18 00:19:02 +08:00
Dale Stammen fdebb373b1 updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5 2015-10-16 15:36:34 -07:00
Dale Stammen ce88dbdee4 removed WP8.1 shader code 2015-10-16 14:48:03 -07:00
Dale Stammen 414a34f3f9 removed old WP8.1 shaders for gl_PointSize 2015-10-16 14:47:02 -07:00
남준현 f47f4aa00e Simple merge() version 2015-10-17 04:59:07 +09: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
fjut 4c3d0c62bb remove duplicate include 
duplicate include: #include "ui/CocosGUI.h"
 2015-10-16 21:41:40 +08:00
dimon4eg d317cd75e1 Improved code a bit 2015-10-16 11:28:34 +03:00
mogemimi 8af6531c94 Replace deprecated CCApplication with Application 2015-10-16 15:02:06 +09:00
mogemimi 4600c41f9b Add override keywords 2015-10-16 15:01:10 +09:00
pandamicro efeb6a44fb Merge pull request #14143 from MSOpenTech/v3-win10-curl 
V3 win10 curl
 2015-10-16 13:35:48 +08:00
남준현 5118a31faf // cross pro'c'uct of 2 vector. A->B X C->D 
// cross pro'd'uct of 2 vector. A->B X C->D
 2015-10-16 03:24:54 +09:00
Sebastien Flory bd83fc1474 PMA Handling issue 
Hi,

I compared to cocos2D-x v2.x and it seems that there is an issue with the _hasPremultipliedAlpha flag not beeing set correctly for mipmaps and compressed textures.
I guess it's a mistake due to the reorganization of the code between the old CCTexture2D and the new one.
In our tests, this fixes the issue.

Best,

Sebastien
 2015-10-15 15:48:21 +02:00
dimon4eg ee3c000b43 Fix crash in web view on android 2015-10-15 16:43:53 +03:00
yangxiao 907189ed14 correct wrong presion, which leads to failed on some devices 2015-10-15 11:59:38 +08:00
Dale Stammen 3e3e47de10 added Win10 UWP curl support 2015-10-14 16:47:52 -07:00
pandamicro 07c2ec49db Merge pull request #14140 from xiaofeng11/v3 
Bug fix
 2015-10-14 21:12:06 +08:00
zhangting 27837e0615 return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile 2015-10-14 16:07:42 +08:00
mogemimi 59d7868d4c Fix minor typos 2015-10-14 15:12:22 +09:00
pandamicro 40aa4187be Merge pull request #14138 from songchengjiang/cocos2d-v3-bugfix2 
fix the #23272 bug
 2015-10-14 14:05:09 +08:00
XiaoFeng a6a3e24fdd Fix when image size of variable button status texture are different, Helper::restrictCapInsetRect result may cause pressed & disabled status picture won't display. 2015-10-14 13:58:58 +08:00
songchengjiang 02f20db82a fix the #23272 bug 2015-10-14 13:24:38 +08:00
yangxiao 4c7edd457e set _hasPremultipliedAlpha to false 2015-10-13 15:45:24 +08:00
pandamicro b19bf82170 Merge pull request #14108 from loadrunner/label2 
Changed label font size type to float
 2015-10-13 11:55:14 +08:00
pandamicro 5e43cfa129 Merge pull request #14107 from loadrunner/label1 
Removed scale factor for label shadow
 2015-10-13 11:54:14 +08:00
Justin Godesky e60ac24e5d Check that textureAtlas isn't null before removing all quads in SpriteBatchNode 
See issue #14122.
 2015-10-12 20:42:08 -04: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
mogemimi daa29752db Fix typo in UIEditBox 2015-10-12 13:57:50 +09:00
pandamicro 3dde02ba93 Merge pull request #14106 from loadrunner/tilemap 
TMXLayer cast bug
 2015-10-11 18:43:24 +08:00
Danut Chereches 471c23930c added line spacing/leading 2015-10-10 19:15:45 +03:00
Danut Chereches 019b549a20 changed font size type to float 2015-10-10 19:15:22 +03:00
Danut Chereches aeb268f3cd cast tile coordinates to int before calculating index 2015-10-10 19:05:51 +03:00
WenhaiLin 05c235f9fe ParticleSystemQuad:Fixed incorrectly generate errors "Particle system: not enough memory" 2015-10-10 17:55:05 +08:00
pandamicro f64105b3dc Merge pull request #14047 from liamcindy/v3.9 
update for light3d reader
 2015-10-10 11:43:05 +08:00
pandamicro 376180c1d6 Merge pull request #14093 from cpascal/fix_audioplayer 
Fixed AudioPlayer crash in Win32
 2015-10-10 11:32:46 +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
pandamicro 8b0a6a6c29 Merge pull request #14099 from pandamicro/v3 
[ci skip]Sync with CCBoot for web
 2015-10-10 10:16:16 +08:00
pandamicro 5ae2812bf8 Sync with CCBoot for web 2015-10-10 10:15:36 +08:00
pandamicro bf35655ce3 Merge pull request #14100 from CocosRobot/update_lua_bindings_1444440864 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-10-10 09:44:51 +08:00
pandamicro ee3399a4a4 Merge pull request #14097 from TheCodez/patch-1 
Add missing getChildByTag<>() api
 2015-10-10 09:43:46 +08:00
CocosRobot 216438fb9b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-10 01:40:55 +00:00
pandamicro db0d23ede4 Merge pull request #14087 from geron-cn/v3 
fix code error, redundant interface
 2015-10-10 09:39:35 +08:00
pandamicro 27fc6b24ee Merge pull request #14080 from 1scaR1/v3 
Fixed enabling of scale9 background in ccui.Layout
 2015-10-10 09:39:09 +08:00
pandamicro 7d4988f43f Merge pull request #14095 from mogemimi/fix-typo 
Fix typos
 2015-10-10 09:29:53 +08:00
Michael Kösel 493d95c3f6 Add missing getChildByTag<>() api 2015-10-10 00:08:38 +02:00
pandamicro bc9b59b7f7 Merge pull request #14096 from pandamicro/v3 
[ci skip]Add opacity/color cascade test case for Scale9Sprite
 2015-10-09 21:07:27 +08:00
pandamicro 0ea54868e2 Add opacity/color cascade test case for Scale9Sprite 2015-10-09 21:01:49 +08:00
mogemimi 5993304e06 Fix typos 2015-10-09 17:59:11 +09:00
cpascal 13c1258f9d Fixed AudioPlayer crash in Win32 2015-10-09 15:03:05 +09:00
Vincent Yang 90ef4be103 Fix textfield input chinese error with specific IME on Android. 2015-10-09 12:06:22 +08:00
fuxiao be4724ef47 issues #14050 ActionManager memory leak 2015-10-09 10:07:26 +08:00
子龙山人 cdf6fa8a54 Merge pull request #14052 from neokim/fix_listview_center_magnetic_issue 
Fix an issue that list view's Magnetic::CENTER is not working well when non-bounceable.
 2015-10-09 08:27:18 +08:00
pandamicro 4b66caaed8 Merge pull request #14084 from super626/v3 
correct spot light init value
 2015-10-08 17:15:03 +08:00
geron-cn 6b9890472b fix code error, redundant interface 2015-10-08 14:14:49 +08:00
pandamicro f730a38db6 Merge pull request #14086 from CocosRobot/update_lua_bindings_1444275958 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-10-08 11:51:04 +08:00
pandamicro 2d73bbd9d4 Merge pull request #14056 from Dimon4eg/fix-crash-if-csb-file-is-missing 
fix crash if csb file is broken
 2015-10-08 11:50:40 +08:00
CocosRobot 1919d1a679 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-08 03:50:33 +00:00
zilongshanren 7fd2ad7548 remove unneeded final temp string 2015-10-08 11:47:11 +08:00
pandamicro a68d07b968 Merge pull request #14075 from TheCodez/getname_byref 
Node::getName() now returns string by reference
 2015-10-08 11:43:03 +08:00
yangxiao d6eb1b938f correct spot light init value 2015-10-08 11:27:02 +08:00
pandamicro 5c816b5d9b Merge pull request #14063 from kammy/improve_spriteframecache 
Inprove SpriteFrameCache::addSpriteFramesWithDictionary
 2015-10-08 11:23:21 +08:00
pandamicro e32e8b95a4 Merge pull request #14055 from Dimon4eg/fix-crash-in-LoadingBar 
fix crash in LoadingBar
 2015-10-08 11:22:43 +08:00
pandamicro 2dbe0c1a90 Merge pull request #14016 from xiaofeng11/v3 
Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash
 2015-10-08 11:12:36 +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
pandamicro 255edd5b46 Merge pull request #14079 from ZeroHackeR/v3 
Fixing SocketIO - Connect failed after Disconnected
 2015-10-08 10:46:40 +08:00
pandamicro 6bafb2f6c2 Merge pull request #14082 from pandamicro/v3 
Fix simulator android x86 release compilation issue
 2015-10-08 10:43:35 +08:00
pandamicro 57ac40b9bc Fix simulator android x86 release compilation issue 2015-10-08 09:46:50 +08:00
Nikita 0042f9f5cd Fixed background size if scale9 enabled in Layout 
Fixes for issue: cocos2d#14001
 2015-10-06 16:14:47 +03:00
ZeroHackeR 4cfe139991 Fixing SocketIO - Connect failed after Disconnected 
Fixes for issue: https://github.com/cocos2d/cocos2d-x/issues/14077
 2015-10-06 13:21:22 +06:30
TheCodez eb747cf808 Node::getName() returns string by reference 2015-10-05 21:42:07 +02: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
pandamicro 1e298a2c1a Merge pull request #14064 from MSOpenTech/v3-win10-fix 
V3: fixed Windows 10 UWP app manifest by correcting image asset paths
 2015-10-04 10:53:52 +08:00
Dale Stammen 32eeb560c3 clean up include files for WINRT platforms 2015-10-02 18:49:41 -07:00
Dale Stammen 548fc94eb8 added missing std includes 2015-10-02 18:17:11 -07:00
Dale Stammen 27f2397142 undefine ABSOLUTE for CC_PLATFORM_WINRT 2015-10-02 18:04:31 -07:00
KURA Shuichi 0469632cf8 Inprove addSpriteFramesWithDictionary 
- Moved initialization of image to an appropriate
  location, because it always called twice in
  SpriteFrameCache::addSpriteFramesWithFile()
 2015-10-03 03:18:07 +09:00
mogemimi 9f768bc1ab Add missing override keyword 2015-10-02 18:18:23 +09:00
Joachim Grill c49b60ae40 SpriteFrameCache: added plist file format documentation, fixed broken link 2015-10-01 10:36:18 +02:00
Joachim Grill 9a0ea79b61 remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue 2015-09-30 15:20:53 +02:00
dimon4eg 168b295b2e fix crash if csb file is missing 2015-09-30 14:44:30 +03:00
dimon4eg ec20b48775 fix crash in LoadingBar 2015-09-30 13:04:13 +03:00
dimon4eg fe8c1a12b5 Fix for text field 2015-09-30 12:39:44 +03:00
dimon4eg 2785a4313f Set focus for widgets 2015-09-30 12:31:33 +03:00
Neo Kim 423cbb83a9 Fix an issue that list view's Magnetic::CENTER is not working well around boundaries if it is non-bounceable. 2015-09-30 16:55:48 +09:00
Joachim Grill 79656ffe13 fixed typo, indentation 2015-09-29 16:50:14 +02:00
Joachim Grill ac24612e98 extend SpriteFrameCache to load PolygonInfo from plist file 2015-09-29 15:42:04 +02:00
Liam 8368762b37 update for light3D 2015-09-29 18:33:28 +08:00
CocosRobot 246fa7ffd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-29 07:45:48 +00:00
Liam 87a406febe update for light3d reader 2015-09-29 11:27:01 +08:00
XiaoFeng 84347bb056 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-09-29 09:35:35 +08:00
Danut Chereches 8944f9e1cd removed scale factor for label shadow 2015-09-28 16:27:20 +03:00
Yukio Murakami bc4bd99863 Support the new line element. Fixed a problem that protrude from the drawing area. 2015-09-28 14:47:09 +09:00
CocosRobot b082620d85 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-27 15:24:49 +00:00
pandamicro 7b85211cfe Remove ScriptComponent 
Because windows platform can't successfully compile in previous architecture
 2015-09-27 22:18:59 +08:00
WenhaiLin f4c56e8605 Fixed compile errors 2015-09-26 19:43:36 +08:00
pandamicro 2a3526a3fd Fix lua project 2015-09-26 19:43:36 +08:00
pandamicro 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +08:00
pandamicro ddb636a022 Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
pandamicro 7e2b8c71a7 Improve lua script component 2015-09-26 19:43:35 +08:00
minggo 26632ec69a linjia demo finish 2015-09-26 19:43:35 +08:00
XiaoFeng 47d9a59b41 Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash. 2015-09-25 18:12:16 +08:00
CocosRobot c135587962 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-25 08:43:00 +00:00
pandamicro 970300c3e2 Merge pull request #14012 from jianglong0156/customSpine 
add custom spine skeletonAnimation test
 2015-09-25 16:34:57 +08:00
Vincent Yang 5c0d6691ca Fix bug: FileUtils::GetFileSize can't treat multi-char path. 2015-09-25 14:50:20 +08:00
江龙 9eb05707fb add custom spine skeletonAnimation test 2015-09-25 13:36:48 +08:00
pandamicro e16404c280 Merge pull request #14008 from thuydx55/fix_android_compile_script_load_pluginx 
Fix loading pluginx lib when compile Android with --compile-script flag
 2015-09-24 14:08:46 +08:00
pandamicro 95379c5dc2 Merge pull request #13995 from xiaofeng11/v3 
Fix issue http://punchbox.info:3000/issues/23146
 2015-09-24 13:03:59 +08:00
Nick 003920f826 fix loading pluginx when compile Android with --compile-script flag 2015-09-24 11:41:18 +07:00
XiaoFeng 6db2cd7b9c Fix issue : http://punchbox.info:3000/issues/23182 
When time scale set to negative value, it will cause emitCounter been set to negative value and cause render crash
 2015-09-23 18:37:12 +08:00
wighawag 6ebdd3baf9 allow to use custom shader uniforms and attributes on drawNode 2015-09-23 10:34:35 +01: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
XiaoFeng f5c88c32af Fix click slider bar but not drag ball, after slider position changed won't send percentChangedEvent 2015-09-23 10:55:01 +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
CocosRobot b09b146f97 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-22 09:23:14 +00:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
XiaoFeng 573f5868ca Fix issue http://punchbox.info:3000/issues/23146 2015-09-22 14:52:16 +08:00
pandamicro 08204ec0bd Merge pull request #13991 from MSOpenTech/v3-win10-fix 
V3 Win10 UWP fixes
 2015-09-22 02:44:45 +08:00
pandamicro d3504a9216 Update versions and html5 engine 2015-09-22 02:31:21 +08:00
Dale Stammen 6a5db06115 added missing CCMotionStreak3D files. Re-added all Physics and 3D files to project 2015-09-21 11:11:34 -07:00
pandamicro b54a06a55e Merge pull request #13987 from Dimon4eg/Fix-crash-in-FontFreeType 
Fix crash in destructor of FontFreeType
 2015-09-22 01:59:34 +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
pandamicro eec67ea13b Merge pull request #13975 from zilongshanren/fixIssue11259 
don't change Text's dimension when label scale.
 2015-09-22 01:49:20 +08:00
Dale Stammen 70e157a44a removed CCComponentPhysics2d from Win10 UWP project 2015-09-21 10:44:30 -07:00
pandamicro 7fcea1ccaf Merge pull request #13976 from lsybblll/lsybblll-patch-1 
Update CCPhysics3DComponent.cpp
 2015-09-22 01:44:03 +08:00
Dale Stammen d5151952bb fixed compiler warning 2015-09-21 10:43:28 -07:00
dimon4eg 09b5b7fcc3 Fix crash in destructor of FontFreeType 2015-09-21 18:18:58 +03:00
CocosRobot 9ef7991b99 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 10:43:59 +00:00
子龙山人 f2190c79b9 Merge pull request #13835 from neokim/add_jump_to_item_to_listview 
Add a feature of jumping to a specific item in list tview
 2015-09-21 18:36:05 +08:00
lsybblll 84489d322a Update CCPhysics3DComponent.cpp 
there should save old bool.
 2015-09-21 17:11:45 +08:00
zilongshanren fd8cfd8ccb don't change Text's dimension when label scale. 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/11259
 2015-09-21 17:03:29 +08:00
CocosRobot 0af77fca90 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 08:35:18 +00:00
Neo Kim b09a0bd0e3 Add a missing parameter in comment for document. 2015-09-21 17:07:32 +09:00
pandamicro 5511d42cd4 Merge pull request #13716 from fusijie/particle_performance 
Refactory particle system update.
 2015-09-21 14:19:55 +08:00
子龙山人 aa6d5e1a04 Merge pull request #13961 from zilongshanren/fix-xcode7-override-issue 
fix missing override keyword
 2015-09-21 11:34:43 +08:00
pandamicro 6ab7f3804e Merge pull request #13960 from TimothyZhang/jsb-writeDataToFile 
Add jsb.fileUtils.writeDataToFile()
 2015-09-21 10:48:25 +08:00
zilongshanren 511b58a3b2 fix missing override keyword 2015-09-21 09:51:27 +08: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 fa9afd6c2b Merge pull request #13953 from himynameschris/fix-socketio 
Fix socketio to work with servers v1.0+
 2015-09-20 23:15:27 +08:00
pandamicro c2214e56af Merge pull request #13954 from geron-cn/v3 
format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770
 2015-09-20 17:01:41 +08:00
fusijie d871b1aa8a Refactory particle system. 2015-09-20 16:46:09 +08:00
pandamicro 44329d96ba Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine 
Refine lua/js binding tool
 2015-09-20 16:42:40 +08:00
geron-cn f93cfac0f7 rename setAnimationEndCallFunc 2015-09-20 16:24:41 +08:00
zhangting caaf912a28 add writeDataToFile() for jsb 2015-09-20 15:38:15 +08:00
geron-cn 0cfc33e4d3 format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770 2015-09-20 12:34:34 +08:00
Chris Hannon bd7f90f993 adds initializing value and corrects spelling of variable _endpointseparator 
Signed-off-by: Chris Hannon <chris@channon.us>
 2015-09-19 20:47:54 -04:00
Chris Hannon e7c2436d85 fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings) 
Signed-off-by: Chris Hannon <chris@channon.us>
 2015-09-19 20:31:48 -04:00
Aaron 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
WenhaiLin b77d04f593 Fixed link errors 2015-09-19 00:59:28 +08:00
CocosRobot c562a57030 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 16:32:43 +00:00
pandamicro 6bf54a3eda Merge pull request #13770 from geron-cn/v3 
add  Frame End Call Back and Animation Clip End Call Back
 2015-09-19 00:24:21 +08:00
CocosRobot 37cb9afb3f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 14:04:49 +00:00
pandamicro 0cbc1e5f40 Merge pull request #13923 from WenhaiLin/v3-physics-refine 
Refine components to improve physics performance
 2015-09-18 21:56:36 +08:00
pandamicro ce0166ef6e Merge pull request #13940 from CocosRobot/update_lua_bindings_1442584025 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-18 21:55:21 +08:00
pandamicro cc8e944050 Merge pull request #12220 from hanxi/v3 
add UIEditBox support linux platform
 2015-09-18 21:53:09 +08:00
CocosRobot ad65343814 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 13:51:58 +00:00
pandamicro add24ccf95 Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug 
Revert "remove CCClippingRectangleNode transform error support."
 2015-09-18 21:43:42 +08:00
pandamicro 724011f19b Merge pull request #12071 from waiter/v3 
Fix a bug in Scheduler which may case Force Close
 2015-09-18 21:39:36 +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
hanxi b1ed1a8a51 add UIEditBox support linux platform. 2015-09-18 17:11:58 +08:00
pandamicro 13f3d46ad4 Merge pull request #13897 from super626/v3 
SkyboxBrush : Make the shader parameter take effect at once
 2015-09-18 16:14:06 +08:00
CocosRobot 79a7878687 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 07:41:46 +00:00
WenhaiLin a17a702cd1 Refine components to improve performance 2015-09-18 14:34:02 +08:00
yangxiao 36d4f5564d merge cocos 2015-09-18 14:08:33 +08:00
fusijie 23246b006b fixed region x,y scale bug. 2015-09-18 13:39:22 +08:00
CocosRobot fe41739584 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 04:07:18 +00:00
pandamicro 3f5df0ccc3 Merge pull request #13647 from super626/motionstreak3d 
Motionstreak3d
 2015-09-18 11:59:33 +08:00
偶尔e网事 eb480fb021 Revert "remove CCClippingRectangleNode transform error support." 2015-09-18 11:31:37 +08:00
yangxiao 6f1b04fd89 merge cocos 2015-09-18 09:37:26 +08:00
Vladimir Perminov 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
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
pandamicro ded9a9e6d4 Merge pull request #13893 from yangws/downloader 
Remove AssetsManager dependence with CRUL.
 2015-09-17 22:18:56 +08:00
yangxiao 757209e59e make the shader parameter take effect at once 2015-09-17 18:14:17 +08:00
pandamicro 1f0006efe8 Merge pull request #13859 from geron-cn/v3bugfixs 
fix bug: ReEntry a same frameindex after scaled action's speed.
 2015-09-17 17:48:06 +08:00
pandamicro 5f3a2bb000 Merge pull request #13874 from super626/light 
Fix shader light parameter bug
 2015-09-17 17:46:46 +08:00
pandamicro 4aaf017e4c Merge pull request #13890 from jianglong0156/addsetUniformLocationWithMatrix 
add CCGLProgram function binding setUniformLocationWithMatrix
 2015-09-17 17:45:16 +08:00
Vincent Yang 5eafc93d86 Remove AssetsManager dependence with CRUL. 2015-09-17 16:52:31 +08:00
pandamicro 1eeafed072 Merge pull request #13884 from yangws/v3 
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
 2015-09-17 16:32:56 +08:00
江龙 1b320ac248 add CCGLProgram function binding setUniformLocationWithMatrix 2015-09-17 15:34:41 +08:00
yangxiao 256832d000 replace genGLProgramState to genMaterial 2015-09-17 14:45:16 +08:00
yangxiao 572ee3adb2 merge cocos 2015-09-17 14:24:01 +08:00
Vincent Yang 4b83240bed Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null. 2015-09-17 11:20:36 +08:00
James Chen 0eaf4c6866 [lua] Wrong callback setting for webview:setOnDidFailLoading 2015-09-17 10:52:17 +08:00
pandamicro d8289ca676 Merge pull request #13843 from yangws/issue_13551 
Fixed #13551 : MenuItemImage Camera Issue.
 2015-09-17 00:08:54 +08:00
andyque 1be5402050 Merge branch 'v3' into addiOSMultiline-support 
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
 2015-09-16 21:49:55 +08:00
yangxiao fb7ade6578 reset set material 2015-09-16 18:08:23 +08:00
yangxiao b5e69930cd fix shader light parameter 2015-09-16 18:04:52 +08:00
geron-cn e6fb2f8924 fix ReEntry a same frame when scale action's speed. 2015-09-16 15:44:43 +08:00
Neo Kim d9be26cd98 Use another dirty flag for list view layout other than 'Layout::_doLayoutDirty' because 'Layout::onEnter()' forces '_doLayoutDirty' to be true always. List view should have a way not to do layout in 'onEnter()'. 2015-09-16 16:21:11 +09:00
Mazyad Alabduljaleel 3090599f83 Oops, committed duplicate code by mistake 2015-09-16 10:12:07 +03:00
pandamicro 0479cca364 Merge pull request #13832 from yangws/downloader 
Restructure CCDownloader implement on iOS and Android don't use libcurl.
 2015-09-16 14:01:28 +08:00
Vincent Yang 36337ad694 Fixed #13551 : MenuItemImage Camera Issue. 2015-09-16 11:24:55 +08:00
yangxiao ea538cd9da merge cocos 2015-09-16 10:37:24 +08:00
Vincent Yang ea585f4b7d Fix compile problems. 2015-09-16 09:34:24 +08:00
Mazyad Alabduljaleel 61980d1a8b [refactor] Break down the file into separate files, because it exceeded 1 kLOC 🙀 
[refactor] Consolidate `UITextView` and `UITextField` APIs.
[refactor] rename classes that start with `UI` to `CCUI`, since that prefix is reserved by Apple.
[bugfix] setting the placeholder for `CCUISingleLineTextField` was missing in `createSingleLineTextField`
[bugfix] In `MultiLineTextView`, if `placeholder` changed, there doesn't seem to be a deterministic way of updating the `placeholderLabel`. We are relying on `drawRect:`. Instead, `placeholder` is now a computed property on top of `placeholderLabel.text`.
[bugfix] If the user wants multi-line secure input, we should set it, since it is possible, right?
[minor] `[viewWithTag:999]` was used instead of calling the property itself.
[minor] `drawRect:` was used to load properties, when it is normally in the getter.
[minor] fix ObjC code style
 2015-09-15 23:36:26 +03:00
Neo Kim 11d80f47f8 Refactor list view's layout refreshing logic. 2015-09-15 22:34:00 +09:00
Neo Kim f58cbad6c2 Add 'jumpToItem()' to list view. 2015-09-15 22:33:50 +09:00
CocosRobot ae8a35a726 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 10:36:16 +00:00
Vincent Yang 848fa2c0d0 Merge cocos2d. 2015-09-15 18:30:45 +08:00
子龙山人 f2bee23696 Merge pull request #13789 from neokim/fix-13668 
Fix for #13668
 2015-09-15 18:28:24 +08:00
子龙山人 f5848290a2 Merge pull request #13673 from Almax27/patch-3 
Removed ScrollView::_innerContainer pointer copy
 2015-09-15 17:42:20 +08:00
子龙山人 6eece55e80 Merge pull request #13828 from CocosRobot/update_lua_bindings_1442298458 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-15 16:55:14 +08:00
子龙山人 2157059fef Merge pull request #13826 from zilongshanren/enableSliderBodyTouch 
Enable tapping Slider bar to scroll
 2015-09-15 16:55:00 +08:00
CocosRobot 19561ca84b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 06:32:52 +00:00
子龙山人 73d2c5d1b8 Merge pull request #13577 from fusijie/fix_13454 
Fixed sprite debug draw.
 2015-09-15 14:24:23 +08:00
andyque fe5a43c428 Enable tapping Slider bar to scroll 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13434
 2015-09-15 14:13:52 +08:00
pandamicro 5e037c9ad8 Merge pull request #13806 from xiaofeng11/v3 
Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0)
 2015-09-15 14:05:02 +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
CocosRobot c9b30bd391 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 05:45:47 +00:00
andyque 2fea4db9fc fix ui::Button title location issue 2015-09-15 13:37:32 +08:00
pandamicro dbe3e062bc Merge pull request #13801 from chengstory/OptimizateDoLayout 
Move "ui::Helper::DoLayout"  to "CreateNode"。
 2015-09-15 13:37:00 +08:00
zhangcheng fb104189d4 Multiplexing ccs.load. 2015-09-15 13:04:45 +08:00
zhangcheng fa7f97b26e Adjustment spaces. 2015-09-15 11:35:43 +08:00
子龙山人 02eca21b78 Merge pull request #13701 from seivan/patch-3 
Don't call release() before retain() #13656
 2015-09-15 11:28:56 +08:00
Vincent Yang bf477c6bfb Restructure AssetsManagerEx. 2015-09-15 11:23:46 +08:00
zhangcheng 83f5f85f56 add loadWithVisibleSize js function. 2015-09-15 11:16:02 +08:00
CocosRobot 4b3e71e353 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 01:35:59 +00:00
子龙山人 1d7d283ee6 Merge pull request #13549 from neokim/add_getters_for_renderers_into_button 
Add getters for the internal renderer instances of Button
 2015-09-15 09:26:34 +08:00
pandamicro 89d81bd959 Merge pull request #12281 from lijinlong/v3 
luabinding enumerateChildren bug
 2015-09-14 22:32:56 +08:00
pandamicro dd6c1bc611 Merge pull request #13802 from geron-cn/v3bugfixs 
fix crash recall a cached timeline after exit scene
 2015-09-14 22:12:06 +08:00
XiaoFeng 12f0f7f580 Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0) 2015-09-14 17:36:19 +08:00
zhangcheng 224f392a9c Add createNodeWithVisibleSize to CSLoader. 2015-09-14 16:51:58 +08:00
Vincent Yang ebf308d88c Test case Downloader Test restructured. 2015-09-14 15:33:34 +08:00
Neo Kim c224a81497 Rectify typos 2015-09-14 15:27:51 +09:00
geron-cn c800d0d824 fix crash recall a cached timeline after exit scene 2015-09-14 14:24:42 +08:00
pandamicro 1fd2e65b48 Merge pull request #13799 from CocosRobot/update_lua_bindings_1442203019 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-14 13:12:36 +08:00
zhangcheng f88b23f52b Move "ui::Helper::DoLayout" to "CreateNode". 2015-09-14 13:07:15 +08:00
CocosRobot a4cb98d993 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-14 04:01:38 +00:00
Neo Kim 3fff195c20 Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary. 2015-09-13 22:32:22 +09:00
Neo Kim 7f9c8acc2a ScrollView - Add a guard statement in setContentSize() to avoid resetting inner container's position if not necessary. 2015-09-13 21:43:34 +09:00
James Chen 6073456f23 [Lua] Life control fix for XMLHttpRequest 2015-09-12 17:49:30 +08:00
pandamicro 4022fb65e1 Merge pull request #13760 from super626/materialfix2 
fix material clone
 2015-09-11 18:24:05 +08:00
子龙山人 0e9ae83376 Merge pull request #13782 from CocosRobot/update_lua_bindings_1441965150 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-11 18:06:47 +08:00
CocosRobot e79678454b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-11 09:59:04 +00:00
pandamicro 2795d0a488 Merge pull request #13779 from pandamicro/v3 
Fix Chipmunk setCollisionType issue by initializing variables
 2015-09-11 17:58:48 +08:00
子龙山人 96d6221daf Merge pull request #13723 from neokim/add_scroll_to_item_and_magnetic_scroll_into_listview 
Add scrolling to item and magnetic scroll into ListView
 2015-09-11 17:48:40 +08:00
pandamicro 5a918608c1 Fix Chipmunk setCollisionType issue by initializing variables 2015-09-11 15:23:29 +08:00
yangxiao ca24e6eba3 fix clone 2015-09-11 15:08:59 +08:00
Neo Kim f39644d129 Remove default arguments in APIs and rename the parameter 'time' to 'timeInSec'. 2015-09-11 16:00:53 +09:00
yangxiao 6fd9784fce setParent for RenderState 2015-09-11 11:47:36 +08:00
geron-cn 966e568051 add ActionTimeline Frame End Call Back and Animation Clip End Call Back 2015-09-10 18:29:09 +08:00
CocosRobot cfe0be269b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-10 10:14:45 +00:00
pandamicro f281ae31b0 Merge pull request #13725 from WenhaiLin/v3-comonent-refine 
Refine ComponentContainer to  improve performance
 2015-09-10 18:04:26 +08:00
Vincent Yang bd80eb6f46 CCDownloader-android implements Data Task Download. 2015-09-10 18:03:15 +08:00
Seivan Heidari ea12b601d9 Don't call release() before retain() 2015-09-10 11:09:17 +02:00
pandamicro 7611f99ee4 Merge pull request #13746 from WenhaiLin/v3-menuitemtoggle-refine 
Uncoupling the implementation of MenuItemToggle dependence on tag.
 2015-09-10 16:15:18 +08:00
Vincent Yang 7e2fe05050 CCDownloader-android implements File Task Download. 2015-09-10 15:56:06 +08:00
pandamicro 98f29e4dee Merge pull request #13764 from fusijie/fix_autopolygon_comments 
[ci skip]Fixed autopolygon comments
 2015-09-10 15:22:55 +08:00
fusijie d957e0c032 Fixed auto polygon comments out of date. 2015-09-10 15:18:04 +08:00
pandamicro 941cd3c9de Merge pull request #13717 from jianglong0156/assetsmanagerContinue 
fix the AssetsManagerEx can not continuous transmission
 2015-09-10 11:34:03 +08:00
yangxiao d5fab0bd38 merge cocos 2015-09-10 10:44:09 +08:00
yangxiao 8f5cd6cdc8 remove setParent 2015-09-10 09:28:01 +08:00
yangxiao 64471fab85 fix material clone 2015-09-10 09:23:02 +08:00
CocosRobot b164ac059d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 10:45:05 +00:00
pandamicro d03b100ec1 Merge pull request #13706 from WenhaiLin/v3-ios-phonecall-fix 
[IOS platform]AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
 2015-09-09 18:37:13 +08:00
pandamicro f31ebfe331 Merge pull request #13748 from jianglong0156/uniformConversion 
add uniform conversion
 2015-09-09 18:04:07 +08:00
江龙 4509a316cc add uniform conversion 
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
 2015-09-09 16:03:57 +08:00
WenhaiLin e251866d23 Uncoupling the implementation of MenuItemToggle dependence on tag. 2015-09-09 15:32:44 +08:00
CocosRobot b3976cdd63 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 06:08:45 +00:00
WenhaiLin 34be2065e4 Refine ComponentContainer to improve performance 2015-09-09 11:53:55 +08:00
Martin Taylor e592a1a02d fix typos 2015-09-09 11:37:41 +08:00
yangxiao 153bdb7170 add comment 2015-09-09 11:11:17 +08:00
pandamicro f7f8a42ecf Merge pull request #13722 from NatWeiss/patch-17 
Fix crash in FrameBuffer if no DepthStencil
 2015-09-09 10:46:58 +08:00
子龙山人 ae7b45a569 Merge pull request #13732 from CocosRobot/update_lua_bindings_1441765845 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-09 10:42:04 +08:00
CocosRobot 2423f05024 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 02:37:17 +00:00
子龙山人 20531061a2 Merge pull request #13728 from CocosRobot/update_lua_bindings_1441765050 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-09 10:36:54 +08:00
pandamicro 9814851355 Merge pull request #13659 from seivan/patch-2 
EventListenerMouse will dispatch EventMouse events
 2015-09-09 10:34:12 +08:00
pandamicro dc607a1784 Merge pull request #13726 from jianglong0156/actionExtendSquash 
support custom action, and rewrite update function
 2015-09-09 10:25:56 +08:00
CocosRobot a78f5e3dcc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 02:23:01 +00:00
江龙 badd80bf3a support custom action, and rewrite update function 
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
    ctor:function (duration, deltaPos, deltaY) {
        this._super(duration, deltaPos, deltaY);
    },
    update:function (dt) {
        this._super(dt);

        if (this.getTarget()) { // rand color
            this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
        }

    }
});
 2015-09-09 10:08:07 +08:00
Neo Kim 586af44fe6 ListView - Add getter / setter for magnetic out of boundary flag. 2015-09-09 10:29:19 +09:00
Neo Kim b28b8146e7 ListView - Add the logic for magnetic bounce back. 2015-09-09 10:29:19 +09:00
Neo Kim 3085e1385c ListView - Add 'startMagnetScroll()' for non-inertia scroll. 2015-09-09 10:29:18 +09:00
Neo Kim e58c073186 ListView - Apply magnetic to inertia scroll. 2015-09-09 10:29:18 +09:00
Neo Kim ca3ea53ffd ListView - Add enum for magnetic type and test cases for magnetic scroll. 2015-09-09 10:29:18 +09:00
Neo Kim d8fc04d109 ListView - Add 'scrollToItem' method and its test cases. 2015-09-09 10:29:18 +09:00
Neo Kim 2599271410 ListView - Add APIs which return the closest item in specific position in current view. 2015-09-09 10:29:17 +09:00
Neo Kim a4e5f7c0a8 ScrollView - Refactor the logic about getting out of boundary amount. 2015-09-09 10:28:47 +09:00
Neo Kim 90891f9efb ScrollView - Add a utility function 'flattenVectorByDirection()' 2015-09-09 10:28:46 +09:00
Neo Kim ea79d92aa1 ScrollView - Fix an issue which occurs when auto scroll is started during already bouncing back. 2015-09-09 10:28:46 +09:00
Neo Kim 7394b3f467 ScrollView - Rename 'startAutoScrollChildrenWithDestination()' to 'startAutoScrollToDestination' and 'duration' to 'time'. 2015-09-09 10:28:46 +09:00
Neo Kim c037769e62 ScrollView - Correct auto scroll direction 2015-09-09 10:28:45 +09:00
Neo Kim 2dec85e175 ScrollView - Fix that the last touch when release was not considered for inertia scroll 2015-09-09 10:28:45 +09:00
Neo Kim 5f469264fc ScrollView - Refactor auto scroll for simpler implementation 
- Remove auto scroll callback
 2015-09-09 10:28:45 +09:00
Neo Kim ad01bc7699 ScrollView - Add startAttenuatingAutoScroll() 2015-09-09 10:28:44 +09:00
Neo Kim 3cff03e8ed ScrollView - Remove movement callback from auto scroll. 2015-09-09 10:28:44 +09:00
Neo Kim 0c4414625a ScrollView - Rectify wrong indentations 2015-09-09 10:28:44 +09:00
Nathanael Weiss 14b9c2e75c Fix crash in FrameBuffer if no DepthStencil 
This fixes a debug-config crash if a FrameBuffer has no `RenderTargetDepthStencil`.
 2015-09-08 13:13:38 -07:00
江龙 d6934cfc4b rename var resumeDownloaded to resumeDownloaded. 2015-09-08 16:38:02 +08:00
江龙 8daf026c6c fix the AssetsManagerEx can not continuous transmission for large zip file. 
the testcase is extension/assetsmanager
 2015-09-08 16:34:02 +08:00
yangxiao f944750627 add material cache 2015-09-08 15:29:54 +08:00
pandamicro d60eb21d59 Merge pull request #13710 from minggo/implement-function-in-cpp 
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
 2015-09-08 13:28:19 +08:00
pandamicro eab6dbe6fd Merge pull request #13711 from minggo/crash-in-dynamic-library 
don't define static variable in header file or each dynamic lib will have a copy
 2015-09-08 11:45:12 +08:00
minggo d86b256396 don't define static variable in header file or each dynamic lib will have a copy 2015-09-08 11:04:51 +08:00
minggo bbe5861367 fix crash on xiaomi2 if cocos2d-x is built as a dynamic library 2015-09-08 10:26:37 +08:00
minggo 8326ed6535 add physics component 2015-09-08 09:54:01 +08:00
Seivan Heidari 2f02690394 EventListenerMouse will dispatch EventMouse events 2015-09-07 20:05:51 +02:00
子龙山人 75882e64a0 Merge pull request #13646 from neokim/refactor_scrollview_inertia_scroll 
Refactor scroll view's inertia scroll
 2015-09-07 22:38:20 +08:00
pandamicro 00abec6c2c Merge pull request #13707 from pandamicro/fix_layerrgba 
[ci skip] Fix compile error in __LayerRGBA
 2015-09-07 17:27:46 +08:00
TheCodez d77045818c Fix compile error in __LayerRGBA 2015-09-07 17:25:56 +08:00
WenhaiLin e500b960f3 AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call. 2015-09-07 16:29:57 +08:00
pandamicro 0eee625788 Merge pull request #13697 from pabitrapadhy/patch-1 
Updated spelling and grammar mistakes
 2015-09-07 15:02:27 +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
yangxiao c3ac446f35 resolve conflict 2015-09-07 14:45:09 +08:00
yangxiao 97c59c87ac built in material for sprite3d 2015-09-07 13:59:38 +08:00
yangxiao 137d180dc9 fix material clone 2015-09-07 13:59:08 +08:00
Vincent Yang 9b4fe5b5a1 Add CCDownloader-android class frame to android project. 2015-09-07 11:55:00 +08:00
pandamicro 2739be06bb Update COCOS2D_VERSION 2015-09-07 11:45:04 +08:00
WenhaiLin 42b24a9c5b Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework 2015-09-07 11:12:13 +08:00
Vincent Yang 3a078540a0 Modify CCDownloader-apple.mm support continuly download. 2015-09-07 10:08:28 +08:00
Pabitra Padhy d4c60144f0 Updated spelling and grammar mistakes 2015-09-06 15:29:36 +05:30
Vincent Yang 0afa2bdfc6 Modify CCDownloader-curl.cpp to support continue download. 2015-09-06 15:57:51 +08:00
子龙山人 f9eef5ceed Merge pull request #13636 from zilongshanren/refactorEditBox 
refactor EditBox iOS&Android implementation
 2015-09-06 10:03:54 +08:00
pandamicro 2dfd22dfef Merge pull request #13690 from pandamicro/v3.8 
[ci skip][JS] Add common APIs for compatibility with web engine
 2015-09-06 08:59:27 +08:00
pandamicro 86fb0fc3bc [JS] Add common APIs for compatibility with web engine 2015-09-06 08:57:43 +08:00
Dale Stammen 030157ded0 update libcococs2d name to v3.9 for WinRT platforms 2015-09-04 08:46:08 -07: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
Aaron 59fab25804 Removed innerContainer pointer copy when cloning 
Copied pointer becomes invalid when model widget destructs. Instead we simply copy the position.
 2015-09-03 11:29:58 +01: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
Vincent Yang ea580ed2ee Restructure CCDownload Interface and implements with curl. 2015-09-02 18:26:42 +08:00
andyque c0f40ad4a5 fix Android EditBox font size issue 2015-09-02 18:25:30 +08:00
songchengjiang addce6c565 add CC_DLL 2015-09-02 15:55:58 +08:00
linguofeng 7fc382055b lua add UPDATE_FAILED ERROR_DECOMPRESS 
add
cc.EventAssetsManagerEx.EventCode.UPDATE_FAILED
cc.EventAssetsManagerEx.EventCode.ERROR_DECOMPRESS
 2015-09-02 11:27:47 +08:00
子龙山人 4530043d9b Merge pull request #13649 from WenhaiLin/v3-string-empty-check 
Use string::empty() to check whether string is empty.
 2015-09-01 18:04:41 +08:00
Neo Kim 3656ce99bd Fix an issue regarding non-bouncing scroll view 2015-09-01 15:13:18 +09:00
yangxiao 5cabc592e0 add motionstreak3d to cocos2d header 2015-09-01 11:34:35 +08:00
WenhaiLin 5fdb041856 Use string::empty() to check whether string is empty. 2015-09-01 11:26:09 +08:00
yangxiao c23805889f add motionstreak3d 2015-09-01 11:02:22 +08:00
Neo Kim 129f4b3186 Implement the inertia scroll using auto scroll feature. Consolidate them into one. 2015-09-01 11:52:05 +09:00
Neo Kim ecd947d9f4 Change auto scroll feature to receive callbacks to remove dependencies. 2015-09-01 11:45:42 +09:00
Neo Kim 137a05a2aa Rectify the wrong indentations in switch statements 2015-09-01 11:45:42 +09:00
Neo Kim 69d23eb00c Extract the touch move speed calculation logic from inertia concept. 2015-09-01 11:45:42 +09:00
Neo Kim 81795f6d73 Add a guard statement in setInnerContainerPosition(). 2015-09-01 11:45:42 +09:00
Neo Kim 96a78f687c Remove redundant codes 2015-09-01 11:45:42 +09:00
子龙山人 2e9e660cbb Merge pull request #13220 from zilongshanren/testEditBoxWin32 
Improved EditBox implement for platform win32
 2015-09-01 10:40:11 +08:00
yangxiao b6c4f4cf50 add comment 2015-09-01 10:39:14 +08:00
pandamicro 7f04a191c7 Merge pull request #13635 from super626/v3.8 
Enable depth write for transparent object
 2015-09-01 10:30:50 +08:00
子龙山人 59c1b21d0b Merge pull request #13634 from WenhaiLin/v3.8-textreader-refine 
This is a small optimization about TextReader.
 2015-09-01 09:40:52 +08:00
Jeff Wang b8105349c7 revert to the original state when user cancel input 2015-09-01 00:06:18 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +08:00
andyque 367a105a48 refactor EditBox iOS&Android implementation 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13616#issuecomment-135742727
 2015-08-31 18:36:27 +08:00
yangxiao 030ab8858d enable depth write for transparent object 2015-08-31 18:34:09 +08:00
WenhaiLin df383de894 This is a small optimization about TextReader. 2015-08-31 17:06:11 +08:00
geron-cn e7c7b248d6 fix bug: bone can be see by other cameras 2015-08-31 16:04:17 +08:00
pandamicro 8f6f5c1191 Update engine versions 2015-08-31 13:52:15 +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
yangxiao bc07d7954a fix render state 2015-08-28 23:00:45 +08:00
Vincent Yang cf664800ac refine #22483 : Restructure CCDownload Interface and implements on iOS. 2015-08-28 16:40:11 +08:00
pandamicro 9d72d6a924 Merge pull request #13496 from ZhangMenghe/v3-notification 
[ci rebuild] Notification effect enhancement
 2015-08-28 14:10:42 +08:00
yangxiao 6fa6f1f0da enable depth write 2015-08-28 11:46:11 +08:00
yangxiao bc2e66d03b add motionstreak3d 2015-08-28 11:40:12 +08:00
子龙山人 4fe9517ec7 Merge pull request #13592 from neokim/fix_13591 
Fix #13591
 2015-08-28 10:19:20 +08:00
pandamicro 1264863b2f Merge pull request #13598 from zilongshanren/fixSliderConstructor 
fix Slider create missing res type.
 2015-08-28 09:28:19 +08:00
Liam 69da65d7a4 update for jsb_opengl_constants 2015-08-28 08:42:55 +08: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 104013aebe commit v3.8 overwrite this unused code 
From commit #13397
 2015-08-27 23:19:30 +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
andyque 40492e6169 fix Slider create missing res type. 
fixed https://github.com/cocos2d/cocos2d-x/issues/13575
 2015-08-27 23:34:39 +08:00
Liam ed49250b9b update for reader 
1.update for sprite3d cullface
2.sync js code
 2015-08-27 18:29:45 +08:00
pandamicro 032bc590b7 Merge pull request #13593 from jianglong0156/fixActionParamError 
fix Action:Place, RotateTo param wrong number error
 2015-08-27 17:44:46 +08:00
江龙 a060a82d88 fix Action:Place, RotateTo param wrong number error 2015-08-27 17:35:09 +08:00
Neo Kim 30d52d1394 Fix #13591 2015-08-27 17:12:07 +09:00
子龙山人 30d6c82da6 Merge pull request #13585 from WenhaiLin/v3.8-scheduleOnce-hotfix 
[Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay parameter equal zero.
 2015-08-27 10:54:04 +08: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
Ricardo Quesada d5d1be93cc make it compile on win32 2015-08-26 10:16:50 -07:00
Dale Stammen 09a1211c96 use isWindowsPhone() to check for Windows Phone platform 2015-08-26 09:47:59 -07:00
Dale Stammen 161954da87 fixed pdb file output location 2015-08-26 09:41:23 -07:00
Dale Stammen 4cb3d88232 added isWindowsPhone() to correctly detect Windows 10 phone 2015-08-26 09:19:28 -07:00
Dale Stammen fcae139857 removed old WP8_SHADER_COMPILER defines 2015-08-26 08:50:11 -07:00
WenhaiLin 393af19237 [Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay equal zero. 2015-08-26 23:41:48 +08:00
pandamicro 405e6c24c8 Merge pull request #13578 from geron-cn/v3.8 
bone's color and opacity cannot cascade to bone
 2015-08-26 22:33:31 +08:00
pandamicro 8459978dfa Merge pull request #13572 from zilongshanren/fixIssue13564 
fix Scale9Sprite draw extra pixels in spritesheet
 2015-08-26 21:35:00 +08:00
pandamicro d49edbb4f5 Merge pull request #13574 from super626/v3.8 
Skybox brush set depth test function to always
 2015-08-26 21:31:19 +08:00
pandamicro 9d1cf6eab3 Merge pull request #13579 from CocosRobot/update_lua_bindings_1440593794 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-26 21:29:56 +08:00
pandamicro ee5c541cd1 Merge pull request #13573 from songchengjiang/v3.8 
add annotations
 2015-08-26 21:12:43 +08:00
CocosRobot 3d6866279a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-26 13:01:17 +00:00
pandamicro 8a5fb709ad Merge pull request #13566 from liamcindy/V3.8 
update reader with skybox valid
 2015-08-26 20:52:05 +08:00
geron-cn 7d01b16f62 bone's color and opacity cannot cascade to bone, also bone can not cascade from its parent. 2015-08-26 20:24:20 +08:00
fusijie 5f527bfc1d Fixed sprite debug draw. 2015-08-26 18:18:58 +08:00
songchengjiang f9e9871bcc supplement annotations 2015-08-26 17:24:36 +08:00
yangxiao 2f72a88a20 depth test always 2015-08-26 16:37:48 +08:00
yangxiao d17c04cf0e tmp 2015-08-26 16:35:42 +08:00
songchengjiang 2239b624a8 add annotations 2015-08-26 16:19:30 +08:00
andyque 7f73415189 fix Scale9Sprite draw extra pixels in spritesheet 
Fixed https://github.com/cocos2d/cocos2d-x/issues/13564
 2015-08-26 16:15:00 +08:00
Liam 5a997cec1c update reader with skybox valid 2015-08-26 10:22:20 +08:00
Ricardo Quesada dfed33f6f2 Adds `PrimitiveCommand` test 2015-08-25 15:07:03 -07:00
andyque 6cea66f932 fixed Scale9Sprite default capInset bug. 
Fixed https://github.com/cocos2d/cocos2d-x/issues/13560
 2015-08-25 23:31:34 +08:00
pandamicro 8165775a3d Merge pull request #13554 from super626/v3.8 
disable blend when drawing skybox
 2015-08-25 16:50:52 +08:00
子龙山人 734388d2bd Merge pull request #13556 from zilongshanren/fix-listview-intial-position 
fix ListView innerContainer initial position error
 2015-08-25 16:50:02 +08:00
pandamicro 68444bc3b1 Merge pull request #13553 from liamcindy/V3.8 
update reader with new skybox
 2015-08-25 16:34:28 +08:00
Liam c998639c30 update interface for gamenode3d 2015-08-25 15:18:09 +08:00
andyque 65b78d4a49 fix ListView innerContainer initial position error 2015-08-25 15:15:18 +08:00
yangxiao 7884138dcc disable blend when drawing skybox 2015-08-25 14:32:25 +08:00
Liam 650a5c2318 update reader with new skybox 2015-08-25 13:20:19 +08:00
Neo Kim ab85406bc8 Added version comments 2015-08-25 11:21:26 +09:00
Neo Kim d2fb1bda7d Add getters for the internal renderer instances 2015-08-25 11:21:02 +09:00
子龙山人 b0561749bd Merge pull request #13537 from neokim/fix_issue_13516 
Fix issue 13516
 2015-08-25 10:01:03 +08:00
Dale Stammen 43687bf7a0 moved CCTextureCube from 3D to renderer 2015-08-24 03:45:55 -07:00
CocosRobot 7117fa24be [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-24 10:13:27 +00:00
Neo Kim edd9fecf39 Update scroll bar when the inner container's size changes 2015-08-24 18:47:12 +09:00
Neo Kim 9f693ef8f3 Enhance readability 2015-08-24 18:46:43 +09:00
Neo Kim e1ed3ecb09 Add a method to change selected radio button without event dispatch. 2015-08-24 17:39:49 +09:00
Neo Kim 887efdca1b Add 'removeAllRadioButtons()' 2015-08-24 17:39:48 +09:00
Neo Kim 202b549073 Add getters for the internal renderer instances 2015-08-24 17:39:47 +09:00
Neo Kim da85b16292 Change not to dispatch event when add radio buttons 2015-08-24 17:39:46 +09:00
CocosRobot 31a09c9f23 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-24 06:13:37 +00:00
pandamicro 0c5b377f00 Merge pull request #13531 from pandamicro/texturecube 
Move CCTextureCube From 3d to renderer to solve compilation issue
 2015-08-24 14:06:08 +08:00
yangxiao 7dcc3dd982 Move CCTextureCube From 3d to renderer to solve compilation issue 2015-08-24 14:01:50 +08:00
pandamicro 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
pandamicro 585990071d Merge pull request #13528 from songchengjiang/v3.8 
fix crash of CameraBackgroundColorBrush
 2015-08-24 11:08:01 +08:00
songchengjiang be24586f4b fix crash of CameraBackgroundColorBrush 2015-08-24 10:23:59 +08:00
pandamicro 11113c85da Improved logic of skybox reader fix 2015-08-24 10:02:38 +08:00
Liam 110de9ee3e fix skybox crash with error data 2015-08-24 10:02:37 +08:00
pandamicro 055ef23931 Fix AssetsManager crash by protecting Downloader with shared_ptr 2015-08-22 22:13:53 +08:00
pandamicro 5c4b67d04e Merge pull request #13518 from MSOpenTech/v3.8-win10 
V3.8: Win10 UWP add missing CCCameraBackgroundBrush files
 2015-08-22 12:01:28 +08:00
pandamicro 6ee33499b4 Update changelog and versions for v3.8 rc0 2015-08-22 11:56:25 +08:00
Dale Stammen fc1a2b2f99 fixed for winrt audio issue 13254 2015-08-21 09:59:46 -07:00
Dale Stammen b4f2fb0928 added missing CCCameraBackgroundBrush files 2015-08-21 09:23:01 -07:00
pandamicro 486af79a47 Merge pull request #13511 from fusijie/fix_13509 
fixed renderTexture crash bug.
 2015-08-21 18:24:27 +08:00
fusijie cbd7eed9c4 fixed renderTexture crash bug. 2015-08-21 17:38:56 +08:00
CocosRobot 6b6c6b242c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-21 06:44:25 +00:00
pandamicro 66fbc33ccb Merge pull request #13501 from pandamicro/camera 
Add JS and Lua bindings for CCCameraBackgroundBrush
 2015-08-21 14:35:15 +08:00
子龙山人 369d7474b8 Merge pull request #13499 from zilongshanren/fix-scrollview-initil-posotion 
fix scrollview innerContainer initial position.
 2015-08-21 13:51:04 +08:00
pandamicro 006f300ac9 Add JS and Lua bindings for CCCameraBackgroundBrush 2015-08-21 12:42:36 +08:00
pandamicro 306a0e4df7 Merge pull request #13471 from super626/v3.8 
skybox should not be transparent
 2015-08-21 12:22:48 +08:00
CocosRobot 9a6c779580 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-21 03:59:12 +00:00
andyque 29f97d63ed fix scrollview innerContainer initial position. 2015-08-21 11:56:19 +08:00
pandamicro 350182c1aa Refactor BackGround to Background 2015-08-21 10:43:59 +08:00
yangxiao 3e2001bdb1 Add CCCameraBackgroundBrush 
including Color, Depth, SkyBox brushes

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
 2015-08-21 10:43:59 +08:00
ZhangMenghe 1bcc2dec37 Notification effect enhancement 2015-08-21 10:20:59 +08:00
pandamicro f377a9bff1 Merge pull request #13491 from zilongshanren/v3.8 
add RadioButton and RadioButtonGroup event type
 2015-08-21 09:17:46 +08:00
Dale Stammen c47de9d04f make new render surface current after device lost 2015-08-20 13:26:03 -07:00
Dale Stammen d55bc653e0 update c++ debug info settings 2015-08-20 13:25:17 -07:00
andyque 15156a015a add RadioButton and RadioButtonGroup event type 2015-08-20 22:49:42 +08:00
pandamicro c6c1b429c6 Merge pull request #13489 from jianglong0156/fixwin32textureCacheTest 
fix texturecache didn't show correctly in win32
 2015-08-20 22:39:01 +08:00
jianglong0156 895c29efe4 fix texturecache didn't show correctly in win32 2015-08-20 18:11:05 +08:00
pandamicro 81ca089d27 Merge pull request #13479 from liamcindy/V3.8_reader 
fix object size error while data is error
 2015-08-20 18:09:28 +08:00
pandamicro 7bd5cc4e34 Merge pull request #13486 from fusijie/fix_11677 
Fixed SpriteProgressToRadialMidpointChanged bug.
 2015-08-20 18:06:38 +08:00
Liam 788be3016a update annotation 2015-08-20 18:04:49 +08:00
pandamicro a54f01ce2b Merge pull request #13485 from VisualSJ/v3.8-webIndex 
Update Studio js parser
 2015-08-20 18:02:55 +08:00
pandamicro 5ef4f3159e Merge pull request #13487 from jianglong0156/fixopenglErrorSquash 
fix opengl test error
 2015-08-20 17:47:08 +08:00
jianglong0156 10d5b73c7e fix opengl test error 
fix opengl test error, add the condition, when the data type is samewith long, it will reset data
relate pr:#13449
fix open gl show error
 2015-08-20 17:42:26 +08:00
fusijie f133e5a754 Fixed SpriteProgressToRadialMidpointChanged bug. 2015-08-20 17:07:53 +08:00
VisualSj a4fec3a5e0 Update Studio js parser 2015-08-20 17:02:41 +08:00
子龙山人 5b0dcd8a10 Merge pull request #13484 from CocosRobot/update_lua_bindings_1440055948 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-20 15:42:06 +08:00
CocosRobot a3b8423977 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-20 07:39:25 +00:00
子龙山人 f79d2c8a0a Merge pull request #13483 from zilongshanren/fix-lua-ui-v3.8 
[ci skip]add missing ui test in Lua
 2015-08-20 15:28:25 +08:00
andyque 72496ae426 add missing ui test in Lua 2015-08-20 15:25:09 +08:00
pandamicro 13a271d96d Merge pull request #13478 from xiaofeng11/v3.8 
Fix Cocos Studio Bugs
 2015-08-20 14:42:36 +08:00
XiaoFeng 6bdb5431f1 Update code, using condition macro to determine studio or user project 2015-08-20 13:33:48 +08:00
Vincent Yang b4f585732e Add CCDownloader-apple for mac and ios. 2015-08-20 11:35:40 +08:00
Liam aa6f2ec4b6 fix object size error while data is error 2015-08-20 11:27:01 +08:00
XiaoFeng 93f026f8e6 Fix https://github.com/cocos2d/cocos2d-x/issues/9488 2015-08-20 11:18:59 +08:00
XiaoFeng 935b0f006b Fix https://github.com/cocos2d/cocos2d-x/issues/10205 2015-08-20 10:55:30 +08:00
yangxiao 8f81267960 skybox is not transparent 2015-08-19 18:25:34 +08:00
pandamicro 2605865ca6 Fixed #12570: Correct `cc.pIsSegmentIntersect` for lua 2015-08-19 16:21:31 +08:00
XiaoFeng f26509efe4 Fix when picture file used by TMX map file missing or broken, create TMX object will cause program crashed 2015-08-19 14:02:12 +08:00
CocosRobot bf723eab91 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-19 05:55:16 +00:00
子龙山人 4f9a81198b Merge pull request #13456 from WenhaiLin/v3.8-label-globalZOrder 
Fixed `Label::setGlobalZOrder ` is invalid if label create with system font.
 2015-08-19 13:46:00 +08:00
pandamicro 31bc04a301 Merge pull request #13455 from MSOpenTech/v3-win10 
Windows 10 UWP and WP8.1 app certification fixes
 2015-08-19 13:36:29 +08:00
子龙山人 1f735b4f0e Merge pull request #13437 from fusijie/fix_lua_testcase_setPointer_error 
Fixed setVertexAttribPointer luabinding and Test case.
 2015-08-19 11:43:18 +08:00
子龙山人 da9971f04f Merge pull request #13449 from fusijie/fix_JSB_glGetUniformfv 
fixed JSB_glGetUniformfv uniform location is different from index.
 2015-08-19 11:42:36 +08:00
WenhaiLin 827f05c5e1 Fixed `Label::setGlobalZOrder ` is invalid when label create with system font. 2015-08-19 10:22:48 +08:00
fusijie 2dbb4ad50e fixed JSB_glGetUniformfv uniform location is different from index. 2015-08-19 09:53:52 +08:00
Dale Stammen 47b72ba30e Merge branch 'v3' into v3-win10 2015-08-18 11:07:38 -07:00
Dale Stammen 8493365be7 updates to pass Windows App Certification tests 2015-08-18 11:06:47 -07:00
子龙山人 593eb0737f Merge pull request #13440 from WenhaiLin/v3.8-rc0 
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
 2015-08-18 17:06:37 +08:00
WenhaiLin 6bf15885b8 Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters. 2015-08-18 15:42:05 +08:00
fusijie 223d5a7a5c fix copy construct & assignment operator memory leakage. 2015-08-18 14:48:16 +08:00
fusijie a799c99b1a fix setVertexAttribPointer luabinding 2015-08-18 11:46:45 +08:00
pandamicro d2bc03f80f Merge pull request #13424 from WenhaiLin/v3.8-rc0 
Label:Fixed display not as expected(Redmine issue:22133).
 2015-08-18 10:00:36 +08:00
Dale Stammen ee7b9377de removed old wp8 code that breaks Win10 WACK tests 2015-08-17 18:40:07 -07:00
Vladimir Perminov 24d06bb1c9 More use StringUtf8ToWideChar and PlatformStringFromString 2015-08-17 23:04:05 +03:00
CocosRobot 24a63e12ec [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-17 15:08:00 +00:00
pandamicro 81d5a8377f Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError 
Remove duplicate function definition, Add function adaptation
 2015-08-17 22:56:59 +08:00
WenhaiLin 990a25f759 Label:Fixed display not as expected(Redmine issue:22133). 2015-08-17 22:46:19 +08:00
肖峰 0473b08dbb Fix gamenode3d parse failed error 
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
 2015-08-17 22:42:21 +08:00
pandamicro be165ef900 Permit webp image loading 2015-08-17 18:55:53 +08:00
jianglong0156 b19e02bdf6 Remove duplicate function definition, Add function adaptation 2015-08-17 18:18:38 +08:00
pandamicro f2edb1c8f9 Merge pull request #13410 from ZhangMenghe/v3-retinaEffect 
[ci skip] Fix invisiable testcase of effects
 2015-08-17 17:51:04 +08:00
pandamicro e380b0cffa Merge pull request #13415 from VisualSJ/v3-13359 
[ci skip] Update JS parser
 2015-08-17 17:29:12 +08:00
ZhangMenghe eaa5643c7c Fix invisiable testcase of effects 2015-08-17 17:26:25 +08:00
VisualSj c52a81a2c2 Update JS parser 2015-08-17 17:25:17 +08:00
pandamicro f1cbd00b30 Merge pull request #13414 from liamcindy/V3.8_reader 
fix code informal
 2015-08-17 17:21:01 +08:00
Liam b40ef51337 fix code informal 2015-08-17 17:16:26 +08:00
pandamicro d0580f09e8 Merge pull request #13383 from geron-cn/3.7.1 
add blendfunc cascade to its skin in BoneNode
 2015-08-17 17:12:04 +08:00
pandamicro 096410a31a Merge pull request #13406 from xiaofeng11/v3_reader_update 
Add BlendFrame supporting to Skeleton Animation
 2015-08-17 17:09:25 +08:00
pandamicro 66d99d392c Merge pull request #13409 from liamcindy/V3.8_reader 
fix userCamera flag error with old version files
 2015-08-17 17:01:59 +08:00
pandamicro 9db78b2bb7 Merge pull request #13407 from liamcindy/v3.8 
fix the skybox display error from editor files
 2015-08-17 16:57:32 +08:00
XiaoFeng 442669d6f1 Remove unused easing data processing in blend frame parsing 2015-08-17 16:19:29 +08:00
Liam e3ac9414f4 fix userCamera flag error with olg version files 2015-08-17 14:37:28 +08:00
geron-cn 008b06c01c set blendfunc cascade to its skin in BoneNode 2015-08-17 13:44:00 +08:00
XiaoFeng 72d21ff810 Update reader, add BlendFrame supporting to Skeleton Animation 
Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.
 2015-08-17 13:05:29 +08:00
Liam 7aa36d14be fix the skybox display error from editor files 2015-08-17 13:04:25 +08:00
子龙山人 8e01326cfa Merge pull request #13387 from WenhaiLin/v3-replace-tab-withSpaces 
Replace tab with spaces
 2015-08-17 11:29:03 +08:00
Vladimir Perminov a16d04fb53 CCUtf8ToUnicode and CCUnicodeToUtf8 deprecated 2015-08-16 13:08:00 +03:00
Vladimir Perminov 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
pandamicro 487c99e632 Merge pull request #13378 from jianglong0156/fixNodeGrid 
[ci skip]add NodeGrid bind
 2015-08-15 21:43:00 +08:00
子龙山人 6d630152c8 Merge pull request #13381 from zilongshanren/fix-radiobutton-disallowselection 
fix RadioButton disallow selection issue.
 2015-08-15 19:20:18 +08:00
江龙 06ab98b0ac improve the comment 2015-08-15 17:04:32 +08:00
WenhaiLin a0c270234b Replace tab with spaces 2015-08-14 21:17:51 +08:00
andyque d45897ec53 fix RadioButton disallow selection issue. 2015-08-14 18:07:13 +08:00
jianglong0156 ae8332eb85 add NodeGrid bind 2015-08-14 17:46:34 +08:00
子龙山人 83de0e798e Merge pull request #13365 from WenhaiLin/v3-label-ignore-r 
Label:ignore '\r' character.
 2015-08-14 17:22:33 +08:00
minggo 1e415a0b5b Merge pull request #13364 from WenhaiLin/v3-Scheduler-eloopfix 
Fixed `Scheduler::update(float dt)` can lead to an infinite loop when the value of `dt` is zero.
 2015-08-14 15:11:09 +08:00
WenhaiLin d855722c20 Fixed `Scheduler::update` can lead to an infinite loop when the value of `dt` is zero. 2015-08-14 15:05:25 +08:00
子龙山人 ac5f8d0f4c Merge pull request #13367 from CocosRobot/update_lua_bindings_1439522923 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-14 11:54:38 +08:00
子龙山人 f36d6a5c8c Merge pull request #13363 from GammaEspeon/v3 
[bugfix] SimpleAudioEngine misreporting whether music is playing when paused/resumed
 2015-08-14 11:54:12 +08:00
CocosRobot 9b003c9cfc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-14 03:34:30 +00:00
WenhaiLin d25decb414 Label:ignore '\r' character. 2015-08-14 11:07:34 +08:00
Ricardo Quesada 5baa90c79e libcurl.h not included in the header to avoid... 
too many dependencies
 2015-08-13 19:28:38 -07:00
James Windiate fa02751e45 fixed whitespace 2015-08-13 19:24:41 -04:00
James Windiate 61a2e0d2ad Added _playing flag switching on pause and resume 
Issue # 13254
 2015-08-13 18:52:32 -04:00
Ricardo Quesada 7047e0fbdb Merge branch 'v3' into downloader_decouple_squash 2015-08-13 11:07:49 -07:00
子龙山人 c4af7b8c45 Merge pull request #13360 from CocosRobot/update_lua_bindings_1439456784 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-13 17:25:26 +08:00
CocosRobot 2de6b4ed4c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-13 09:11:00 +00:00
子龙山人 aa7b96bb40 Merge pull request #13352 from zilongshanren/fixIssue12519 
fix iOS EditBox Chinese input maxLength issue.
 2015-08-13 17:04:19 +08:00
子龙山人 20729e16ae Merge pull request #13349 from yangws/v3 
Fix bug: timer dt time error when interval = 0.
 2015-08-13 17:02:55 +08:00
Ricardo Quesada d2cf4bfc79 Squashed commit of the following: 
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Aug 13 00:13:38 2015 -0700

    Merge branch 'v3' into downloader_decouple

commit 61788a0b34188fed5367cab121817db97198bcd8
Merge: 8c1e211 5e21580
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Aug 12 20:45:12 2015 -0700

    Merge branch 'v3' into downloader_decouple

commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f
Merge: 2ea66af 8d73883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Aug 12 20:42:04 2015 -0700

    Merge pull request #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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Aug 12 09:14:22 2015 -0700

    Merge branch 'v3' into downloader_decouple

commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806
Merge: 9272765 08eeca9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Aug 11 20:11:46 2015 -0700

    Merge pull request #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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Aug 11 10:39:22 2015 -0700

    Merge branch 'v3' into downloader_decouple

commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b
Merge: 5dddbb6 138df42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Aug 11 06:53:48 2015 -0700

    Merge pull request #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 0cbd71f
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 15:49:33 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 0bbc62ee1fbfd107a935131d5d93994e87865afa
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 15:46:55 2015 -0700

        more tests... and works

        but there is huge bug.
        ProgData <vector> needs the position of DownloadUnits <unordered_map>
        but <unordered_map> does not guaranty the order.
        So in my next commit I"ll merge DownloadUnit with ProgressData

    commit 389ed8639a1942f628773616a8e340bc66a0c1d7
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 13:47:07 2015 -0700

        debugging info

    commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 11:47:31 2015 -0700

        sync and async tests working ok

    commit 999fa7a7bfb28565492f47b39caef7f1a079c183
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 11:38:38 2015 -0700

        adding tests

    commit 91ee294942510718400edc0d00d3c744d00339ee
    Merge: 76ab703 7f215e9
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 10:03:50 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 76ab7032d3a21156f05395a021391a16649f755a
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 00:22:20 2015 -0700

        Downloader tests

    commit b65c4dad7089660bfe697c0dab3e9290d1a6d013
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Aug 6 21:34:54 2015 -0700

        compiles on Xcode 7

    commit ec0d66340b8daf0b042d36333dff759cd424f465
    Merge: 878e4b5 0d77838
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Aug 6 11:02:24 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 18:07:02 2015 -0700

        working, yeah!

    commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 17:49:59 2015 -0700

        code is more thread-safe friendly

    commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 16:39:02 2015 -0700

        fixes callbacks

    commit ddab4d753106c6ff11304c1c69739c5611e3f20a
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 15:43:51 2015 -0700

        cleaner code

        runs callbacks in cocos2d thread only if needed

    commit ef75844aaa010633e6e27ae6e69460174460d5c7
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 11:58:04 2015 -0700

        removed weak_ptr<> from ProgressData

        that logic of the code is added in the callbacks

    commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 11:54:07 2015 -0700

        checks whether or not the callbacks are in the cocos2d thread

    commit ae6594a6f866f6b5015ba293db23343887063d2f
    Merge: 4c61069 6831e24
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 10:48:34 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 4c61069a7e0e33fa0332df700cc8df4807178caf
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Aug 4 21:36:50 2015 -0700

        almost there...

        Downloader has std::vector<FILE*> instead of FileDescriptors
        code cleaner...

    commit c34d04a8218d2be5c316e0487e5ac46792bbed76
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Aug 4 20:38:44 2015 -0700

        passes progressData to batch

        no need to alloc memory for each ProgressData

    commit f7e8bbd8b85f214b919bce6118d4158dd6d26368
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Aug 4 17:47:23 2015 -0700

        tidier code and more optimizations

    commit a486dc78aedcf9c6178e490292edd572f8a7b374
    Merge: 4178327 a06421b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Aug 4 14:03:22 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 417832705910a6ebd16a876cd98064ea16f0f45c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Aug 3 18:13:13 2015 -0700

        not finished yet...

        ...but trying to have a common inteface with batched and non-batched
        downloads

    commit 1d0e4652763c2e1511ac102a62defae6c6a89220
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Aug 3 16:29:39 2015 -0700

        ErrorCallback compiles

        starting the batching code

    commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18
    Merge: c180425 8d836da
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Aug 3 10:28:51 2015 -0700

        Merge branch 'v3' into cocos_net

    commit c180425d8181b8e6f53be766d8d2b94f908ae168
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Jul 31 15:35:53 2015 -0700

        More progress on migrating multiple-file downloader

        to the implementation file

    commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Jul 31 14:00:02 2015 -0700

        Dowloader moved to `cocos2d::network`

    commit 14b1d0825106701b5435a266b255f09291b6486b
    Merge: 13cfc8d f744383
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Jul 31 11:13:55 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Jul 31 11:11:45 2015 -0700

        DownloadUnits belong to network

    commit e6e17564ead1fb7f6f7df343b0627a104cd756f8
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Jul 30 12:23:36 2015 -0700

        adds `check for option`

    commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Jul 30 10:37:51 2015 -0700

        Downloader: using URLDownload in one case.

        3 more to go. Not tested yet

    commit 9b26e9cfac425635027189ccab835054b68bc83d
    Merge: 20fe063 253d9c4
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Jul 30 08:35:53 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 20fe0636e36ae7f1da048545b3345f526d5b64de
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Jul 29 17:36:07 2015 -0700

        URLDownload: initial commit

        HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d
        guidelines

        Adds `CCIRULDownload` interface.
        Adds `CCURLDownload` implementation based on libcurl. Not working yet.
        `Downloader` uses `URLDownload` for some of its functions.

        WIP

    commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0
    Merge: e408fe0 642ccac
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Jul 29 14:00:43 2015 -0700

        Merge remote-tracking branch 'cocos2d/v3' into cocos_net

    commit e408fe0b9303813d20bab2f7bf548f3b7af416a6
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Jul 29 13:59:46 2015 -0700

        Adds more files to Xcode project

        ...even if they are not being compiled. Much easier to add missing
        functionality to the rest of the platforms

    commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Jul 29 11:36:57 2015 -0700

        removes unneeded headers
 2015-08-13 00:14:10 -07:00
子龙山人 082caaf3e0 Merge pull request #13342 from WenhaiLin/v3-label-miss-letter 
Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`
 2015-08-13 15:09:54 +08:00
andyque f9385d1604 fix iOS EditBox Chinese input maxLength issue. 
https://github.com/cocos2d/cocos2d-x/issues/12519
 2015-08-13 15:01:14 +08:00
Vincent Yang d333d24177 Fix bug: timer dt time error when interval = 0. 2015-08-13 12:55:07 +08:00
CocosRobot 9fd18f987e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-13 02:53:50 +00:00
WenhaiLin c06994de34 Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)` 2015-08-13 10:29:58 +08:00
minggo bc964e8314 Merge pull request #13335 from pandamicro/v3 
Upgrade Spine runtime
 2015-08-12 18:46:59 +08:00
子龙山人 da9b894494 Merge pull request #13336 from zilongshanren/v3 
[ci skip]merge v3.7.1 back to v3.
 2015-08-12 18:12:25 +08:00
andyque 68a90743c7 Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303 2015-08-12 18:09:32 +08:00
pandamicro cb143963ce Upgrade Spine runtime 2015-08-12 18:07:28 +08:00
子龙山人 a84553ae17 Merge pull request #13311 from WenhaiLin/v3-audio-crashfix 
AudioEngine:Fixed possible crash on iOS/Mac.
 2015-08-12 18:02:00 +08:00
andyque 82f597ce98 Merge branch 'v3.7.1' into v3 
# Conflicts:
#	cocos/scripting/lua-bindings/auto/api/CheckBox.lua
#	cocos/ui/UICheckBox.cpp
#	cocos/ui/UICheckBox.h
 2015-08-12 17:59:50 +08:00
子龙山人 86d674030e Merge pull request #13307 from fusijie/fix_cocostudio_skin_flip 
fix cocostudio skin setfliped.
 2015-08-12 14:34:46 +08: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
andyque 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
pandamicro dbd0b6dd86 Merge pull request #13272 from yangws/bug_21800 
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
 2015-08-12 10:25:30 +08:00
Wenhai Lin b46000287e AudioEngine:Fixed crash cause by multiple threads access into a shared unsynchronized data.[iOS/Mac] 2015-08-11 18:11:59 +08:00
CocosRobot ef41cb27ca [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-11 08:02:58 +00: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
子龙山人 65c4261cc6 Merge pull request #13301 from yangws/bug_21906 
fix bug: #21906 Pause/Resume 's result not correct.
 2015-08-11 15:54:02 +08:00
Vincent Yang bb0a7a8533 fix bug: #21906 Pause/Resume 's result not correct. 2015-08-11 14:28:52 +08:00
Vincent Yang 47ecb246b8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into bug_21906 2015-08-11 14:24:02 +08:00
andyque 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
子龙山人 271ab08b59 Merge pull request #13306 from WenhaiLin/v3.8-label-letter-flipped 
Label:Fixed letter can be flipped.
 2015-08-11 11:05:12 +08:00
子龙山人 f1c252a1a8 Merge pull request #13302 from WenhaiLin/v3.8-CocosBuilderTest-crash 
CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.
 2015-08-11 11:04:54 +08:00
fusijie aa1b1831e9 fix cocostudio skin setfliped. 2015-08-11 10:34:22 +08:00
WenhaiLin eeb4a38715 Label:Fixed letter can be flipped. 2015-08-11 10:06:14 +08:00
CocosRobot aa6ac72405 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-11 01:58:29 +00:00
WenhaiLin 2deeee70d2 CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x. 2015-08-10 22:41:18 +08:00
pandamicro 6bcea5baee Fix issue described in #13284 by reorder state setting and event dispatching 
The real reason of #13284 is that the `_selected` state is set after touch events dispatching.
So I decided to override `onTouchEnded` function to set the `_selected` state.
 2015-08-10 22:27:59 +08:00
Vincent Yang d0a5c02399 fix bug: #21906 Pause/Resume 's result not correct. 2015-08-10 17:58:49 +08:00
Wenhai Lin 2983aed0a9 Label:Fixed crash cause by access an invalid address 2015-08-10 16:50:59 +08:00
pandamicro 1471936c2f Merge pull request #13249 from pandamicro/v3 
Made SocketIO events correctly fired when compile in release mode
 2015-08-10 13:32:09 +08:00
pandamicro 3cc06d3f9b Merge pull request #13267 from yangws/bug_21796 
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
 2015-08-10 12:40:32 +08:00
pandamicro f4440f5613 Merge pull request #13229 from fusijie/fix_13228 
Fixed SpriteBatchNode setFlipped bug.
 2015-08-10 11:53:30 +08:00
pandamicro c54a204bad Synchronize enable state and bright state for Widget 
Fix issue: https://github.com/cocos2d/cocos2d-x/issues/8137
 2015-08-10 07:42:35 +08:00
pandamicro 1f52f0971a Fix CheckBox cross renderer state not updated correctly 
Issue description: When checkbox checked, its renderer adaptation may not be updated.

Reported http://punchbox.info:3000/issues/21630
 2015-08-09 20:57:37 +08:00
CocosRobot 8c76a194fa [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-09 02:32:59 +00: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
pandamicro 99e1e00a5b Merge pull request #13268 from dabingnn/v3_fixCrashOnAndroid 
fix engine crash because of wrong initialisation on some android device
 2015-08-08 19:43:10 +08:00
CocosRobot eb9d1ea205 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-07 22:55:48 +00:00
Ricardo Quesada 789da4edd8 compiles on xcode7 2015-08-07 14:00:18 -07:00
geron-cn 744fd74b3b make skeleton's debugdraw contorls all subbone's debug draw 2015-08-08 00:39:01 +08:00
pandamicro a8c729fb42 Merge pull request #13270 from jianglong0156/fixlabelColordisplay 
[ci skip]fix the node color property can not use
 2015-08-07 17:50:27 +08:00
Vincent Yang 354f64ec51 fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response. 2015-08-07 17:36:35 +08:00
andyque 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
jianglong0156 2c3b9009cb fix the node color property can not use 
code example:
````
node.color = xxxx // fix it
````
 2015-08-07 17:26:35 +08:00
Huabing.Xu ba02d9df1d fix engine crash because of wrong initialisation on some android device 2015-08-07 16:37:41 +08:00
Vincent Yang 56204dbef9 Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable. 2015-08-07 16:30:22 +08:00
geron-cn e1108c594c Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp
 2015-08-07 15:48:33 +08:00
geron-cn c7bc84e19b fix crash when BoneNode destruct after skeleton destructed. 2015-08-07 15:41:31 +08:00
geron-cn c6bc81d420 add destruct 2015-08-07 13:13:48 +08:00
geron-cn c569e70aea fix BoneNode::visit for visit other node that is not a BoneNode or SkinNode 2015-08-07 11:44:06 +08:00
geron-cn 7b572bed9d Fix crash when call removeChild from a bone which is already removed. 2015-08-07 09:37:18 +08:00
andyque 211dde38e9 Fix improper touch intercept event propagation. 
When the container widget is disabled, it shouldn't intercept touch.

https://github.com/cocos2d/cocos2d-x/issues/8316
 2015-08-06 22:50:53 +08:00
pandamicro 934764af83 Merge pull request #13250 from xiaofeng11/v3.7.1 
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
 2015-08-06 22:23:40 +08:00
geron-cn 3ae3020d61 fix crash when fore call remove child bone from a bone which already removed from a skeleton. 2015-08-06 19:43:11 +08:00
XiaoFeng 91c88ec535 Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247 2015-08-06 18:12:08 +08:00
pandamicro 0d778386f4 Merge pull request #13208 from dabingnn/v3_fixViewportCompile 
Make viewport constructor more compile friendly
 2015-08-06 17:45:23 +08:00
pandamicro a170b1caf1 Made SocketIO events correctly fired when compile in release mode 
Fixed https://github.com/cocos2d/cocos2d-x/issues/13248

Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode.

Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually.

I also did the following in this commit:

- Correct the coding style in jsb_socketio.cpp
- Remove android.mk in the Xcode project
 2015-08-06 17:20:04 +08:00
Liam 34000f4bde fix particle3d crash with error file 2015-08-06 15:13:54 +08:00
子龙山人 41afa9695c Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost 
Spaces should not be lost if label created with Fingerpop.ttf
 2015-08-06 11:01:35 +08:00
fusijie 9b148b08cd Fixed SpriteBatchNode setFlipped bug. 2015-08-06 10:53:22 +08:00
Vladimir Perminov 8585120abb glfwCreateWindow not guarantee create 
Need check glfwCreateWindow and show info, if there is a problem
 2015-08-05 23:06:16 +03:00
Vladimir Perminov 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
WenhaiLin e81d5af12d Spaces should not be lost if label created with Fingerpop.ttf 2015-08-05 23:46:41 +08:00
geron-cn ee6253319a delete useless code 2015-08-05 23:07:42 +08:00
pandamicro 881adf6f36 Merge pull request #13217 from jianglong0156/fixTextFieldBug 
fix textfield and editbox can not input emoticon
 2015-08-05 17:41:19 +08:00
Jeff Wang bbf7e994e7 Improved EditBox implement for platform win32 2015-08-05 17:33:54 +08:00
子龙山人 47fe470647 Merge pull request #13213 from jianglong0156/improUtfFunction 
add api getStringUTFCharsJNI newStringUTFJNI
 2015-08-05 17:26:52 +08:00
jianglong0156 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
pandamicro dae4385b61 Merge pull request #13214 from pandamicro/skeleton-fix 
Make BoneNodes ordered in Skeleton
 2015-08-05 16:36:18 +08:00
geron-cn 9980397081 Make BoneNodes ordered in Skeleton 
1. Order skins differently than bones and draw them with unified local z order
2. Check children has been remove when its ansester remove
3. Checkout cocos2d::map exists iter before remove

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13191
 2015-08-05 16:33:32 +08:00
jianglong0156 9a257d8136 fix lua pai error 2015-08-05 16:15:22 +08:00
jianglong0156 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
WenhaiLin 2c220092e6 Fixed FontAtlasCache::purgeCachedData might cause crash. 2015-08-05 14:12:02 +08:00
Huabing.Xu 5f9a3b97fb fix viewport constructor error in old compiler to make it more compatible. 2015-08-05 10:57:27 +08:00
pandamicro 8cdcade07a Merge pull request #13186 from jianglong0156/addEmotionTest 
fix getStringUTFChars bug
 2015-08-05 10:19:19 +08:00
WenhaiLin b9edd6fc29 Fixed transform 2015-08-05 00:21:06 +08:00
WenhaiLin 2363622a67 Label:support auto batch with bitmap font or char map. 2015-08-04 21:49:14 +08:00
jianglong0156 3230ca154d improve the code. fix network error 2015-08-04 16:42:16 +08:00
jianglong0156 00b7e98c89 improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak. 2015-08-04 16:24:08 +08:00
VisualSj b9b565e64a Update JSON parser 2015-08-04 16:04:35 +08:00
pandamicro 744fa0b565 Merge pull request #13194 from VisualSJ/v3-boneTest 
[ci skip] Update JSON parser
 2015-08-04 15:35:27 +08:00
VisualSj 04465ac4f4 Update JSON parser 2015-08-04 15:15:46 +08:00
pandamicro b9602127a4 Merge pull request #13187 from xiaofeng11/v3.7.1 
Remove file error notice label from TextBMFontReader
 2015-08-04 13:38:17 +08:00
XiaoFeng 0f90999419 Remove file error notice label from TextBMFontReader to keep consistency with other components 2015-08-04 11:45:29 +08:00
jianglong0156 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
pandamicro d20052cc22 Fix line wrapper in CCDevice 2015-08-04 11:07:04 +08:00
pandamicro f9249f0e49 Merge pull request #13180 from sridher/mac_dpi_fix 
getDPI for Mac Implemented
 2015-08-04 10:49:14 +08:00
fusijie 8d2da20e5f fix spelling mistake. 2015-08-04 09:36:33 +08:00
pandamicro 25cb0d2896 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	web
 2015-08-03 19:47:56 +08:00
pandamicro 6d3a00ad67 Merge pull request #13173 from geron-cn/3.7.1 
fix bug: crash when use bone after erase it form Vector.
 2015-08-03 19:45:54 +08:00
Sridher Jakku f48a9fb9f0 getDPI for Mac Implemented 2015-08-03 17:12:52 +05:30
CocosRobot 3e71ce33c8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 10:09:10 +00:00
pandamicro 4b7b85f113 Merge pull request #12889 from fusijie/fix_clippingRectangle_bug 
remove CCClippingRectangleNode transform error support.
 2015-08-03 18:01:01 +08:00
geron-cn e4c47c811f remove EMSCRIPTEN draw 2015-08-03 16:53:08 +08:00
geron-cn cfc8da579f fix bug: crash when use bone after erase it form Vector. move the operation after erase, make sure bone ref* is not realeaed 2015-08-03 16:47:54 +08:00
pandamicro f10994c20b Merge pull request #12467 from MagicTavern/v3_fix_websocket 
fix a problem where WebSocket messages may pile up
 2015-08-03 16:25:56 +08:00
CocosRobot dbb8792630 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 07:46:25 +00:00
pandamicro b13fddb18e Merge pull request #13162 from super626/v3 
Terrain: Add light map support
 2015-08-03 15:37:42 +08:00
yangxiao fc4c25c51e add comment 2015-08-03 13:30:30 +08:00
CocosRobot 167f9adca8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 05:09:11 +00:00
pandamicro 702e667143 Merge pull request #13152 from zilongshanren/addVerticalPageView 
add PageView vertical scroll support
 2015-08-03 13:00:48 +08:00
andyque 2427c15b60 modify vertical scroll direction 2015-08-03 11:38:23 +08:00
pandamicro 330eaf5239 Merge pull request #13161 from xiaofeng11/v3.7.1 
Fix 3d particle can not show in simulator
 2015-08-03 11:11:39 +08:00
fusijie aaa5793b86 add IF-CASE to fix debug draw under SpriteBatchNode. 2015-08-03 10:47:58 +08:00
yangxiao b6774a5f44 fix warning 2015-08-03 10:27:57 +08:00
yangxiao 929cd4fbfe set default value for _lightDir 2015-08-03 10:12:04 +08:00
yangxiao 8a6c49b5a3 merge cocos 2015-08-03 09:54:29 +08:00
XiaoFeng 17a5d07183 Fix 3d particle can not show in simulator 2015-08-03 09:53:16 +08:00
CocosRobot c281630fa6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 00:13:29 +00:00
pandamicro 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
andyque 63822566d2 refactor PageView implementation 2015-08-01 23:33:25 +08:00
CocosRobot 29208156d9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-01 13:23:21 +00:00
pandamicro 46bb4f8aae Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404 
Constructed with3d
 2015-08-01 21:15:08 +08:00
jianglong0156 5d281d45ef recover the physics3DShape initHeightfield api 2015-08-01 18:29:48 +08:00
pandamicro 00a3d572d1 Merge pull request #12899 from super626/v3 
Animate3D Callback and Bug fix
 2015-08-01 18:24:05 +08:00
andyque 5f34c1f072 add PageView vertical scroll support 2015-08-01 18:18:46 +08:00
jianglong0156 69040ef472 add Physics3DHingeConstraint support constructor 
add Physics3DSliderConstraint support constructor
add Physics3DConeTwistConstraint support constructor
add Physics3D6DofConstraint support constructor
add PhysicsSprite3D support constructor
 2015-08-01 16:18:00 +08:00
jianglong0156 bcec599993 Merge branch 'v3' into constructedWith3D_3#12404 2015-08-01 15:38:26 +08:00
pandamicro 0ca48a32f5 Merge pull request #13110 from WenhaiLin/v3.8-label-cropped-fix 
Label:Fixed the edge of character may be cropped.
 2015-08-01 15:36:47 +08:00
pandamicro f995ed8634 Merge pull request #13079 from zilongshanren/v3.7.1 
fix Mac system font crash issue
 2015-08-01 15:27:36 +08:00
CocosRobot 90d578c6e5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-01 02:16:33 +00:00
pandamicro d52a5da1d8 Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404 
Constructed with3d
 2015-08-01 10:09:08 +08:00
pandamicro 3bdc7e4e1e Merge pull request #13138 from fusijie/fix_spritepolygon_setflip 
fix polygon sprite setFlipped bug.
 2015-08-01 09:59:25 +08:00
pandamicro f74438372c Merge pull request #11293 from perminovVS/v3-dev-screen-size-bug 
GLViewImpl initWithRect bug size
 2015-07-31 18:43:23 +08:00
jianglong0156 dcda083efa rename the initTerrain to initWithTerrainData 2015-07-31 18:35:47 +08:00
jianglong0156 80e812e5a0 add Physics3DShape support constructor 2015-07-31 18:17:35 +08:00
fusijie dcef1e9d31 fix polygon sprite setflipped bug. 2015-07-31 15:49:44 +08:00
pandamicro aa1a3bb6b7 Merge pull request #13137 from yangws/issue_9507 
Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextFie…
 2015-07-31 15:43:46 +08:00
jianglong0156 4439b02a84 rename the init function name 2015-07-31 15:21:54 +08:00
pandamicro 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
CocosRobot 0851363532 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-31 02:06:41 +00:00
pandamicro ede9195d14 Merge pull request #13073 from super626/fixtest 
Bug Fix
 2015-07-31 09:58:14 +08:00
yangxiao fc14efa034 update comment 2015-07-31 09:55:57 +08:00
pandamicro c9d23805e7 Merge pull request #12978 from yangws/issue_12249 
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
 2015-07-31 09:54:38 +08:00
pandamicro 6b9ca70e02 Merge pull request #13051 from yangws/issue_9400 
Fixed #9400 : Widget::setHighlighted does not work after setBright
 2015-07-31 09:50:20 +08:00
pandamicro 16eb88bf57 Merge pull request #13055 from yangws/issue_10082 
Fixed #10082 : Label and Text have different types for fontSize
 2015-07-31 09:49:48 +08:00
pandamicro 94023ebfc5 Merge pull request #13126 from takaken1994/bugfix/remove-using-namespace-from-header 
remove "using namespace cocos2d;" from header file
 2015-07-31 09:28:58 +08:00
CocosRobot c0d6ec1946 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 16:30:01 +00:00
pandamicro 34724e41b2 Merge pull request #13092 from pandamicro/audioengine 
Add AudioEngine js bindings
 2015-07-31 00:22:04 +08:00
pandamicro 3fa016a280 Fix win32 project and add winrt support 2015-07-30 23:39:52 +08:00
takaken1994 93c47390c8 Fix : remove using namespace cocos2d from header file 2015-07-31 00:02:57 +09:00
pandamicro 3524af1ad6 Merge pull request #13059 from geron-cn/3.7.1 
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's vi…
 2015-07-30 20:31:34 +08:00
pandamicro c0066f9afd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine 2015-07-30 20:25:57 +08:00
geron-cn 0955b0f9de fix comment by pandamicro 2015-07-30 19:28:00 +08:00
CocosRobot 56b58a5839 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 10:50:00 +00:00
pandamicro 5aa8647309 Merge pull request #13117 from CocosRobot/update_lua_bindings_1438251761 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-30 18:45:15 +08:00
pandamicro 8542f8a7a9 Merge pull request #13067 from pandamicro/scrollviewbar 
Bind UIScrollViewBar
 2015-07-30 18:42:08 +08:00
CocosRobot b167d29a80 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 10:27:28 +00:00
pandamicro 9b5c8d5d12 Merge pull request #12601 from super626/physics3d 
3d physics collider
 2015-07-30 18:19:23 +08:00
yangxiao 8eac67b806 IsTrigger to isTrigger 2015-07-30 18:18:02 +08:00
yangxiao 99a869b588 IsTrigger to isTrigger 2015-07-30 18:14:46 +08:00
jianglong0156 113233b8df add Camera support constructor 2015-07-30 18:00:51 +08:00
pandamicro 507a094653 Merge pull request #13108 from jianglong0156/constructedWith3D#12404 
improve jsval_to_physics3DRigidBodyDes
 2015-07-30 17:58:16 +08:00
CocosRobot ef7318cf00 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 09:23:06 +00:00
jianglong0156 b016b642ce add Terrain support constructor 2015-07-30 17:17:57 +08:00
pandamicro 39721c6eb6 Merge pull request #13105 from fusijie/fix_10487 
fix Sprite/Label/FastTMX auto-culling bug.
 2015-07-30 17:12:37 +08:00
Wenhai Lin bce279c52e Label:Fixed the edge of character may be cropped. 2015-07-30 16:24:47 +08:00
jianglong0156 0f9483a0e3 add SpotLight support constructor 2015-07-30 15:21:35 +08:00
jianglong0156 8d3ceb7ac2 add PointLight support constructor 2015-07-30 15:11:37 +08:00
fusijie 17c7848e62 fix FastTiledMap auto-culling bug. 2015-07-30 15:07:03 +08:00
jianglong0156 52ed2e8d4e add conversion function declare, use to the physics3d auto conversion the data 2015-07-30 14:56:24 +08:00
jianglong0156 b16ee0e45d add file in project file with android, linux wp8.1 (reverted from commit 948628b800) 2015-07-30 14:46:10 +08:00
jianglong0156 73125f46d2 add file in project file with android, linux wp8.1 (reverted from commit 948628b800) 2015-07-30 14:38:20 +08:00
jianglong0156 a1a9e281a3 add conversion cpp file into iOS project (reverted from commit 439bc8a99f) 2015-07-30 14:37:58 +08:00
fusijie f91a58c8ff fix Label auto-culling bug. 2015-07-30 13:59:50 +08:00
CocosRobot 7a73c65208 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 05:53:20 +00:00
子龙山人 cd4d8b7880 Merge pull request #13101 from WenhaiLin/v3.8-label-code-style 
Improve coding style
 2015-07-30 13:44:53 +08:00
pandamicro a011fa4c8a Merge pull request #12852 from super626/issue10242 
fix #10242, reload shader when light number changed
 2015-07-30 12:57:32 +08:00
fusijie ee5e64825a fix Sprite auto-culling bug. 2015-07-30 12:00:57 +08:00
CocosRobot f1adc2ffd2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 03:39:17 +00:00
WenhaiLin 964e7103b5 Improve coding style 2015-07-30 11:33:18 +08:00
子龙山人 c039c7a9bd Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix 
Fixed the content size of Label is incorrect with GLOW effect.
 2015-07-30 11:29:48 +08:00
CocosRobot bd867311f1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 20:42:46 +00:00
Ricardo Quesada 642ccac5dc Merge pull request #12927 from ricardoquesada/spine-2.3 
Adds support for Spine runtime 2.3
 2015-07-29 13:33:15 -07:00
pandamicro f53ba42b3b Fix test issues and Add audio engine to js templates 2015-07-29 21:22:44 +08:00
pandamicro 9972bfb98c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine 
# Conflicts:
#	tests/js-tests/src/NativeTest/NativeTest.js
 2015-07-29 21:01:56 +08:00
pandamicro da4e062614 Add js wrapper for audio engine 2015-07-29 20:47:28 +08:00
VisualSJ 179266240f Update js parser (timelineParser-2.x.js) 2015-07-29 19:49:54 +08:00
Vincent Yang e1d4d22353 Fixed #12692 : UILayout viewing area cutting position calculation error 2015-07-29 18:43:11 +08:00
Liam c93d40869c fix simulator crash when sprite3d resource is error 2015-07-29 16:52:40 +08:00
WenhaiLin a9f27865d3 Fixed the content size of Label is incorrect with GLOW effect. 2015-07-29 16:30:07 +08:00
WenhaiLin 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
CocosRobot 8c642d966f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 07:45:19 +00:00
pandamicro 16b03f0ebe Merge pull request #13065 from pandamicro/widget_onEnter 
Ensure C++ classes onEnter, onExit can be safely override in JS
 2015-07-29 15:36:12 +08:00
andyque 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
tangziwen cee43ccebb update terrain again 2015-07-29 14:32:36 +08:00
子龙山人 a46c4be912 Merge pull request #13039 from WenhaiLin/v3.8-audioengine-preload 
AudioEngine:support callback for preload feature.
 2015-07-29 14:15:05 +08:00
tangziwen e4cf89e1c4 terrain update: can set Light direction manually, set light map, fix a bug which height map is not exist cause crash when destructing. 2015-07-29 13:24:12 +08:00
pandamicro 3089ac302e Refine ui bindings and JS constants 2015-07-29 13:06:49 +08:00
pandamicro 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
pandamicro 4cd0ced683 Merge pull request #12805 from super626/animate3d 
fix #11487 animate3d bugs
 2015-07-29 11:09:03 +08:00
yangxiao 5d677d49bb clamp sin value to -1, 1 2015-07-29 10:35:01 +08:00
pandamicro 81842417c4 Merge pull request #13032 from xiaofeng11/v3 
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
 2015-07-29 09:54:43 +08:00
pandamicro cca95c3c51 Merge pull request #13041 from yangws/issue_10386 
Fixed #10386 : ui::TextField hitTest not working as expected.
 2015-07-29 09:52:06 +08:00
pandamicro dc931db932 Merge pull request #13069 from dmurtagh/debug_draw_patch 
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
 2015-07-29 09:51:43 +08:00
geron-cn fa5d70fc04 add SkeletonNode Nest test case 2015-07-28 23:49:25 +08:00
geron-cn d2de5b1c85 add test case for bug: #13060 and #13005 2015-07-28 19:18:58 +08:00
CocosRobot ac7729332a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-28 10:39:16 +00:00
pandamicro 8e883f9956 Merge pull request #13049 from jianglong0156/constructedWith3D#12404 
Some 3d classes can't be constructed with new in JS
 2015-07-28 18:31:04 +08:00
pandamicro 9fea134de1 Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes 2015-07-28 18:24:03 +08:00
XiaoFeng faee3e7807 Fix parser compatible for layer project file 2015-07-28 18:11:07 +08:00
geron-cn 0275e3b773 fix set visible 2015-07-28 17:25:40 +08:00
CocosRobot c8f2514758 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-28 09:21:06 +00:00
pandamicro 66b21fb2a8 Merge pull request #12972 from yangws/issue_12145 
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
 2015-07-28 17:13:26 +08:00
Wenhai Lin c4112e1ce5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312 2015-07-28 17:02:30 +08:00
jianglong0156 f71f9b2b15 improve the code 2015-07-28 16:32:56 +08:00
geron-cn c9991aea81 fix bug: BoneNode 's debugdraw can not be controlled by ancestor's visible 2015-07-28 16:31:06 +08:00
WenhaiLin 9edd66d4a7 Label:support font that contains GB2312 char map. 2015-07-28 16:28:32 +08:00
pandamicro 89c722ed4b Add script invocation for onEnter, onExit etc in other classes 2015-07-28 16:07:14 +08:00
pandamicro 0d7f1e3672 Reorder the logic of script invocation for onEnter, onExit etc to the beginning of the function 2015-07-28 16:05:47 +08:00
pandamicro 0a31199a5b Fix widget onEnter override in JS may cause infinite recursion 2015-07-28 16:04:28 +08:00
WenhaiLin 102020d831 1.AudioEngine:support callback for preload feature. 
2.AudioEngineThreadPool:Make the number of thread be a fixed number.
 2015-07-28 15:27:07 +08:00
pandamicro 3fa9463ec7 Fix manual bindings for changed API in spine 2015-07-28 15:11:20 +08:00
Vincent Yang c6fc51a2d9 Fixed #10082 : Label and Text have different types for fontSize 2015-07-28 14:48:01 +08:00
XiaoFeng bca6934786 Normalization function names 2015-07-28 14:05:56 +08:00
pandamicro ca54340982 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-28 13:00:10 +08:00
Vincent Yang b92733c402 Add items as protected children. 2015-07-28 11:38:21 +08:00
子龙山人 3a58668d71 Merge pull request #12744 from fusijie/fix_pageturndown 
Fix PageTurn3D
 2015-07-28 11:35:15 +08:00
Vincent Yang 14145e29a8 Fixed #9400 : Widget::setHighlighted does not work after setBright 2015-07-28 11:09:21 +08:00
jianglong0156 439bc8a99f add conversion cpp file into iOS project 2015-07-28 10:48:18 +08:00
jianglong0156 948628b800 add file in project file with android, linux wp8.1 2015-07-28 10:26:45 +08:00
jianglong0156 ec4d53fcf7 add 3d conversion 2015-07-28 10:08:58 +08:00
jianglong0156 d5a6522a37 Merge branch 'v3' into constructedWith3D#12404 2015-07-28 09:59:35 +08:00
Damien 7fb4dabcb7 Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on 2015-07-27 14:46:15 -07:00
jianglong0156 6d83a3cea4 add Physics3DWorld support new 2015-07-27 18:22:56 +08:00
jianglong0156 cb2b427eed add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp 2015-07-27 18:19:10 +08:00
fusijie 651d877e28 set minimum display length to 1. 2015-07-27 17:55:32 +08:00
Vincent Yang 19b3822d87 Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextField::setString 2015-07-27 17:25:48 +08:00
Vincent Yang 2f996b24ef Fixed #10386 : ui::TextField hitTest not working as expected. 2015-07-27 16:59:35 +08:00
jianglong0156 9c6b5730d0 add Physics3DPointToPointConstraint support new 2015-07-27 16:02:13 +08:00
jianglong0156 1be5981d6a add Physics3DComponent support new 2015-07-27 14:26:50 +08:00
XiaoFeng f410fcd737 Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968 2015-07-27 11:55:18 +08:00
jianglong0156 4005ef6588 add skybox support new 2015-07-27 11:19:17 +08:00
CocosRobot d9b5ce8d28 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-27 03:17:29 +00:00
CocosRobot e986aac617 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-27 03:14:03 +00:00
子龙山人 bd0bdae530 Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine 
Label:refine the implementation about text layout and support debug draw.
 2015-07-27 11:10:31 +08:00
jianglong0156 48147ff08a add the Animate3D and Animation3D js implements 2015-07-27 10:53:34 +08:00
dualface bd39247192 Add Luabinding conversions for std::map<std::string, std::string> 2015-07-26 07:40:34 +08:00
pandamicro 5be905c181 Merge pull request #13017 from pandamicro/v3.7.1 
[ci skip] Release docs for v3.7.1
 2015-07-25 15:17:52 +08:00
pandamicro a2a32ef58c Release docs for v3.7.1 2015-07-25 15:16:39 +08:00
pandamicro 33007e832f Merge pull request #13014 from CocosRobot/update_lua_bindings_1437802542 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-25 13:40:55 +08:00
CocosRobot f7fced7b70 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-25 05:40:05 +00:00
pandamicro fba892f4aa Merge pull request #13002 from VisualSJ/v3.7.1-12940 
[ci skip]Issue #12940: Fixed a bug that is removing SimpleAudio play
 2015-07-25 13:20:27 +08:00
pandamicro 4fdfbd05c4 Merge pull request #13005 from geron-cn/3.7.1 
fix bug:use wrong _modelviewTransform in director to draw bone
 2015-07-25 09:53:38 +08:00
pandamicro fa46a0abb4 Merge pull request #12992 from yangws/v3.7.1 
Fixed #12962 : Scene can't have std::vector member.
 2015-07-25 09:52:00 +08:00
Ricardo Quesada 76982dac89 updates cocos2d version 2015-07-24 15:53:18 -07:00
pandamicro 09d8b8829e Merge pull request #13006 from MSOpenTech/v3.7.1-winrt 
v3.7.1: added missing cocostudio files to Win10 libcocos2d project
 2015-07-24 23:43:21 +08:00
pandamicro a666658764 Merge pull request #12998 from pandamicro/v3.7.1 
Add BoneNode/SkeletonNode/SkinNode JS bindings
 2015-07-24 23:42:38 +08:00
WenhaiLin b1bd8338aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312 2015-07-24 21:30:28 +08:00
pandamicro 05bb775438 Sync timelineParser and fix issue 2015-07-24 20:16:56 +08:00
pandamicro 54330576e6 Fix JS binding issues for skeleton animation 2015-07-24 20:16:01 +08:00
geron-cn a4b6f4d103 Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 2015-07-24 19:51:45 +08:00
Dale Stammen 8940eb829f added missing cocostudio files 2015-07-24 04:48:14 -07:00
geron-cn a5d41aac0d fix bug:use wrong _modelviewTransform in director to draw bone 2015-07-24 19:48:05 +08:00
WenhaiLin 37a174ee4a Label:refine the implementation about text layout and support debug draw 2015-07-24 18:38:45 +08:00
VisualSj cf70cb9c40 Issue #12940: Fixed a bug that is removing SimpleAudio play 2015-07-24 17:41:01 +08:00
VisualSj 2b05ca731c Issue #12941: Fixed a bug that is ccs.Skin ctor error in jsb 2015-07-24 17:34:04 +08:00
Vincent Yang 20fe1fb1a8 Fix bug: app will crash if move mouse over window when launching. 2015-07-24 16:41:03 +08:00
yangxiao 92ec9ab5f2 add config loaded event 2015-07-24 16:38:30 +08:00
pandamicro 29b9ed685f Add BoneNode/SkeletonNode/SkinNode JS bindings 2015-07-24 15:48:34 +08:00
geron-cn 4327e4a532 remove include SkinNode.h in cpp 2015-07-24 12:31:45 +08:00
geron-cn 0b09fd5bcb Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
 2015-07-24 11:38:09 +08:00
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
pandamicro 5ffa8efee6 Merge pull request #12977 from chengstory/OptimizationExtensionData 
Optimization extension data
 2015-07-24 11:01:56 +08:00
geron-cn 3341fa0f85 fix the vars' initialize in construct func, and remove using namespace 2015-07-24 10:28:10 +08:00
zhangcheng be08de6780 Update libcocos2d_8.1 vs project. 2015-07-24 09:32:39 +08:00
Ricardo Quesada 1ea690893a Merge pull request #12990 from ricardoquesada/xcode7_compiles_and_run 
compiles and runs on Xcode 7
 2015-07-23 16:04:48 -07:00
Ricardo Quesada 2deb492d36 compiles and runs on Xcode 7 2015-07-23 14:28:23 -07:00
Dale Stammen 13149a0bc5 updated version to 3.7.1 2015-07-23 13:26:32 -07:00
Dale Stammen c3935b921c updated version to 3.7.1 2015-07-23 13:02:42 -07:00
Dale Stammen 72427a0a64 updated version to 3.8 2015-07-23 12:46:47 -07:00
Dale Stammen f91e812924 updated version to 3.8 2015-07-23 12:40:36 -07:00
geron-cn 1389fc3d31 some doxygen comments and copyright 2015-07-24 01:30:34 +08:00
pandamicro a15212dc76 Fix indent 2015-07-23 18:00:23 +08:00
gero 2037616a2d Merge pull request #4 from fusijie/3.7.1 
fix compile on iOS/Android/Linux/Win8Universal.
 2015-07-23 17:46:28 +08:00
geron-cn 4d58aa2668 remove setcontentsize in skeletonnode 2015-07-23 17:41:37 +08:00
fusijie e9cbb6b084 fix compile on iOS/Android/Linux/Win8Universal. 2015-07-23 17:32:52 +08:00
Vincent Yang 35040e7bb1 Fixed #12249 : Button touch doesn't work with setScale9Enabled. 2015-07-23 17:27:04 +08:00
zhangcheng 4b8248c015 Optimization of Custom Data. 
replace ComExtensionData to ObjectExtensionData.
 2015-07-23 16:30:23 +08:00
pandamicro 6110700615 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend 2015-07-23 15:25:33 +08:00
geron-cn 7255b5308b config for mac 2015-07-23 15:13:14 +08:00
Vincent Yang 57943b41b1 Fixed #12145 : formarRenderers in RichText doesn’t update container size. 2015-07-23 14:59:24 +08:00
pandamicro 739befdc08 Add audio engine bindings in JSB 2015-07-23 14:43:01 +08:00
geron-cn 16ee74b845 add bonenode to CocoStudio.h 2015-07-23 13:34:11 +08:00
geron-cn 915cefa208 bone node 2015-07-23 11:51:49 +08:00
Vincent Yang 19c8f337da Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have small errors 2015-07-23 11:01:51 +08:00
pandamicro 5b8371aaa2 Merge pull request #12958 from VisualSJ/v3.7.1-bindCallback 
[ci skip] Parse Touch/Click callback in JS Studio parser
 2015-07-23 09:30:40 +08:00
Ricardo Quesada d0ec24679b Merge branch 'v3' into spine-2.3 2015-07-22 15:10:39 -07:00
VisualSj d4900493e2 JS Studio parser (Modify callback method) 2015-07-22 17:56:35 +08:00
VisualSj b282d75346 Parse Touch/Click callback in JS Studio parser 2015-07-22 16:51:44 +08:00
pandamicro 6029ca3edd Merge pull request #12949 from yangws/issue_12906 
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
 2015-07-22 16:17:14 +08:00
pandamicro 741163db40 Merge pull request #12938 from WenhaiLin/v3.8-deps70 
Update deps for support FullType.
 2015-07-22 15:42:13 +08:00
pandamicro e0e5ae9d99 Merge pull request #12924 from liamcindy/SkyBox_3.7.1 
update for Game3DNodeReader & UserCameraReader
 2015-07-22 15:34:18 +08:00
VisualSj 1496224c6d Add cc.affineTransformConcatIn 2015-07-22 15:21:13 +08:00
子龙山人 bb9500769f Merge pull request #12885 from zilongshanren/add-jumpToPage-api 
Fix PageView scrollToPage bug and the curPageIndex bug
 2015-07-22 15:01:57 +08:00
Liam d8155a20ae update for code format 2015-07-22 14:11:20 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
XiaoFeng fcd7388936 Synchronize skybox parser with C++ version 2015-07-22 09:45:35 +08:00
pandamicro 25dff88ff4 Merge pull request #12922 from xiaofeng11/v3.7-release 
[ci skip]Add Skybox parser to js
 2015-07-22 09:12:38 +08:00
WenhaiLin d0d481fd67 updated version to v3-deps-70 2015-07-21 16:43:47 +08:00
CocosRobot 6630157377 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-21 04:40:43 +00:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
 2015-07-21 11:39:24 +08:00
pandamicro 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
子龙山人 241dd54424 Merge pull request #12921 from yangws/issue_9382 
Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range.
 2015-07-21 10:27:39 +08:00
Ricardo Quesada 301b55c686 Adds support for Spine runtime 2.3 2015-07-20 10:39:34 -07:00
pandamicro 641ff2abf4 Merge pull request #12914 from WenhaiLin/v3.8-label-bmfont-opacity 
Label:Fixed opacity setting is invalid with bitmap font.
 2015-07-20 18:02:49 +08:00
Vincent Yang cb5e2d59c3 Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range. 2015-07-20 17:50:02 +08:00
CocosRobot 0a23e4a305 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-20 07:08:12 +00:00
pandamicro 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
andyque c4d8ebc780 add Two APIs to Node. 
1. add getNodeToParentTransform(Node* ancestor)

2. add getNodeToParentAffineTransform(Node* ancestor)
 2015-07-20 13:49:23 +08:00
Vincent Yang 14a419d725 Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after activity recreate. 2015-07-20 11:14:06 +08:00
WenhaiLin 63326c2826 Label:Fixed opacity setting is invalid with bitmap font. 2015-07-20 11:10:17 +08:00
子龙山人 87fd0d55ad Merge pull request #12898 from WenhaiLin/v3.8-systemfont-invisible-fix 
Label:Fixed system font may be invisible when there are multiple cameras.
 2015-07-20 10:24:21 +08:00
子龙山人 b6aa3960d2 Merge pull request #12848 from Mazyod/v3 
Improving iOS EditBox Implementation
 2015-07-18 23:21:27 +08:00
子龙山人 c4fa3ac6c6 Merge pull request #12901 from Mazyod/mac-editbox-cleanup 
Mac EditBox cleanup:
 2015-07-18 23:14:05 +08:00
Mazyad Alabduljaleel fa284bc2db headers and whitespace 2015-07-17 18:05:42 +03:00
子龙山人 45cd7cf681 Merge pull request #12501 from namezero111111/patch-6 
Circle shape debug draw bug
 2015-07-17 22:53:53 +08:00
Mazyad Alabduljaleel 2bb26e31d0 simplify CGRect math 2015-07-17 17:38:16 +03:00
Mazyad Alabduljaleel 54f52dac80 reduce header exposure 
this is important, so we know that this class is only used in one place
 2015-07-17 17:37:15 +03:00
Mazyad Alabduljaleel 32c5be84b8 weird, how did this slip 2015-07-17 17:15:41 +03:00
Mazyad Alabduljaleel d8b7b1d565 Mac EditBox cleanup: 
+ Reduce header clutter
+ consistent property access and overall code style
+ cleanup extra code
 2015-07-17 17:12:09 +03:00
Mazyad Alabduljaleel 7861bfd403 Final touch ups: 
- group textfield delegate methods
- remove unused code
 2015-07-17 16:25:45 +03:00
yangxiao beda48124c merge cocos 2015-07-17 17:54:00 +08:00
WenhaiLin 731de26795 Label:Fixed system font may be invisible when there are multiple cameras. 2015-07-17 17:45:11 +08:00
yangxiao ef49e5a169 merge cocos 2015-07-17 17:43:32 +08:00
子龙山人 0ea8dca299 Merge pull request #12881 from WenhaiLin/v3.7-label-gb2312 
Label:support font that contains GB2312 char map.
 2015-07-17 17:33:52 +08:00
Wenhai Lin 66dadea0cd Rollback log level 2015-07-17 15:56:51 +08:00
子龙山人 c82cf5ecd4 Merge pull request #12891 from fusijie/refine_HttpAsynConnection 
refine NSLog in HttpAsynConnection in release mode.
 2015-07-17 15:29:55 +08:00
fusijie 2c5e2db6b4 refine NSLog in HttpAsynConnection in release mode. 2015-07-17 14:23:51 +08:00
fusijie d828c030cb remove CCClippingRectangleNode transform error support. 2015-07-17 11:56:23 +08:00
子龙山人 89e5307f0c Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color 
Label:Fixed the color of letter will be overridden by fade action.
 2015-07-17 11:29:58 +08:00
yangxiao bf20145e35 animate3d callback and test 2015-07-17 11:08:27 +08:00
andyque c9ca8d9ce8 fix PageView cur index issue 2015-07-17 10:39:01 +08:00
子龙山人 0b0b25c517 Merge pull request #12872 from zilongshanren/remove-emscript-code 
remove EMSCRIPTEN related code
 2015-07-17 10:08:34 +08:00
WenhaiLin f0b29814c3 Label:support font that contains GB2312 char map.[android] 2015-07-16 21:35:10 +08:00
WenhaiLin a6f8031af9 Label:support font that contains GB2312 char map.[except android] 2015-07-16 17:10:05 +08:00
pandamicro 65f647ce00 Merge pull request #12879 from pandamicro/v3.7-release 
[ci skip] Update versions and docs for v3.7
 2015-07-16 16:55:24 +08:00
pandamicro e2068ab84a Update versions and docs for v3.7 2015-07-16 16:53:43 +08:00
andyque 96f6c44281 fix auto scrolling and curPageIdx issue 2015-07-16 16:50:47 +08:00
CocosRobot f2567f498c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 08:22:58 +00:00
pandamicro b094367c94 Merge pull request #12874 from pandamicro/v3.7-release 
Remove cleanup from auto bindings add made it support override in JS
 2015-07-16 16:15:26 +08:00
子龙山人 a72ea73e60 Merge pull request #12863 from fusijie/fix_polygonsprite_setColor 
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
 2015-07-16 14:51:06 +08:00
pandamicro 949eca2846 Improve some manual binding code 2015-07-16 14:34:14 +08:00
andyque 7c665e6447 remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08:00
pandamicro 490d5a3747 Remove cleanup from auto bindings add made it support override in JS 2015-07-16 14:09:26 +08:00
WenhaiLin d5d5af5ac3 change ‘auto’ to ‘auto&&’ 2015-07-16 14:08:59 +08:00
CocosRobot 8442fe5f89 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 06:04:17 +00:00
子龙山人 40f4e0b27b Merge pull request #12864 from zilongshanren/add-jumpToPage-api 
add setCurPageIndex API to PageView.
 2015-07-16 13:56:05 +08:00
pandamicro 0b1d105803 Merge pull request #12870 from VisualSJ/v3.7-release-parser 
[ci skip] Fixed parser's bug
 2015-07-16 13:04:06 +08:00
VisualSj 0bb385f37c Check texture for existence 2015-07-16 11:54:45 +08:00
andyque 517221a0df add jumpToPage API to PageView. 
1. This commit also fix the default font size issue in ui::Button.
 2015-07-16 11:33:57 +08:00
VisualSj ef70e1f996 Fixed a bug that is Armature parser 2015-07-16 10:30:22 +08:00
WenhaiLin 1c9a181c35 Label:Fixed the color of letter will be overridden by fade action. 2015-07-15 20:17:05 +08:00
songchengjiang 282dc23bb2 modify interfaces of Animate3DCallback 2015-07-15 17:34:14 +08:00
pandamicro bcd20b1bf0 Merge pull request #12861 from pandamicro/v3 
Sync Cocos2d-x v3.7 RC1
 2015-07-15 17:16:44 +08:00
Jacky e4b392d4c8 fix polygon sprite setColor, setOpacity, setTexture, setTextureRect. 2015-07-15 16:27:29 +08:00
CocosRobot be71b6d563 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-15 08:23:23 +00:00
pandamicro 99e504e668 Merge pull request #12854 from yangws/issue_11310 
fixed #11310 : multiple camera case utils::captureScreen bug.
 2015-07-15 15:00:29 +08:00
pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	docs/RELEASE_NOTES.md
	web
 2015-07-15 14:39:40 +08:00
andyque 2f31f6baa6 fixed Scale9Sprite gray state issue. 
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.

This commit reset the shader state.
 2015-07-15 14:35:13 +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
Jacky a204b02668 fixed renderTexture switch foreground to background issue. 2015-07-15 13:47:10 +08:00
CocosRobot 4b418fe823 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-15 05:46:42 +00:00
Vincent Yang 7a105ce1e1 fixed #11310 : multiple camera case utils::captureScreen bug. 2015-07-15 12:09:08 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
yangxiao 69e79ed164 fix #10242, reload shader when light number changed 2015-07-15 11:36:53 +08:00
songchengjiang 6c83e8d81c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2015-07-15 11:13:27 +08:00
pandamicro c126aac35f v3.7 rc1 release doc 2015-07-14 23:21:34 +08:00
Mazyad Alabduljaleel 008a5ef89c replaced tabs with whitespace 2015-07-14 16:34:11 +03:00
Mazyad Alabduljaleel 6f8bc04934 First commit for improving iOS EditBox 
+ Moved internal stuff to the implementation file
+ Added pragma and organized methods
+ cleanup synthesize, instance variables, and overall code style for ObjC
 2015-07-14 16:18:03 +03:00
pandamicro eb56ad6d60 Merge pull request #12836 from pandamicro/v3.7-release 
Fixed #12834 Invoke cleanup function when override in JS
 2015-07-14 17:37:00 +08:00
pandamicro a90a8b12c6 Merge pull request #12840 from pandamicro/path 
[ci skip] Add cc.path.mainFileName
 2015-07-14 16:41:16 +08:00
子龙山人 49b47f576d Merge pull request #12828 from WenhaiLin/v3-label-readability 
Label:improving the code readability.
 2015-07-14 16:38:53 +08:00
子龙山人 7e4e82da2c Merge pull request #12835 from zilongshanren/improve-coding-style 
add more descriptive message to ASSET macro.
 2015-07-14 16:36:59 +08:00
子龙山人 af4442d0d6 Merge pull request #12833 from fusijie/v3 
Fixed setAnimationInterval JNI bug.
 2015-07-14 16:33:39 +08:00
pandamicro 41778f35fb Add cc.path.mainFileName 2015-07-14 16:33:38 +08:00
pandamicro 658fe74141 Merge pull request #12838 from VisualSJ/v3.7-release-parser 
[ci skip] Remove getRes (parser)
 2015-07-14 16:20:42 +08:00
pandamicro efffea5b91 Fixed #12834 Invoke cleanup function when override in JS 2015-07-14 15:35:29 +08:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
VisualSj a9deb6dda5 Remove getRes (parser) 2015-07-14 15:26:13 +08:00
Jacky ea773cac20 Fixed setAnimationInterval JNI bug. 2015-07-14 15:11:35 +08:00
pandamicro 09775d6f2a Ensure backward compatibility 2015-07-14 14:14:36 +08:00
WenhaiLin b701fd9e73 Fixed compile error 2015-07-14 13:47:35 +08:00
WenhaiLin 964713355b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail 2015-07-14 13:43:43 +08:00
CocosRobot 6b9a5b8264 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-14 05:41:48 +00:00
pandamicro 43a5b6f020 Fix jsb loaders issues 2015-07-14 13:40:09 +08:00
子龙山人 616efbf0c3 Merge pull request #12812 from neokim/refactor_scroll_view_bar 
Refactor scroll view bar
 2015-07-14 13:34:07 +08:00
子龙山人 e1ae3631fc Merge pull request #12818 from zilongshanren/v3 
merge v3.7 back to v3
 2015-07-14 13:32:56 +08:00
pandamicro 69a70010cf Merge pull request #12827 from yangws/issue_12668 
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have…
 2015-07-14 12:05:29 +08:00
WenhaiLin d4f62a8063 Label:improving the code readability. 2015-07-14 11:30:56 +08:00
andyque 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
Neo Kim 7882a534c1 Correct the wrong boolean statement and make it easy to read 2015-07-14 11:58:44 +09:00
Vincent Yang 0a6933cc8c Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak. 2015-07-14 10:46:17 +08:00
Vincent Yang 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
Vincent Yang 06bf6ffa90 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-14 09:35:01 +08:00
Neo Kim 863c3a0a2a Correct a typo 2015-07-14 10:17:05 +09:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Vincent Yang 74227eaf16 Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test. 2015-07-13 22:44:40 +08:00
CocosRobot 9e60713322 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 14:41:58 +00: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
子龙山人 cdc7e5205b Merge pull request #11995 from MAUSMAUSgames/v3 
using Action::_tag as flag field
 2015-07-13 22:19:03 +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
子龙山人 d1bef4db8d Merge pull request #12369 from Dimon4eg/Fix_crash_cocos2d_log 
Fix crash on Windows if pass string more than 16kb to cocos2d::log
 2015-07-13 22:16:04 +08:00
子龙山人 c151ba89e5 Merge pull request #12774 from WenhaiLin/v3-label-createfail 
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
 2015-07-13 21:58:39 +08:00
CocosRobot 300da3e3fc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 12:57:03 +00:00
pandamicro 8944e932a1 Merge pull request #12786 from WenhaiLin/v3-animation-getCurrentFrame 
Add Animate:getCurrentFrameIndex
 2015-07-13 20:48:01 +08:00
Neo Kim 9757ee4ea8 Refine scroll event dispatching. And add an event to track every move including jump and so on. 2015-07-13 21:28:17 +09:00
Neo Kim 22ea504af8 Add methods to manipulate scroll bar's opacity 2015-07-13 21:28:16 +09:00
Neo Kim f558158667 Use addProtectedChild() instead of addChild() in ScrollViewBar 2015-07-13 21:28:16 +09:00
CocosRobot 8b50c307e5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 09:35:35 +00:00
pandamicro d559971379 Merge pull request #12808 from pandamicro/v3 
Fix CCSprite ; missing
 2015-07-13 17:27:27 +08:00
子龙山人 db71e073dd Merge pull request #12742 from WenhaiLin/v3-audioengine-preload 
AudioEngine:support preload for audio
 2015-07-13 17:06:17 +08:00
Vincent Yang e65b01bdc0 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-13 17:06:01 +08:00
pandamicro 36e1f26570 Fix CCSprite ; missing 2015-07-13 16:44:33 +08:00
yangxiao 8598c5037e fix #11487 animate3d bugs 2015-07-13 16:10:48 +08:00
XiaoFeng a68835733f Add Skybox parser to js 2015-07-13 16:02:19 +08:00
WenhaiLin c95283f563 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-animation-getCurrentFrame 2015-07-13 12:54:02 +08:00
songchengjiang 5a16748273 optimize Animate3DCallback 
add Animate3DCallbackTest
 2015-07-13 11:43:13 +08:00
WenhaiLin 80dff7f1c4 Rollback pr12299 2015-07-13 11:32:25 +08:00
pandamicro 89927c7073 Merge pull request #12782 from xiaofeng11/v3.7-release 
UISliderReader and component update
 2015-07-13 11:05:59 +08:00
pandamicro 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
Vincent Yang 8bc68395de Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586 2015-07-13 11:00:18 +08:00
WenhaiLin dee13756ec Add Animate:getCurrentFrameIndex 2015-07-13 10:40:43 +08:00
Liam c61e09a9e7 update for reader 2015-07-13 10:29:22 +08:00
pandamicro c167e249cd Merge pull request #12790 from pandamicro/shaderNormal 
Use shader with normal while creating mesh with normals
 2015-07-12 21:47:05 +08:00
WenhaiLin 142d354485 [ci skip]Replace tab with spaces. 2015-07-10 21:03:43 +08:00
WenhaiLin b459940bb8 [ci skip]Replace tab with spaces. 2015-07-10 20:47:21 +08:00
WenhaiLin c68469a611 Update Nibiru SDK. 2015-07-10 20:42:05 +08:00
CocosRobot 0e8a3f14f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-10 09:11:50 +00:00
子龙山人 3adecedcee Merge pull request #12776 from fusijie/refine_capture 
CaptureScreen save in thread.
 2015-07-10 17:03:18 +08:00
XiaoFeng 92d78efce0 Fix percentage setting won't effect when UISlider's background resource set to null 2015-07-10 17:00:16 +08:00
Vincent Yang 34aa7a0bb1 Remove unused variable. 2015-07-10 16:40:02 +08:00
Vincent Yang 1711a70869 Merge v3 branch. 2015-07-10 16:39:36 +08:00
Vincent Yang 187c72e2b9 [ci skip] replace tab with 4 space. 2015-07-10 16:17:34 +08:00
songchengjiang a1dd466588 modify Animate3D keyFrameCallback 2015-07-10 15:50:09 +08:00
pandamicro c30ce38cb5 Merge pull request #12766 from super626/v3.7-release 
Set default 3d animation quality to low
 2015-07-10 15:35:22 +08:00
pandamicro 2d27091398 Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge 
add write api in FileUtils
 2015-07-10 15:13:21 +08:00
WenhaiLin eca192f7a6 Fixed compile error 2015-07-10 14:43:28 +08:00
WenhaiLin 81bc0b09da Label:Fixed create fail if the font(TTF) not contain a Unicode charmap. 2015-07-10 14:39:21 +08:00
Vincent Yang 52293ad451 Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'. 2015-07-10 14:37:42 +08:00
pandamicro 07fd337052 Merge pull request #12763 from folgerhu/v3.7-release 
CCTMXXMLParser code negligence
 2015-07-10 11:49:30 +08:00
yangxiao c4587ecda1 if has normal use the shader with normal 2015-07-10 11:44:20 +08:00
Jacky 9eb5a1833b fix malloc failed need to call afterCaptured callback. 2015-07-10 11:21:03 +08:00
pandamicro 69cdaca306 Auto add extend to jsb need to extend classes 2015-07-10 09:49:39 +08:00
pandamicro bd5ae151d9 Merge pull request #12735 from yangws/issue_11887 
Fix bug: Need to replace thread unsafe code from TextureCache::addImageAsync
 2015-07-10 09:47:01 +08:00
Vincent Yang 8ff0ac6951 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586 2015-07-10 09:35:41 +08:00
songchengjiang a1956e2210 fix issue#9310 issue#10151 issue#12551 2015-07-09 18:05:47 +08:00
yangxiao 10fe728eee animation quality default to low, do not interpolation 2015-07-09 17:54:21 +08:00
Liam e50fc4f184 merge code 2015-07-09 17:12:48 +08:00
Vincent Yang d9bc8b7c1b fix bug: don't decrease _asyncRefCount correct in addImageAsyncCallback. 2015-07-09 17:06:55 +08:00
folgerhu@sina.com a79586c052 CCTMXXMLParser code negligence 2015-07-09 17:02:12 +08:00
Vincent Yang 02226c6a26 Fix bug: Clipping node doesn't work on Android 5.0. 2015-07-09 16:49:26 +08:00
CocosRobot 2065e5b4a7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-09 07:45:43 +00:00
子龙山人 8e256dcd09 Merge pull request #12718 from WenhaiLin/v3-label-addchild 
Label:Support add child nodes.
 2015-07-09 15:37:49 +08:00
pandamicro a2da5d5f9d Merge pull request #12738 from super626/v3.7-release 
Update tiny obj loader and fix empty textrue
 2015-07-09 14:57:10 +08:00
pandamicro cab670f0ff Merge pull request #12748 from fusijie/refineSetTexture 
refine setTexture.
 2015-07-09 14:56:06 +08:00
WenhaiLin 86a68f5a09 AudioEngine:refine thread pool 2015-07-09 14:31:03 +08:00
VisualSj 9f52b1e6fb Fixed a bug that is SingleNode setColor is null 2015-07-09 11:49:11 +08:00
andyque 7243f2cff5 add const & to string arguments 2015-07-09 11:23:20 +08:00
WenhaiLin 41bc3a1900 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8 
Conflicts:
	AUTHORS
 2015-07-09 11:11:34 +08:00
pandamicro 893d39c543 Merge pull request #12737 from chengstory/FixReaderBug 
Fix cocos reader bug.
 2015-07-09 10:33:45 +08:00
Liam c6ebaa19ec add scene 3d test 2015-07-09 10:19:07 +08:00
Jacky 1dbb2ab17a refine setTexture. 2015-07-09 10:11:15 +08:00
CocosRobot bfe6db174e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-09 01:07:59 +00:00
Jacky 02597eb369 Completed test case and comment. 2015-07-08 22:34:33 +08:00
Wenhai Lin 5d50663c35 AudioEngine:support preload for audio[MAC/iOS] 2015-07-08 18:04:43 +08:00
WenhaiLin 6a33702c80 Refine Label::onDraw 2015-07-08 17:59:24 +08:00
Jacky a59828605b Support TileGrid rectangle. 2015-07-08 17:47:04 +08:00
Jacky 4a9e9f3744 completed api. 2015-07-08 17:26:29 +08:00
andyque d4066a5ff8 improve coding style of Socket.IO 2015-07-08 17:23:48 +08:00
yangxiao 97a17cdc8a program created dummy texture instead of empty texture 2015-07-08 17:00:01 +08:00
zhangcheng 0862d313b2 Fix cocos reader bug. 
Fixes child nodes can't be rendered when particle and TiledMap as parent and their resource have been removed from disk.
 2015-07-08 16:13:38 +08:00
子龙山人 155ac8c07e Merge pull request #11583 from hannon235/v3-update-sio 
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
 2015-07-08 16:11:05 +08:00
Jacky 260ce177d7 refine GridNode with rect. 2015-07-08 15:57:27 +08:00
yangxiao f7cdd7162b adapter according to latest objloader 2015-07-08 15:33:43 +08:00
WenhaiLin 8cf27b9174 Update comments. 2015-07-08 15:30:34 +08:00
jianglong0156 d55c0c64c5 add std::nothrow 2015-07-08 15:19:17 +08:00
Vincent Yang 7f9028b20c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_11887 2015-07-08 15:14:08 +08:00
Vincent Yang 1f8b46e911 Fixbug: Need to replace thread unsafe code from TextureCache::addImageAsync. 2015-07-08 15:13:48 +08:00
子龙山人 3f550ef331 Merge pull request #12663 from xiaofeng11/v3.7-release 
Fix drawLine & drawPoints won't use blendFunc bug
 2015-07-08 14:38:10 +08:00
jianglong0156 7e26c381c6 remove invalid code 2015-07-08 14:36:37 +08:00
子龙山人 2bcd70f681 Merge pull request #12726 from xpol/fixes-warnings-and-related-bug-in-CCSprite 
Fixes some warnings and a related bug in CCSprite.
 2015-07-08 14:12:40 +08:00
yangxiao dac84ade0d index to short 2015-07-08 14:03:53 +08:00
CocosRobot 9638ae628a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-08 05:48:55 +00:00
yangxiao 40b33604d8 adjust objloader to cocos 2015-07-08 13:44:15 +08:00
yangxiao fdd78ef73f update objloader to latest 2015-07-08 13:42:14 +08:00
WenhaiLin b395ef06d8 AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1] 2015-07-08 10:48:20 +08:00
Jacky 06c06a1f03 fix polygon sprite bug. 2015-07-08 10:07:35 +08:00
xpol 8179fe04f0 And more warnings. 2015-07-07 23:10:04 +08:00
xpol 29dcbe6685 Fixes some warnings and a related bug in CCSprite. 
This story tells us that we should not just ignore warnings.
 2015-07-07 23:01:24 +08:00
Neo Kim 160bff8e13 Add a setter for line width in DrawNode 2015-07-07 18:48:02 +09:00
XiaoFeng 1b1af798bc Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release 2015-07-07 17:35:41 +08:00
WenhaiLin 581f1ab42b Add test case 2015-07-07 15:41:54 +08:00
pandamicro 8f0cf8c3e6 Merge pull request #12575 from ywxzm/v3 
fix onTouch begin don't return value
 2015-07-07 14:57:13 +08:00
WenhaiLin 158d96046e Label:Support add child nodes. 2015-07-07 14:20:23 +08:00
pandamicro e717155930 Merge pull request #12715 from VisualSJ/v3.7-release2 
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
 2015-07-07 14:13:31 +08:00
jianglong0156 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
CocosRobot 4a486077c0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-07 06:05:39 +00:00
pandamicro 701df24301 Merge pull request #12698 from VisualSJ/v3.7-release 
[ci skip] Fixed a bug that action texture address error
 2015-07-07 13:57:30 +08:00
子龙山人 f28fbdd0c4 Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view 
Add scroll bar feature into ScrollView
 2015-07-07 13:56:09 +08:00
pandamicro 5970f56e1f Merge pull request #12714 from VisualSJ/v3.7-release2 
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
 2015-07-07 13:55:12 +08:00
子龙山人 a41d3847d5 Merge pull request #12709 from WenhaiLin/v3-37-crash-winfix 
Fixed crash cause by the case of file name on WIN32.
 2015-07-07 13:42:01 +08:00
VisualSj dd0edac171 Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER ) 2015-07-07 13:36:47 +08:00
子龙山人 cdaa994b84 Merge pull request #12711 from yangws/issue_12626 
Fix bug taken from pr12602: scroll view can't scroll if pressed the b…
 2015-07-07 13:33:24 +08:00
Vincent Yang b4559a005b Fix bug taken from pr12602: scroll view can't scroll if pressed the button on it. 2015-07-07 10:42:04 +08:00
andyque 6238ddebf3 Merge remote-tracking branch 'upstream/v3.7-release' into v3 2015-07-07 10:18:43 +08:00
WenhaiLin 4bd1fa7d37 Fixed crash cause by the case of file name on WIN32. 2015-07-07 10:08:47 +08:00
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
子龙山人 a6b29666c9 Merge pull request #12674 from WenhaiLin/v3-38-issue12673 
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
 2015-07-07 09:50:00 +08:00
CocosRobot 4c88db3fb2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-07 00:44:47 +00:00
Ricardo Quesada ad1fc88fa8 compiles on Xcode 7 2015-07-06 16:30:29 -07:00
Ricardo Quesada 4c88be9520 removes -fno-excpetion and -fexception from cmake 2015-07-06 12:09:50 -07:00
CocosRobot a4bce56cca [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-06 10:37:24 +00:00
VisualSj 3b69a1726f Fixed a bug that action texture address error 2015-07-06 17:17:20 +08:00
jianglong0156 6f3b977c1e add UserDefault api deleteValueForKey 2015-07-06 17:01:17 +08:00
XiaoFeng 214684b3be Fix 2015-07-06 16:45:04 +08:00
XiaoFeng 9fab1e7702 Change to use auto & for each to enum sub items 2015-07-06 16:39:00 +08:00
CocosRobot ae860bd6ee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-06 08:29:03 +00:00
子龙山人 17207f14e5 Merge pull request #12689 from fusijie/refine_setAnimationInterval 
Refine setAnimationInterval from double to float.
 2015-07-06 16:18:45 +08:00
Liam 51993d5733 update for reader 2015-07-06 16:14:41 +08:00
XiaoFeng d6fc8ecc94 Fix when use percentage size & position to a UIWidget which parent is a layout component, when change simulator screen size, layout won't effect correctly. 2015-07-06 16:02:19 +08:00
Jacky 4499b60446 Refine setAnimationInterval from double to float. 2015-07-06 14:57:42 +08:00
Neo Kim a01f31c75c Change NULL to nullptr 2015-07-06 15:54:28 +09:00
Liam fff4e2f34c update for reader 2015-07-06 14:05:06 +08:00
Neo Kim c4dc9b04fd Add a guard filtering tries to set same value. 2015-07-06 14:54:28 +09:00
XiaoFeng df2a2d253d Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release 2015-07-06 10:31:09 +08:00
Neo Kim 0ff7aaef95 Modify loop iteration codes 2015-07-06 11:30:24 +09:00
Neo Kim 43308e258a Fix an issue of not releasing Texture instance in ScrollViewBar 2015-07-06 11:29:39 +09:00
Neo Kim a4803c6713 Remove unnecessary commented out code. 2015-07-05 21:30:13 +09:00
Neo Kim 3ab4285960 Refactor code 2015-07-04 16:06:05 +09:00
Neo Kim 6264f7fefb Correct include-related build errors in some platforms 2015-07-04 15:03:05 +09:00
Neo Kim ceeca575f3 Replace 'margin' of scroll bar with 'positionFromCorner' 2015-07-04 14:05:47 +09:00
Neo Kim f667b085b8 Change not to show scroll bar when the scroll view is initiated. 2015-07-04 09:59:22 +09:00
Neo Kim 9548d85f08 Fix radio button group clear issue 2015-07-04 09:57:54 +09:00
Neo Kim 3b6cd4dffc Modify indentation to comply with the convention 2015-07-04 09:56:53 +09:00
Neo Kim 86cbd59bfd Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
Neo Kim 60c32f6fb5 Refactor some codes 2015-07-04 09:56:53 +09:00
Neo Kim ec45be699d Add UIScrollViewBar class documentation 2015-07-04 09:56:52 +09:00
Neo Kim c093bb18e2 Add scroll bar manipulation methods into ScrollView 2015-07-04 09:56:52 +09:00
Neo Kim 9a11cfd496 Add a way of changing scroll bar width 2015-07-04 09:56:52 +09:00
Neo Kim 2cae17b462 Add scroll bar feature into ScrollView 2015-07-04 09:56:52 +09:00
CocosRobot fbf98adc7a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-03 14:48:11 +00:00
pandamicro 38ded61568 Merge pull request #12670 from yangws/issue_8256 
Fixbug: CCTargetedAction executes callback twice.
 2015-07-03 22:34:54 +08:00
CocosRobot 91dc2d22de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-03 10:37:33 +00:00
WenhaiLin c11e91e215 Label:Fixed the characters are displayed incorrect with "dark roast.ttf" 2015-07-03 18:08:32 +08:00
Liam 64b8660873 update for skybox reader 2015-07-03 17:52:42 +08:00
Vincent Yang ca02f167c6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-03 15:43:58 +08:00
Vincent Yang 1abeb8bf1e Fixbug: CCTargetedAction executes callback twice. 2015-07-03 15:42:49 +08:00
pandamicro 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
WenhaiLin 91bc8f2e2d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8 2015-07-03 14:59:12 +08:00
pandamicro 1f48beee1e Reorganize code 2015-07-03 12:55:55 +08:00
XiaoFeng 993e420ce4 Fix drawLine & drawPoints won't use blendFunc bug 2015-07-03 11:30:38 +08:00
pandamicro 155b9b918c Add retain/release for XMLHTTPReqest in JSB 2015-07-03 11:01:43 +08:00
pandamicro 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
pandamicro e7aeb335a3 Merge pull request #12609 from alexpeak/fixCCLabelPurgeResetOrder 
Ensure CCLabel atlases are purged before resetting
 2015-07-02 19:01:50 +08:00
pandamicro ecf7148f85 Merge pull request #12624 from WenhaiLin/v3.8 
AudioEngine:Fixed play audio may fail when switch to new scene on iOS.
 2015-07-02 18:47:44 +08:00
pandamicro e7c6ae7b13 Merge pull request #12637 from super626/skybox 
Set Texturecube tex parameter to clamp to edge
 2015-07-02 18:34:38 +08:00
子龙山人 91a8872cbd Merge pull request #12647 from xiaofeng11/v3.7-release 
UISlider update
 2015-07-02 18:01:38 +08:00
pandamicro dbd72d0123 Merge pull request #12646 from VisualSJ/v3.7-release 
[ci skip] Fixed a bug that is don't analytical frame
 2015-07-02 17:22:13 +08:00
子龙山人 5b971ee93d Merge pull request #12607 from neokim/add_radio_button_and_group 
Add RadioButton and RadioButtonGroup widgets
 2015-07-02 17:12:59 +08:00
Michael Sotnikov 363da2beab Fixed: #12645 iOS: depth/stencil buffers attributes are ignored 2015-07-02 12:07:24 +03:00
XiaoFeng 668dc50e07 Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show 2015-07-02 16:45:17 +08:00
WenhaiLin a28ad6939d Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android. 2015-07-02 16:19:33 +08:00
pandamicro d155d42c0e Merge pull request #12617 from yangws/issue_8194 
Fixbug :EventDispatcher wrong dispatch order
 2015-07-02 14:42:30 +08:00
Sijie.Wang 7818bfcc7a Fixed a bug that is don't analytical frame 2015-07-02 14:30:44 +08:00
Neo Kim 61df7bc827 Add class documentation 2015-07-02 15:20:06 +09:00
Neo Kim ec589c8d6f Correct the wrong comment for lua 2015-07-02 15:19:50 +09:00
Neo Kim 0e35ee597a Add logic for not belonging radio button checking. 2015-07-02 15:01:24 +09:00
pandamicro 079ccbb0e2 Merge pull request #12639 from VisualSJ/v3.7-release 
Fixed a bug that is LayoutComponent position error
 2015-07-02 13:58:15 +08:00
VisualSJ a475caf35a Fixed a bug that is LayoutComponent position error 2015-07-02 11:52:31 +08:00
Neo Kim c4aa5a6274 Remove the code related to becoming parent node of radio buttons. Radio button group is not a parent node of radio buttons anymore. 2015-07-02 11:50:50 +09:00
Neo Kim 6550a9ccc2 Replace all tabs to 4 spaces to comply with the convention 2015-07-02 11:30:14 +09:00
XiaoFeng 9a905ede56 Fix check box front cross texture expand to normal size when change status between normal and disable frequency 2015-07-02 10:29:53 +08:00
Neo Kim 4b2bff4674 Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case. 2015-07-02 11:28:14 +09:00
CocosRobot bf3c970534 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-01 14:12:18 +00:00
pandamicro 3b9fd5502e Fix cc.isArray for JSB 2015-07-01 21:57:39 +08:00
zhang 48c3466774 Update LayerEx.lua 2015-07-01 20:25:45 +08:00
pandamicro a95edbfb65 Merge pull request #12618 from super626/clippingnode2 
Sprite3D Clipping
 2015-07-01 18:56:16 +08:00
pandamicro 6b730b5fbd Merge pull request #12619 from WenhaiLin/v3-37-labelfix 
Label:Fixed the top of character's texture may be tailored if enable outline effect.
 2015-07-01 18:55:04 +08:00
songchengjiang da5e077b55 texture set GL_CLAMP_TO_EDGE 2015-07-01 18:06:17 +08:00
Wenhai Lin c06b5c5570 AudioEngine:Fixed play audio may fail when switch to new scene on iOS. 2015-07-01 17:19:28 +08:00
Vincent Yang cb0e93fc08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest 2015-07-01 14:58:06 +08:00
WenhaiLin 322bd30d7b Label:Fixed the top of character's texture may be tailored if enable outline effect. 2015-07-01 14:57:01 +08:00
Vincent Yang d26c08de46 Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +08:00
pandamicro 2774d6ff1d Merge pull request #12602 from yangws/v3_scene3dtest 
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
 2015-07-01 14:46:35 +08:00
Vincent Yang 276ed46c01 Fixbug : issue 8194. 2015-07-01 14:39:35 +08:00
yangxiao 52daa2234c add setForce2DQueue 2015-07-01 14:24:22 +08:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
pandamicro 4d95c8778b Merge pull request #12598 from shinhirota/v3 
Fixed iOS/JS-Bind callStaticMethod() with bool arg
 2015-07-01 11:34:03 +08:00
Neo Kim a64e50688e Add the new files into CMake and Windows project configurations. 2015-07-01 12:21:42 +09:00
Vincent Yang 96b49277cc [ci skip] add comment for UIWidget::_hittedByCamera. 2015-07-01 11:03:09 +08:00
Alex Peak 5328996a18 Fix event listener cleanup in destructor 
Event listeners should always be removed at destroy (move out of
if-block)
 2015-06-30 18:59:33 -07:00
Alex Peak 7cea464a11 Ensure CCLabel atlases are purged before resetting 
The current purge->reset behavior occurs per label according to scene
graph priority.  This has two disadvanages; firstly, any labels that are
initialized but not part of the scene graph will not be reset.
Secondly, any labels which share atlases in the FontAtlasCache may not
be reset since each label will call releaseFontAtlas individually before
resetting its fontConfig.  This means that any shared atlases may not be
released all the way to a reference count of 0 and the invalid atlas
will not be deleted and reset from scratch.

By putting a fixed priority on both the purge and reset steps we can
ensure that firstly: all labels will be reset regardless of whether they
have been added to the scene-graph.  Secondly, ALL labels with the same
atlas must call releaseFontAtlas before any others are allowed to
rebuild their textures.  This will prevent any old atlases from sticking
around after a new GL context is created.

This is a fix for Github issue #8305
https://github.com/cocos2d/cocos2d-x/issues/8305
 2015-06-30 13:16:25 -07:00
Neo Kim 3f05ad2b98 Replace all tabs to 4 spaces to comply with the convention 2015-06-30 20:31:31 +09:00
Neo Kim f5e7184f0b Add new cpp files into Android.mk 2015-06-30 18:50:13 +09:00
Neo Kim bed90606d3 Add RadioButton feature and a test case for it. 2015-06-30 18:50:13 +09:00
Neo Kim a37015d083 To create radio button feature which uses almost same logic with CheckBox, extract the common logic from CheckBox and make it as AbstractCheckButton class. 2015-06-30 18:50:13 +09:00
子龙山人 40521ad1c4 Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error 
Fix SpriteBatchNode sort error.
 2015-06-30 17:29:59 +08:00
Bin Zhang d0db3aee98 Remove the plugin-x related files from the Xcode project of js-bindings . 2015-06-30 17:28:47 +08:00
子龙山人 077241eecf Merge pull request #12599 from jianglong0156/jsbProjectMerge 
merge the jsb project into cocos2d project
 2015-06-30 17:04:12 +08:00
Bin Zhang bb77101f0b Solve the error when building simulator for android. 2015-06-30 16:45:13 +08:00
子龙山人 d5d68223f1 Merge pull request #12604 from WenhaiLin/v3.8-audio-iosfix 
AudioEngine:Fixed play audio may fail(error code:-1) on iOS
 2015-06-30 16:30:05 +08:00
子龙山人 3b4d134050 Merge pull request #12603 from jianglong0156/autoPolygonFileEncode 
change the file encoding,
 2015-06-30 16:29:44 +08:00
Wenhai Lin e124593a5c AudioEngine:Fixed play audio may fail(error code:-1) on iOS 2015-06-30 15:38:24 +08:00
jianglong0156 bc341edf1f change the file encoding, 
It  display a coded warning in current encoding, leading to incredbuild unusable
 2015-06-30 15:33:54 +08:00
Vincent Yang 2ba6f266ad Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-30 14:32:14 +08:00
yangxiao 2ed5ee123e improve collider 2015-06-30 14:16:05 +08:00
Jacky 25bac2f6a9 Fix SpriteBatchNode sort error. 2015-06-30 14:12:18 +08:00
jianglong0156 185b4419be merge job project into cocos2d-x project 2015-06-30 13:49:24 +08:00
Shin Hirota 221d33a431 Fixed iOS/JS-Bind callStaticMethod() with bool arg 2015-06-30 14:00:28 +09:00
子龙山人 29cccf631e Merge pull request #12550 from kompjoefriek/v3-vibrate 
Vibrate support in v3
 2015-06-30 10:28:59 +08:00
子龙山人 950cb840c2 Merge pull request #12582 from super626/listview 
fix camera mask of listview
 2015-06-30 10:25:57 +08:00
pandamicro 92c869f408 Merge pull request #12594 from MSOpenTech/v3-winrt-js-keyboard 
V3 winrt js keyboard support
 2015-06-30 07:24:17 +08:00
Dale Stammen 38b687f8d8 enable support for keyboard on winrt platforms to fix back button 2015-06-29 09:13:19 -07:00
Dale Stammen 7684c208e0 unsupported cocos2d-x image formats removed or updated 2015-06-29 08:41:44 -07:00
Dale Stammen eb668f63ce unsupported cocos2d-x image formats removed or updated 2015-06-29 08:39:31 -07:00
pandamicro 15c763d84a Update engine version 2015-06-29 18:21:06 +08:00
songchengjiang 7733f0fe19 add interfaces 2015-06-29 17:20:28 +08:00
子龙山人 c997284825 Merge pull request #12352 from andyque/add-two-events-to-ui-slider 
Improve ui::Slider
 2015-06-29 17:01:27 +08:00
yangxiao a56a5d24b6 fix camera mask of listview 2015-06-29 14:41:03 +08:00
andyque 60834e6f0c Merge branch 'v3' into v3-finish-android-9-patch-image-format 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-29 12:05:52 +08:00
andyque 30d2129f0c improve indent and getTime function 2015-06-29 11:52:53 +08:00
songchengjiang 070705949b tab format 2015-06-29 11:48:43 +08:00
songchengjiang 7befab0f7b add Physics3DCollider 2015-06-29 10:26:09 +08:00
zhang 43ea04da3c fix onTouch begin don't return value 
fix only receive "begin" envent,can't receive "moved" "ended"
 2015-06-28 13:18:33 +08:00
pandamicro c055028485 Merge pull request #12566 from jianglong0156/winrtMouse 
Winrt mouse
 2015-06-26 18:43:33 +08:00
pandamicro 88aeaa36f4 Merge pull request #12534 from super626/skybox 
Skybox improvement
 2015-06-26 17:05:17 +08:00
子龙山人 260d5035bb Merge pull request #12555 from WenhaiLin/v3-simpleaudio-AndroidL-Fix 
Fixed SimpleAudioEngine may cause application to crash on Android L(5.0.x)
 2015-06-26 11:05:40 +08:00
Wenhai Lin 1875829ab4 [CppTests:ExtensionsTest-->CocoStudioComponentsTest]Fixed crash on Android 5.0.x 2015-06-26 10:16:52 +08:00
pandamicro e9ee303445 Merge pull request #12547 from MSOpenTech/v3.7-winrt-audio 
V3.7 winrt audio fix
 2015-06-26 09:47:11 +08:00
pandamicro 4b34963329 Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi 
use inch for childFocusCancelOffset in UIScrollView
 2015-06-26 08:11:00 +08:00
kompjoefriek 6eca03fdd2 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
Dale Stammen 61f4e280b4 Merge branch 'v3.7-release' into v3.7-winrt-audio 2015-06-25 12:46:20 -07:00
pandamicro 1ab369a70b Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode 
Fix v3.7 cocosStudio percent position bug
 2015-06-25 21:37:12 +08:00
pandamicro 3136bef9e3 Fix convertDistanceFromPointToInch logic (add x, y) 2015-06-25 21:34:00 +08:00
pandamicro e29284374b Fix convertDistanceFromPointToInch logic 2015-06-25 20:57:23 +08:00
pandamicro 0275b54b63 Merge pull request #12540 from samuele3hu/v3_7_test 
Fix the compile error of js-template by using android-studio compile param.
 2015-06-25 18:49:43 +08:00
samuele3hu 3a654b4615 Fix the compile error of js-template by using android-studio compile param. 2015-06-25 17:44:51 +08:00
jianglong0156 11ac928f59 winrt use touch event replace mouse event 2015-06-25 17:44:03 +08:00
jianglong0156 c60e9dfc9e winrt not suppot mouse 2015-06-25 17:25:27 +08:00
andyque d83f528327 use inch for childFocusCancelOffset in UIScrollView 2015-06-25 16:57:00 +08:00
andyque 0c1ee8b26a fix studio json reader percentage mode bug 2015-06-25 16:14:22 +08:00
yangxiao f4a81f0e53 optimize draw 2015-06-25 15:14:44 +08:00
yangxiao 13dbd44250 remove unused variable 2015-06-25 15:05:21 +08:00
yangxiao 63f948c822 modify skybox to projection space 2015-06-25 15:01:39 +08:00
pandamicro ac3f2f235b Merge pull request #12523 from andyque/fix-linux-audio-engine-crash 
add guard to audio engine pointer
 2015-06-25 11:48:23 +08:00
子龙山人 f545794b56 Merge pull request #12525 from WenhaiLin/v3-37-warnfix 
[ci skip]Fixed warns
 2015-06-25 11:02:02 +08:00
WenhaiLin 3cb29bbc65 [ci skip]Fixed warns 2015-06-25 10:53:41 +08:00
andyque 2bb7b96839 add guard to audio engine pointer 2015-06-25 10:17:31 +08:00
anniruddh e89a6c1651 fixed issue #160 2015-06-24 17:50:11 -07:00
pandamicro 19c57daf92 Merge pull request #12511 from samuele3hu/v3_7_test 
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
 2015-06-24 21:46:38 +08:00
pandamicro f9db471026 Merge pull request #12495 from super626/v3 
Fix terrain getIntersectionPoint
 2015-06-24 18:36:52 +08:00
samuele3hu 63eb0d34f3 Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1) 2015-06-24 16:11:36 +08:00
pandamicro 49e783820e Merge pull request #12507 from dabingnn/v3_fixClearColor 
fix clearcolor bug which has no effect
 2015-06-24 15:58:53 +08:00
yangxiao 77f1af91f9 opt getIntersectionPoint 2015-06-24 15:49:09 +08:00
yangxiao 086b01321c code simplify 2015-06-24 14:10:38 +08:00
Huabing.Xu ecfe35489c fix clearcolor bug which has no effect 2015-06-24 11:40:23 +08:00
yangxiao 7546bfe9af make getChunkByIndex protected 2015-06-24 10:56:46 +08:00
yangxiao d1baacdf8a fix terrain ray trace 2015-06-24 10:49:18 +08:00
pandamicro 04af5dfbe3 #12494 Upgrade platform constants for WP8 & WINRT 2015-06-23 23:23:25 +08:00
pandamicro 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
Namezero dec49a8b11 Circle shape debug draw bug 
Circle shape debug draw didn't draw properly when rotated
 2015-06-23 15:50:42 +02:00
pandamicro 72fde7efb8 Merge pull request #12500 from jianglong0156/webviewHide 
fix the bug:webview can not display
 2015-06-23 21:11:33 +08:00
pandamicro cc00cbedbe Merge pull request #12482 from yangws/fixbug_20214 
fixbug: cpp-test -> NewRenderer （drag the layer to test the result of…
 2015-06-23 21:09:59 +08:00
江龙 7ff383e4d2 add the return value 2015-06-23 20:27:30 +08:00
pandamicro 29840df88e Fix indent of Audio.cpp 2015-06-23 20:08:00 +08:00
pandamicro 1d4a496aaa Merge pull request #12472 from MSOpenTech/v3-winrt-audio 
V3: WinRT Fix for issue 12448 cpp-tests[ win8.1-universal--window 8.1]:Audio - CocosDenshion:Crash
 2015-06-23 20:01:18 +08:00
pandamicro 32accbf21b Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix 
Fixed Application may be created more than once on Android.
 2015-06-23 19:43:39 +08:00
WenhaiLin ed029d264f Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform` 2015-06-23 18:40:39 +08:00
yangxiao bfdb06e31b add empty line 2015-06-23 18:31:20 +08:00
yangxiao c3593c9d64 merge cocos 2015-06-23 18:29:39 +08:00
pandamicro 60372056ce Merge pull request #12484 from andyque/fix-nine-patch-image-error 
fix nine patch image parser error on Windows.
 2015-06-23 18:26:16 +08:00
yangxiao 251c81d7be Merge branch 'newcode' into v3 2015-06-23 18:25:41 +08:00
pandamicro 2a0c2b6e32 Merge pull request #12250 from hawkwood/patch-10 
Fails if file does not exist
 2015-06-23 17:32:47 +08:00
WenhaiLin f95245312a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-23 17:08:25 +08:00
pandamicro 4c7f33e66f Merge pull request #12481 from jianglong0156/restartGameBug 
fix Restart game bug
 2015-06-23 17:02:09 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
XiaoYang 59e6b6fdc2 Merge pull request #352 from tangziwen/v3 
Using ray-triangle intersect test instead of the newton method
 2015-06-23 16:30:18 +08:00
pandamicro ac138a3287 Merge pull request #12474 from xiaofeng11/v3_xiaofeng 
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
 2015-06-23 16:27:32 +08:00
XiaoFeng befe97a78b Update js parser for compatible with CocosStudio 2.3.2 json format export 2015-06-23 16:24:53 +08:00
tangziwen 5b857f7d66 fix some bug 2015-06-23 16:11:00 +08:00
andyque 7fff2bd3c4 fix nine patch image parser error on Windows. 2015-06-23 15:42:58 +08:00
子龙山人 fca9b89a4c Merge pull request #12480 from andyque/fix-rapidjson-assert-error 
fix rapidjson assert error
 2015-06-23 15:34:47 +08:00
pandamicro 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
Vincent Yang 4b768c5fd8 fixbug: cpp-test -> NewRenderer （drag the layer to test the result of culling）, some object will be culling before out of screen. 2015-06-23 15:22:27 +08:00
jianglong0156 90f9bf37cd fix redmine issue #20277 RestartGameTest only used in native will crash 2015-06-23 14:41:41 +08:00
tangziwen 1e016dc6d8 Always get the minimum distance intersect point. 2015-06-23 14:41:20 +08:00
tangziwen f71ca4f179 Using ray-triangle intersect test instead of the newton method 2015-06-23 14:27:19 +08:00
andyque 70b709f4a8 fix rapidjson assert error 2015-06-23 13:54:11 +08:00
WenhaiLin 79aa300448 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-23 13:42:32 +08:00
WenhaiLin b275ce2283 Label:Fixed IllegalArgumentException on Android 2.3.x 2015-06-23 13:38:06 +08:00
pandamicro 9445aeacb7 Merge pull request #12456 from super626/camera 
quaternion instead of euler angle
 2015-06-23 13:16:39 +08:00
XiaoFeng 375e80bd70 Update 3d reader for compatible with cocosstudio 3.1.2 version csd file 
Update easing default speed
 2015-06-23 11:31:16 +08:00
子龙山人 6bd61a3a5f Merge pull request #12469 from WenhaiLin/v3-37-label-lineheightfix 
Label should be invisible when the line height is set to zero.
 2015-06-23 11:02:48 +08:00
WenhaiLin fbe1bd8253 Label should be invisible when the line height is set to zero. 2015-06-23 09:42:48 +08:00
Zhou Yuntao 507f221483 fix a problem where WebSocket messages will pile up if server sends them faster than client's frame rate 2015-06-22 20:58:37 +08:00
Neo Kim 9757be0f81 Remove debugging logs 2015-06-22 14:49:30 +09:00
Neo Kim 71c98da2aa Apply ease out action on inertia scroll 2015-06-22 14:30:45 +09:00
Neo Kim c4fa99444c Simplify the inertia scroll implementation 2015-06-22 14:30:36 +09:00
Neo Kim c70c923674 Separate the inertia scroll from auto scroll. And implement auto scroll and bounce back as one logic. The bounce back movement is one of auto scroll feature. 2015-06-22 14:30:30 +09:00
Neo Kim 7422b20da9 Refactor some functions 2015-06-22 14:27:19 +09:00
Neo Kim 85fc5b3f89 Change to comply to Cocos2d-x convention 2015-06-22 14:27:11 +09:00
Neo Kim 6c212a7ddb Replace the existing bounce back feature with another one like iOS bounce-back. The inner container moves smoother when bouncing back. 
It does what the existing code did including scroll event dispatching and attenuating.
 2015-06-22 14:27:00 +09:00
Neo Kim 1058ab9172 Add necessary member variables and methods 2015-06-22 14:26:51 +09:00
Neo Kim a8f77710f5 Refactor some functions and remove redundant codes 2015-06-22 14:10:25 +09:00
Neo Kim 876c94f352 Remove the boundary of bouncing and apply half-movement when out of boundary like iOS bounce back. 2015-06-22 14:05:53 +09:00
Neo Kim ff3f990142 Add isOutOfBoundary() functions 2015-06-22 14:05:53 +09:00
Neo Kim c3c6eeb6c1 Refactor some functions 2015-06-22 14:05:52 +09:00
Neo Kim a3ff9573b0 Remove duplicated logic in bounceScrollChildren() 2015-06-22 14:05:51 +09:00
Neo Kim 1971b01280 Make the event dispatch functions into one function after removing duplicated logic. 2015-06-22 14:05:50 +09:00
Neo Kim 31bf9f714d Merge bouncing and non-bouncing logics as one. 2015-06-22 14:05:50 +09:00
Neo Kim 6a0609a687 Merge the logics for bouncing of VERTICAL, HORIZONTAL and BOTH in one function. VERTICAL and HORIZONTAL can be processed as BOTH. 2015-06-22 14:05:49 +09:00
Neo Kim 368b5e8f12 Remove duplicated logics in scrollChildrenBoth(), and extract meaningful logic into separate functions. 2015-06-22 14:05:49 +09:00
Anniruddh 4a15d57093 Fixed issue #168 2015-06-20 00:20:15 -07:00
yangxiao d252250968 quaternion instead of euler angle 2015-06-19 18:46:14 +08:00
andyque 55b86b2e14 add more docs for samsung enhanced API 2015-06-19 18:09:42 +08:00
子龙山人 8ca0f18575 Merge pull request #12446 from pandamicro/v3 
Add auto bindings for navmesh
 2015-06-19 17:21:00 +08:00
子龙山人 869e3c5243 Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix 
Label:Fixed line wrap error without space.
 2015-06-19 15:08:13 +08:00
pandamicro 7b1694bfeb Merge pull request #12443 from VisualSJ/v3-aa 
[ci skip]Studio parser: Code for defense
 2015-06-19 14:24:39 +08:00
WenhaiLin d32a317ea0 Label:Fixed line wrap error without space. 2015-06-19 13:39:19 +08:00
VisualSJ 8fa755d0e4 Studio parser: Code for defense 2015-06-19 13:15:10 +08:00
VisualSJ ea0ab5c738 Studio parser: Code for defense 2015-06-19 11:13:07 +08:00
pandamicro 8e9fed936c Add auto bindings 2015-06-19 10:36:36 +08:00
pandamicro 276ce3a0a7 Update versions 2015-06-19 09:56:19 +08:00
pandamicro c6d4f283bb Fix compilation issue in navmesh conversion 2015-06-19 08:11:45 +08:00
pandamicro f405d00336 Fix linux compilation 2015-06-19 01:14:16 +08:00
江龙 91bc19fb29 Merge branch 'v3_origin' into navmesh 
Conflicts:
	tests/js-tests/src/Physics3DTest/Physics3DTest.js
 2015-06-18 23:50:19 +08:00
江龙 8fc5835dee modify linux file 2015-06-18 23:29:04 +08:00
江龙 61db9ef103 modify cocos2d_specifics ， add navmesh head file。 modify template。add navmesh head file and register code 2015-06-18 23:21:53 +08:00
江龙 8c97fec5af add navmesh project file path 2015-06-18 23:17:49 +08:00
jianglong0156 618d8f01e8 Merge pull request #9 from pandamicro/navmesh 
Improve bindings for navmesh
 2015-06-18 23:15:05 +08:00
pandamicro b757837239 Move NavMesh to jsb namespace 2015-06-18 22:57:41 +08:00
jianglong0156 56382aae37 winphone project 2015-06-18 22:50:24 +08:00
CocosRobot ea2ec582f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 14:05:05 +00:00
Bin Zhang a4ecfdb7e2 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 22:00:57 +08:00
CocosRobot e2268bb16f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 22:00:57 +08:00
WenhaiLin e2f834e96b Fixed warn 2015-06-18 22:00:56 +08:00
CocosRobot c069da629e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 22:00:56 +08:00
Huabing.Xu b17702e6f1 fix compile error for linux 2015-06-18 22:00:55 +08:00
pandamicro cd7252014a Merge pull request #12432 from pandamicro/v3 
Change physics3d api to jsb namespace
 2015-06-18 21:53:39 +08:00
pandamicro e09ba8080f Fix create Sprite with PolygonInfo issue 2015-06-18 21:48:57 +08:00
jianglong0156 05c40b13f9 fix the win32 head error 2015-06-18 21:30:30 +08:00
pandamicro 10a8adad53 Change physics3d api to jsb namespace 2015-06-18 20:39:40 +08:00
pandamicro 491d89baec Merge pull request #12429 from natural-law/v3 
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
 2015-06-18 20:28:52 +08:00
jianglong0156 e0b66707f9 add nerviest android file 2015-06-18 19:30:05 +08:00
jianglong0156 4fe1542d17 add navmesh tests 2015-06-18 19:22:27 +08:00
Bin Zhang d288b13957 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 17:22:30 +08:00
CocosRobot 6e849a158d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
pandamicro aa566a3722 Merge pull request #12424 from pandamicro/physics3d 
Fix Physics3D test and js bindings
 2015-06-18 16:09:49 +08:00
pandamicro 4d588c7837 Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix 
Fixed warn
 2015-06-18 15:09:36 +08:00
jianglong0156 85c40b6580 Merge pull request #8 from pandamicro/physics3d 
Physics3d
 2015-06-18 14:54:32 +08:00
XiaoYang 96bb244d69 Merge pull request #351 from tangziwen/v3 
fix terraintest and Terrain::getInstersectionPoint()
 2015-06-18 14:47:49 +08:00
pandamicro 811173ea3b Fix Physics3D test and js bindings 2015-06-18 14:33:16 +08:00
WenhaiLin 05522afaa1 Fixed warn 2015-06-18 14:24:52 +08:00
CocosRobot b76db94725 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 05:43:02 +00:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
pandamicro 7952477469 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d 2015-06-18 12:05:01 +08:00
Huabing.Xu 92824537ac fix compile error for linux 2015-06-18 11:15:45 +08:00
Vincent Yang 187437068f Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +08:00
Vincent Yang f8a5b1e18c Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-18 10:23:52 +08:00
pandamicro 3ffc0e6be6 Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d 2015-06-18 09:20:37 +08:00
Dale Stammen fd0605416e moved clipper files to external/clipper filter in VS solution 2015-06-17 11:48:56 -07:00
Dale Stammen 9ef92b71dd added missing external/clipper files. Removed obsolete files 2015-06-17 11:40:38 -07:00
pandamicro a94b49bdef Add nav mesh bindings 2015-06-17 23:41:12 +08:00
pandamicro 85e8a407b1 Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3 
# Conflicts:
#	tests/js-tests/project/Classes/AppDelegate.cpp
#	tools/tojs/genbindings.py
 2015-06-17 19:58:24 +08:00
samuele3hu 683812d817 Update Physics3D test for js. 2015-06-17 18:50:55 +08:00
jianglong0156 b265033a41 add testcase and manual bindings 2015-06-17 18:38:18 +08:00
jianglong0156 897b5fd0e9 add navmesh test project file and binding file 2015-06-17 18:37:19 +08:00
pandamicro bb275351f0 Merge pull request #12363 from super626/v3 
Fix terrain lod computing bugs
 2015-06-17 17:49:39 +08:00
yangxiao 12a352a1db add comment 2015-06-17 16:32:08 +08:00
XiaoYang 5dd2aa2884 Merge pull request #349 from tangziwen/v3 
fix camera position
 2015-06-17 16:01:02 +08:00
tangziwen e9c95229e0 fix camera position 2015-06-17 15:58:17 +08:00
pandamicro b534f85679 Merge pull request #12394 from CocosRobot/update_lua_bindings_1434525200 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-17 15:38:17 +08:00
CocosRobot 22f04da582 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 07:18:18 +00:00
pandamicro 6f6c317f87 Merge pull request #12386 from WenhaiLin/v3-label-spacefix 
Label:Fixed wrong letter spacing with outline enabled
 2015-06-17 15:16:49 +08:00
pandamicro 5ee22c4142 Merge pull request #12174 from pajeroquan/v3 
Fix JNI object memory leak!
 2015-06-17 15:14:36 +08:00
pandamicro b1831ea5fb Merge pull request #12384 from chengstory/GBKToUTF8_v3 
GBKToUTF8
 2015-06-17 15:09:15 +08:00
CocosRobot 55c7de75e9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 06:48:41 +00:00
Wenhai Lin cbd428f6ac Label:Fixed wrong letter spacing with outline enabled 2015-06-17 13:57:23 +08:00
zhangcheng 1c983f1f39 GBKToUTF8 2015-06-17 13:16:06 +08:00
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-17 13:04:24 +08:00
CocosRobot 6bed988354 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 03:47:36 +00:00
子龙山人 0915565b8d Merge pull request #12373 from samuele3hu/v3_navigation 
Add the Lua bindings for NavMesh and the related test case.
 2015-06-17 11:36:52 +08:00
Jacky 13e0fb22f5 fix compile on linux platform. 2015-06-17 11:34:19 +08:00
songchengjiang c08a355a06 fix the bug of light 
replace atanf with atan2f
 2015-06-17 11:17:46 +08:00
pandamicro a2deddcf59 Merge pull request #12361 from dabingnn/v3_androidBugForVertexAttrib 
fix android background and foreground bug with VertexAttributeBinding
 2015-06-17 09:34:47 +08:00
Dale Stammen eb2bc78970 Merge branch 'v3' into v3-winrt-librecast 2015-06-16 07:13:53 -07:00
dkorchinskiy 5d4e8aa275 Fix crash on Windows if pass string more than 16kb to cocos2d::log 2015-06-16 16:56:06 +03:00
tangziwen 60115b1ce1 update 2015-06-16 17:46:21 +08:00
tangziwen 0eaf9b5acc Fix camera's incorrect position in chunks' LOD calculating. 2015-06-16 17:29:43 +08:00
WuHao 6e138e7b9b add clipper to cmakelist 2015-06-16 17:09:27 +08:00
WuHao d3e0439972 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into fix_spritepolygon 2015-06-16 16:15:57 +08:00
WuHao 3b56d2a66f fix cmake for cmake platforms 2015-06-16 16:15:19 +08:00
Hao Wu 2ddad84c73 Merge pull request #17 from pandamicro/spritepolygon 
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
 2015-06-16 15:11:36 +08:00
pandamicro e4d5db30eb Remove jsb_cocos2dx_experimental in projects to fix compilation issue 2015-06-16 15:09:06 +08:00
pandamicro 3f8923648b Merge pull request #12359 from super626/opt_navigation 
remove unused code, and use nullptr for pointer
 2015-06-16 14:58:58 +08:00
Justin Hawkwood 90db6fe5d6 Added check that callback is set 2015-06-15 23:36:04 -07:00
Justin Hawkwood 9378b6704c Moved file check to alternate location 2015-06-15 23:31:52 -07:00
Huabing.Xu 19982aae00 fix android background and foreground bug with VertexAttributeBinding 2015-06-16 14:04:50 +08:00
pandamicro 0866180918 Merge pull request #12162 from namezero111111/patch-4 
JumpTo::clone() results in incorrect end position
 2015-06-16 13:37:04 +08:00
samuele3hu a547d6aa33 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation 
Conflicts:
	tools/bindings-generator
 2015-06-16 11:36:11 +08:00
WuHao aeeed0f4ab Merge remote-tracking branch 'origin' into fix_spritepolygon 
# Conflicts:
#	external/config.json
 2015-06-16 11:19:20 +08:00
yangxiao 4d1aa56193 remove unused code, and use nullptr for pointer 2015-06-16 11:15:39 +08:00
Dale Stammen 8d8e7d6cb9 Merge branch 'v3' into v3-winrt-librecast 2015-06-15 19:27:40 -07:00
子龙山人 0b5c7d74b7 Merge pull request #12160 from namezero111111/patch-3 
Blink::stop() access violation
 2015-06-16 10:27:38 +08:00
子龙山人 271e3295eb Merge pull request #12349 from WenhaiLin/v3-37-NotificationNode-crashfix 
Fixed NotificationNode might crash program when the program exits.
 2015-06-16 09:53:39 +08:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
andyque b8826d9de4 improve the enum naming 2015-06-16 09:42:06 +08:00
Dale Stammen 03fc2eca5e added missing navmesh files 2015-06-15 18:19:28 -07:00
Ricardo Quesada b167ab3e78 StateBlock() is public 2015-06-15 17:43:37 -07:00
Ricardo Quesada ca3da86da7 StateBlock::restore() is public 
It is possible to restore to default state
 2015-06-15 14:12:44 -07:00
Dale Stammen 9262cc95bf fixed project filters broken by recent additions of files 2015-06-15 11:38:52 -07:00
Ricardo Quesada c17da7e90d Removes not-needed draws 2015-06-15 10:40:47 -07:00
lite3 c249f7cb69 keep old behavior 2015-06-15 19:48:12 +08:00
andyque a880dc86e9 improve comments 2015-06-15 19:36:20 +08:00
andyque c1108db31e Improve ui::Slider 
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
 2015-06-15 18:31:21 +08:00
WenhaiLin 3c8d15f6f8 Fixed NotificationNode might crash program when the program exits. 2015-06-15 17:55:00 +08:00
WuHao 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
Hao Wu 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
WenhaiLin 518de1ff57 [ci skip]Android Studio projects:Fixed compile error. 2015-06-15 14:42:45 +08:00
CocosRobot 8ec924c206 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-15 05:46:51 +00:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00
pandamicro c9c05ff982 Merge pull request #12314 from xiaofeng11/v3_xiaofeng 
Fix when button reader bug
 2015-06-15 13:13:39 +08:00
yangxiao 16a0ddc74e rename CCNavMeshTool to CCNavMeshUtils 2015-06-15 12:52:55 +08:00
pandamicro 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
pandamicro 852b9b42b9 Remove jsb_cocos2dx_experimental_manual 2015-06-15 10:46:57 +08:00
linshun efed0da8bc issue #12078: added subgroup of physics 2d. 2015-06-15 10:28:37 +08:00
pandamicro 707e9d4d7b Merge pull request #12205 from ffskyfan/v3 
Update extension.h, amend a really  dangerous macros that may cause memory allocation error
 2015-06-14 20:09:57 +08:00
Ricardo Quesada 5c419ff7bc compiles on windows 2015-06-12 20:49:20 -07:00
pandamicro 032f231ed4 Add bindings for AutoPolygon and PolygonInfo 2015-06-13 11:14:57 +08:00
Ricardo Quesada 9b7c12aa38 updates invalidate documentation 2015-06-12 17:44:48 -07:00