Commit Graph

13058 Commits

Author SHA1 Message Date
Julien Jorge 6fb3946c51 Add a config option to enable or disable the premultiplied alpha code. 2016-06-20 18:05:11 +02:00
minggo ad28d44d2f Merge pull request #15878 from cezheng/build_for_android6/downloader
fix downloader build issue for Android API 23
2016-06-20 13:38:22 +08:00
mogemimi f0028e5459 Fix unused variable warnings when compiling release mode 2016-06-20 09:23:42 +09:00
sum 4700bbce43 fix restart game crash in FT_Get_Char_Index 2016-06-19 03:22:57 +08:00
Ricardo Quesada 35008702bf fix: underline will have the same solor as text in TTF
underline will have the same solor as text in TTF when calling
`setColor`. There is another method called `setTextColor` which is
confusing. What does each function?

github issue #15214
2016-06-17 17:23:59 -07:00
Ricardo Quesada d9b3ef55ae Merge pull request #15880 from ricardoquesada/issue-15776
fix: TextureCache ASSERTS if image is invalid
2016-06-17 16:48:19 -07:00
Ricardo Quesada c387f953fa fix: TextureCache ASSERTS if image is invalid
Github issue #15776
2016-06-17 16:07:33 -07:00
Ce Zheng 84db1ac294 fix downloader build issue for Android API 23
fixes #15823
2016-06-17 22:32:49 +09:00
minggo ed955cbe1d update version 2016-06-17 18:09:27 +08:00
CocosRobot 4c233b8df7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-17 02:22:58 +00:00
minggo 6778ebf451 Merge pull request #15853 from ricardoquesada/vr_squashed
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
minggo e9cf762304 Merge pull request #15866 from minggo/remove-compiling-flag
remove gcc comipling flag
2016-06-17 09:39:18 +08:00
minggo 6280b8a376 Merge pull request #15870 from mogemimi/fix-unused-function
Remove unused debug function in RenderCommand
2016-06-17 09:38:32 +08:00
minggo 44ced37785 Merge pull request #15825 from dumganhar/iss15652-perf-fix
issue #15652: fix low FPS on some android devices while auto batch is disabled.
2016-06-17 09:37:42 +08:00
mogemimi 0872a50f60 Remove unused debug function in RenderCommand 2016-06-17 03:19:19 +09:00
Ricardo Quesada 08ed2eccd2 fix: using `enum class` instead of `typedef enum` 2016-06-16 07:02:04 -07:00
minggo 832ec5eab4 remove gcc comipling flag 2016-06-16 16:14:50 +08:00
minggo 0db0a45fa0 Merge pull request #15863 from zilongshanren/fix-word-clamp-with-only-one-word-left
fix TTF and BMFont word wrap
2016-06-16 15:01:27 +08:00
minggo 9b210e00d7 Merge pull request #15837 from geemedia/cmake-improvements
Various CMake improvements
2016-06-16 14:53:10 +08:00
minggo d66b686bd8 Merge pull request #15816 from yalab/valuemap_reject_none
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-16 14:20:46 +08:00
zilongshanren f0f8663fa9 fix TTF and BMFont word wrap 2016-06-16 14:15:00 +08:00
mogemimi 01aaff66c8 Fix -Wsometimes-uninitialized warning in release build 2016-06-16 14:27:52 +09:00
minggo 5fa57ae5c1 Merge pull request #15844 from halx99/patch-1
fix: missing properties for clone
2016-06-16 11:15:13 +08:00
minggo ab0e461b00 Merge pull request #15852 from MSOpenTech/v3-winrt-x64
V3: updated to support Windows 10 UWP x64 builds
2016-06-16 11:08:28 +08:00
minggo d8bd0ff8c8 Merge pull request #15855 from mogemimi/fix-possible-leak
Fix possible memory leak when pass initialization fails
2016-06-16 11:04:03 +08:00
CocosRobot cc2b887dbb [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-16 02:58:46 +00:00
minggo b0f3d43414 Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb
RenderTexture - set opacity modify RGB
2016-06-16 10:52:21 +08:00
Ricardo Quesada 9e40fffb13 fix: remove liboculus 2016-06-15 17:53:01 -07:00
mogemimi 4f329d8aac Fix possible memory leak when pass initialization fails 2016-06-16 04:52:38 +09:00
Ricardo Quesada ccfbc29288 fix travis error 2016-06-15 12:08:40 -07:00
Ricardo Quesada 180c2f1e9a Squashed commit of the following:
VR support for cocos2d-x

commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 11:26:33 2016 -0700

    Merge branch 'v3' into vr

commit b32d329f9331a4f9bbbbf946b88b31db7559934d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 11:25:27 2016 -0700

    fix: dont' include oculus files

commit 816928c6a8782984830aa92de5bed038c1306cdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:57:26 2016 -0700

    fix: missing guard in header

commit 2abd4eb5a1fc961c2cbae9b00809b5e6409740db
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:43:49 2016 -0700

    removed VR engines... should be part of package manager

commit 583179755d1c66c02e898297230d0f882e629b98
Merge: 12f4f71 b6d6bb0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:42:37 2016 -0700

    Merge branch 'vr' of github.com:ricardoquesada/cocos2d-x into vr

commit 12f4f71aca4fa15231976a7727faf40648d62313
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:42:12 2016 -0700

    fix: new VR API... easier to enable/disable different VR renderers

commit b6d6bb087f54cbd272fbfb9e1cf1cd6bba776ffa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 20:48:04 2016 -0700

    fix: compiles and runs on win10

commit e73aa8902118377abbd2192c757104c4531d2a9e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 20:27:06 2016 -0700

    fix: vr works again

commit 5615e276507edf8602f043f3130204a89dbaba69
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 18:55:18 2016 -0700

    fix: compiles on windows

commit 494061ee4da8fbc5616f83efb64b2c0c3932778e
Merge: 284910b fd3b6d4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 17:13:47 2016 -0700

    Merge branch 'v3' into vr

commit 284910b204ee0dd76d949ea8f2b2f6b1b72e533f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 17:12:25 2016 -0700

    android vr: better performance

commit aa8328e8029143dd7c6c724f38915f0fb3b64abe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 13 16:10:14 2016 -0700

    fix: low pass filter in accel and magnet

commit f6d9b622abff5abb95ad60fa7139f3ce1ec9caab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 13 15:43:00 2016 -0700

    fix: removes debugging info

commit 2004f0ce5605dad70ff8656a058073181346f083
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 13 14:54:32 2016 -0700

    fix: kind of works on android! yeah!

commit d6dcb6a3410fda053f0d6fbc00af817a13a86d3b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jun 10 09:44:53 2016 -0700

    logging

commit 7e5d6ad52d39642c111e7b690173338af4e94092
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 7 22:53:07 2016 -0300

    android head tracking

    compiles, doesn't work yet... how to debug java code?

commit cbf5f6482aa0ae002a7dc40045ef3ffdbe192e26
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 7 19:45:41 2016 -0300

    reading sensor from android

    not compiling yet

commit 6ee0a3c2c43f8e8a603bfce9fddb0cce5ce79415
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 7 11:45:06 2016 -0300

    compiles on android... finally

commit fb728da756ca7ee94b316c113e2239a77d9f4b53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 6 18:15:12 2016 -0300

    fix: compile vr android files only on android

commit 90db6daef382d142bb60207d2b16936dd66ee245
Merge: 2e56f03 cc936af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 6 12:15:56 2016 -0300

    Merge pull request #11 from songchengjiang/riq_vr

    daydream VR platform supporting

commit cc936afac44518a00b90ec3133aaac5d00f0b91f
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon Jun 6 10:38:27 2016 +0800

    remove VR 3rdparty dependence

commit 5f7a1a9c80f84cc915763ad6f52ffc524dd59309
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon Jun 6 10:34:37 2016 +0800

    remove VR 3rdparty dependence

commit 3f72ecde2a259357a137bec1e99e731a2e78df84
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon Jun 6 10:28:43 2016 +0800

    remove VR 3rdparty dependence

commit 2e56f032d1daced1b66b984acacc6f5007f5ecc3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jun 3 10:45:44 2016 -0300

    fix: started android support

commit 1910c9c488ee4315110081b60438aa1b7c1011f2
Author: songchengjiang <moses_jc@sina.com>
Date:   Thu Jun 2 15:58:34 2016 +0800

    add CCVRGvrRenderer and CCVRGvrHeadTracker framework

commit 96200eedea9234287153d71b4f198077cc49389a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 31 13:07:44 2016 -0300

    fix: little fixes

commit a2eb8114b2969beca83762ba829c8cb809b1615a
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 31 12:12:59 2016 -0300

    Merge pull request #10 from songchengjiang/riq_vr

    bugs fixed

commit 5fddebcae997db9e1a4108413d73b0d057a61e83
Author: songchengjiang <moses_jc@sina.com>
Date:   Fri May 27 15:57:30 2016 +0800

    parameter corrected

commit 925aad012ae513ebeeec682b003123a3c543759f
Merge: 9b5e02f 20a74e0
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Fri May 27 15:46:13 2016 +0800

    Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr

    Conflicts:
    	cocos/2d/CCScene.cpp

commit 9b5e02fa7c9fcdd15cfea99769560ed30b976e9e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Fri May 27 14:36:31 2016 +0800

    fixed ProjectionMatrix error on oculus platform
    fixed ScrollView error on oculus platform

commit 3c63ead1943d1cf8aa3c0fd722a4b3834db323b1
Author: songchengjiang <moses_jc@sina.com>
Date:   Fri May 27 10:51:46 2016 +0800

    bugs fixed

    mobile VR platforms:
    fixed ProjectionMatrix  error
    fixed culling error of ScrollView

commit 20a74e064708e6bf9d15cc5551d1f86af9d24010
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 20 09:22:45 2016 -0300

    fix: setAdditionalTransform support reference

commit 8341df82a02683b8e4ae02654e90617a2e5ced6d
Merge: 83751de 469d38d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 18 07:38:49 2016 -0700

    Merge pull request #8 from songchengjiang/riq_vr

    Finished VR integration of SKDs based on VRProtocol

commit 469d38d778cd5f947098a08d8fd14ca6f32b0502
Author: songchengjiang <moses_jc@sina.com>
Date:   Wed May 18 15:32:32 2016 +0800

    fix bug of deepoon's headtracking

commit 83751deac133910c24321ddaddff93bf736de884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 17 09:41:17 2016 -0700

    fix: Scene inverts the eye matrix

commit 41ae41969a71fd5b07396faac78e777c4afbe5c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 17 06:54:34 2016 -0700

    fix: inversed matrix for camera

commit 049dee721356a47b19f5e51a0face6a5a1647095
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Tue May 17 15:51:57 2016 +0800

    add headtracker of oculus

commit 3f6478352a4baebc684105156389655edbac7e6f
Author: songchengjiang <moses_jc@sina.com>
Date:   Tue May 17 14:22:56 2016 +0800

    add headtracker of SKDs

    gearvr/deepoon/cardboard

commit 59df985b72adf0dbb5a4c66c80ae7299b16ae909
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 16 22:12:23 2016 -0700

    fix: head tracker works

commit 306c59da0175708c96b5757f5f27afd6a6592fe3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 16 17:55:43 2016 -0700

    fix: adds missing methods to `VRIHeadTracker`

commit 91100b8a86d78801fbcd08e99427d6a6363ad69b
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Mon May 16 14:17:21 2016 +0800

    Rename Oculus's files

commit 01ef6215de936a8d8bb15f9ec195cb81b2b4b18f
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon May 16 11:41:56 2016 +0800

    Rename files based on riq's changes

commit 734efbb045064d24df095c5b8fc604ef2aab1dea
Merge: 91449c9 769a883
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Mon May 16 09:57:57 2016 +0800

    Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr

    Conflicts:
    	build/cocos2d_libs.xcodeproj/project.pbxproj
    	cocos/vr/CCVRGeneric.cpp
    	cocos/vr/CCVRGenericHeadTracker.h

commit 91449c9d23e357549cb1aeae6d1454274def1aab
Merge: d3e4550 a33faaf
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Mon May 16 09:54:44 2016 +0800

    Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr

    Conflicts:
    	build/cocos2d_libs.xcodeproj/project.pbxproj
    	cocos/platform/CCGLView.cpp

commit a33faafa1a2b6cffdc32d87f3c1c321f46f94789
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat May 14 00:57:54 2016 -0700

    fix: adds head tracker

commit ea348cf72d3e54dc3864571bff1405909dbb65c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 13 18:40:32 2016 -0700

    fix: removes red background

commit 113c7debe9a35fc142183a9012cac40063e17efe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 13 18:39:31 2016 -0700

    fix: centers image

commit 769a883c93f4f7c6191462626845f01d6f8596fe
Author: songchengjiang <moses_jc@sina.com>
Date:   Fri May 13 20:36:19 2016 +0800

    Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr

commit d3e45501cd2cada87735390a407fbd44e61cd84e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Fri May 13 17:52:46 2016 +0800

    update win32 project for VR

commit ba0fdb8b8e1efaf8fdf88e044e701fb5bedb4839
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 12 23:21:50 2016 -0700

    fix: no hardcoded values

    code is simpler, fixed a few bugs

commit b30596cdae4cdcf39d960a39661a79200b27c7a8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 12 21:50:18 2016 -0700

    fix: simplified distortion

commit 37b184f084e7b50bac9a5a3c59a87f8f03440b53
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Fri May 13 09:39:34 2016 +0800

    finished VR rendering of Oculus

commit f7d74cd0a2479541c0546d0ec41fe4f867405fcc
Author: songchengjiang <moses_jc@sina.com>
Date:   Thu May 12 10:00:43 2016 +0800

    Finished GearVR and Deepoon VR rendering integration

commit 776fb4fd7420f1c14403eb476df1e9716362f1e5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 11 16:56:57 2016 -0700

    fix: distortion working... with too many hardcoded values

    time to "un-hardcode" the values

commit 0584773cca88c5b3dee72821830841f617cfb21c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 10 19:49:07 2016 -0700

    feat: distortion WIP

commit 9b5ef01776eaa617dd4677c3824e50c1f9da41c6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 10 15:49:17 2016 -0700

    fix: simpler

    one texture that holds both left and right eye

commit bfff504c499c253a0c36b342e6b5bcb0edf4fed7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 9 10:50:43 2016 -0700

    fix: Camera code is cleaner

commit fcf730bc2afc6c4552787273577e1942088c2e42
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon May 9 16:43:58 2016 +0800

    support cardboard VR rendering

commit f88b834b70fbfb28db0c8442e68984c61192d7cc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 6 21:16:10 2016 -0700

    fix: proj fixes. works ok in any resolution

commit f980a616837b0f259d9564e622c78e0f4869ed53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 6 19:08:47 2016 -0700

    fix: renders ok in any device

commit 4799ad32ea38ddd217e80e868c3d9021c03e88ce
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 28 16:46:30 2016 -0700

    fix: renders something

    fix: passing camera to scene

    adds a way to return user camera

    fix: stereo rendering works

    fix: viewport left is correct

    fix: scissor is not needed...

    fix: works!

    fix: minor fixes

    fix: new approach... almost working

    fix: camera is moved

    whitespace fixes

    fix: whitespaces

    fix: new line

commit c137a53aba227cf2e2a1809b55cb9b3da25d432b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 27 18:56:41 2016 -0700

    fix: VR refactor... still WIP

commit 16fde77d71b8309e982bf6fa4f4ee0acea5fc0d1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 26 22:21:21 2016 -0700

    feat: VR, initial commit
2016-06-15 11:33:25 -07:00
Dale Stammen 53321e401a updated to support Windows 10 UWP x64 builds 2016-06-15 08:50:04 -07:00
minggo fc44d0deed Merge pull request #15850 from minggo/hide-virtual-button
[ci skip]hide virtual button correctly
2016-06-15 18:38:59 +08:00
minggo 7bf13f34cd hide virtual button correctly 2016-06-15 18:33:52 +08:00
PooperPig 7214173e98 Added Particle Emitter Pause option, and tests (#15836)
* Added Particle Emitter Pause option, and tests

* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +08:00
minggo 8c9019b128 Merge pull request #15848 from minggo/hide-virtual-button
[ci skip]hide virtual button if has focus
2016-06-15 18:20:53 +08:00
minggo d94dc7edc0 hide virtual button if has focus 2016-06-15 18:19:06 +08:00
minggo 3807a2f678 Merge pull request #15847 from minggo/hide-virtual-button
[ci skip]hide virtual button by default
2016-06-15 18:08:00 +08:00
minggo a8c6011f66 use android sdk 19 2016-06-15 18:06:53 +08:00
minggo 8634773be3 hide virtual button by default 2016-06-15 17:55:26 +08:00
minggo d7b495c3d1 Merge pull request #15838 from MagicXrEv/rename-end-functions
lua binding : Rename end() to endToLua().
2016-06-15 16:24:34 +08:00
mogemimi a348cbda8b Move StringUtils functions from deprecated header file to ccUTF8.h (#15835)
* Move StringUtils functions outside of deprecated header

* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
Aaron dd6fed7928 Fixed ClippingNode not cleaning up _stencil correctly (#15814)
* Fixed ClippingNode not cleaning up _stencil correctly

_stencil may be running due to onEnter() called by ClippingNode. If onExit() is not called then Node::~Node() will assert when _stencil is released.

* Added onEnterXXX to ClippingNode::setStencil()

ClippingNode::_stencil would not be initialised correctly when set after ClippingNode was adding to the active scene.
2016-06-15 14:55:29 +08:00
halx99 dafa8054bf fix: missing properties for clone
missing CascadeColorEnabled and CascadeOpacityEnabled for clone.
2016-06-15 14:39:18 +08:00
CocosRobot 7c4b7e1bf1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-15 02:49:50 +00:00
子龙山人 51f4deee01 Add system label overflow (#15827)
* Add system font overflow

1. currently only iOS, Mac and Android platform are supported

add mac label overflow shrink

modify system font overflow test

fix warning and possible memory leaks

add ios system label overflow support

add iOS system font overflow support

fix iOS system font overflow

fix Mac System font overflow

add android system font clamp

add Android system font shrink

cleanup iOS shrink related code

fix Android system font clamp

add core text to project template

fix iOS tests project

fix mac and iOS shrink

improve iOS and Mac clamp feature

fix header file include path

* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
MagicXrEv 8e6ca57f4f lua binding : Rename end() to endToLua(). 2016-06-14 23:35:17 +08:00
Adrien de Sentenac dac9be5016 Various CMake improvements
- Added c++_shared (LLVM) to Android toolchain options. Fixed AndroidNdkGdb.cmake.
- Fixed includes when not using prebuilt libs. Added option to use sources in external when not using prebuilt libs.
- Added option in CMake to be able build Box2D without using it as physics library in cocos2d-x (similar to what is done in the Visual Studio solution).
2016-06-14 10:20:57 -04:00
Mikhail Shulepov 7d6d677983 RenderTexture - set opacity modify RGB 2016-06-13 23:07:17 +03:00
mogemimi 10418676ca Remove duplicate header includes in cocos2d.h 2016-06-13 19:11:05 +09:00
子龙山人 da2ea7e08b Merge pull request #15794 from TheCodez/cachetexture
UIScrollbar and UIPageViewIndicator cache base64 Texture now #15780
2016-06-13 17:31:12 +08:00
James Chen 126b60945e issue #15652: fix low FPS on some android devices while auto batch is disabled. 2016-06-12 11:35:30 +08:00
minggo 109f572bf6 Merge pull request #15807 from mogemimi/add-switch-default-case
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-12 10:37:05 +08:00
yalab 598be0840c Fixed to fail FileUtils::writeValueMapToFile on iOS. 2016-06-10 14:53:11 +09:00
mogemimi 07e0c1cbf9 Fix typo in method name: 'destory' -> 'destroy' 2016-06-09 09:25:06 +09:00
mogemimi de5dd21ded Add missing default cases within switch block for JS and Lua JavaBridge 2016-06-08 15:41:44 +09:00
minggo 363beb436d Merge pull request #15790 from dumganhar/profiling-fix
Compilation fix while CC_ENABLE_PROFILERS = 1
2016-06-08 10:55:54 +08:00
minggo 93d87ad19e android supports LOWERCASE_ALL_CHARACTERS 2016-06-07 12:41:22 +08:00
minggo 7e1da2188c ios supports LOWERCASE_ALL_CHARACTERS 2016-06-07 10:31:16 +08:00
TheCodez 7885f55ce5 Cache bas64 images 2016-06-06 16:32:50 +02:00
James Chen 4f2b4559b6 Compilation fix while CC_ENABLE_PROFILERS = 1 2016-06-06 16:25:00 +08:00
minggo 3b4f2c38dd Merge pull request #15788 from minggo/editbox-capital-issue
[ci skip]not use capital letters by default
2016-06-06 14:00:32 +08:00
minggo 7e2f79ce8f not use capital letters by default 2016-06-06 13:55:20 +08:00
minggo 264bf87c87 Merge pull request #15784 from mogemimi/fix-unused-param
Fix unused parameter warning when compiling CCArray
2016-06-06 10:13:28 +08:00
patriciog 097eebdb50 Testcase for CCS 1.6 animations with only one frame (#15714)
* Testcase for CCS 1.6 animations with only one frame

* Removed extra comma

* Removed conflict garbage

* Removed old code

* Create new Test section Cocos Studio > Issues

* update ccs-res submodule

* Fixed Back button visibility
2016-06-06 09:32:33 +08:00
mogemimi a22302e2ee Fix unused parameter warning when compiling CCArray 2016-06-04 21:17:53 +09:00
minggo cf80eb18b1 Merge pull request #15777 from pandamicro/v3
Fix scheduler callback target lost issue
2016-06-03 14:05:32 +08:00
minggo 5cd4c8aaca Merge pull request #15778 from minggo/scriptingcore-issue
avoid to access invalid memory
2016-06-03 14:04:17 +08:00
mogemimi 388eeed014 Suppress '-Wundefined-bool-conversion' warnings on Android NDK with Clang (#15775) 2016-06-03 13:42:44 +08:00
minggo b7b74f2328 avoid to access invalid memory when received data length is the same as buffer size 2016-06-03 11:39:01 +08:00
pandamicro 3597ce7c43 Fix scheduler callback target lost issue 2016-06-03 11:01:06 +08:00
Nikita 612cd7b82f Fixed behavior of "cc.isObject" function for undefined and null values. (#15085)
* Fixed wrong behavior of "cc.isObject" function for undefined and null values.

* Simplify 'cc.isObject' function

* Remove double return in 'cc.isObject'
2016-06-03 09:45:32 +08:00
MagicXrEv 29cca63822 Texture2D::addImageAsync : Set pixel format correctly. (#15774) 2016-06-03 09:38:01 +08:00
minggo c7c67144b7 Merge pull request #15769 from pandamicro/v3
Fix scheduler callback target lost issue
2016-06-03 09:29:01 +08:00
minggo 9322ecc937 Merge pull request #15768 from minggo/issue-15738
add a new create method to create resizable window
2016-06-03 09:28:40 +08:00
CocosRobot da114e13d1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-02 09:16:13 +00:00
minggo dd1c87a1e0 Merge pull request #15764 from AlexanderShniperson/listview_select_item
ListView select item programmatically
2016-06-02 17:09:49 +08:00
minggo 35730063f1 Merge pull request #15766 from mogemimi/fix-unused-param
Fix unused parameter warning
2016-06-02 17:06:02 +08:00
minggo 75227a5c0e [desktop]fix the bug the depth test is disabled when application size changed 2016-06-02 16:18:31 +08:00
pandamicro d1e9a149c4 Fix scheduler callback target lost issue 2016-06-02 16:02:29 +08:00
minggo 7243b00cad add a new create method to create resizable window 2016-06-02 15:48:16 +08:00
mogemimi bd00b2f261 Fix unused parameter warning 2016-06-02 15:30:24 +09:00
Alexander Shniperson 07c5e528e7 ListView select item programmatically 2016-06-02 10:11:28 +04:00
minggo 66217b7bd1 Merge pull request #15761 from dumganhar/set-blending-fix
SetBlending fix
2016-06-02 11:01:50 +08:00
minggo 827aa803a4 Merge pull request #15755 from mogemimi/remove-c99-macros
Remove unnecessary sinf, cosf, tanf and sqrtf macros
2016-06-02 11:00:51 +08:00
minggo 1d42bae8c5 Merge pull request #15735 from MrCapone/v3
AudioEngine-linux fix: add map contains IDs of preloaded files
2016-06-01 21:34:15 +08:00
James Chen 3d116c3333 SetBlending fix 2016-06-01 17:46:27 +08:00
minggo 6f79082c6a Merge pull request #15754 from minggo/linux-compiling-error
use std::isnan instead of isnan to fix compiling errors
2016-05-31 09:22:05 +08:00
mogemimi a4a357db69 Remove unnecessary sinf, cosf, tanf and sqrtf macros 2016-05-31 02:39:40 +09:00
minggo 3810854c45 use std::isnan instead of isnan to fix compiling errors 2016-05-30 18:19:10 +08:00
CocosRobot 4f0869e51e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-30 09:27:04 +00:00
minggo 3521e605f8 Merge pull request #15723 from urokuta/issue-9367
#9367 blend mode does not work with animated sprite
2016-05-30 10:53:15 +08:00
halx99 fa4bfe43d8 fix AudioEngine bug for iOS, UTF8 filePath (#15743)
* fix AudioEngine bug for iOS, UTF8 filePath

Fix bug for apple platform, open audio file failed with chinese App Name.

* Update AudioPlayer.mm
2016-05-30 10:47:48 +08:00
minggo 67c95549b3 Merge pull request #15744 from mogemimi/fix-refptr-warnings
Fix warnings caused by comparison between RefPtr and C++11's nullptr
2016-05-30 10:45:28 +08:00
mogemimi c647a95656 Fix C4267 and C4309 warnings when compiling for Windows 10 UWP 2016-05-29 14:43:28 +09:00
mogemimi 69974ab06f Fix warnings caused by comparison between RefPtr and C++11's nullptr 2016-05-28 22:15:56 +09:00
minggo 74fe77a367 Merge pull request #15737 from yalab/slicent_warning_android_clang
It mute warning on android clang.
2016-05-27 16:46:50 +08:00
minggo 533636e63a Merge pull request #15726 from minggo/v3.11.1
merge v3.11.1 to v3
2016-05-27 16:45:04 +08:00
yalab 3ea46c617f It mute warning on android clang. 2016-05-27 15:39:33 +09:00
minggo 7516db0fa8 Merge pull request #15734 from pandamicro/v3
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
minggo 127f718dfc Merge pull request #15728 from mogemimi/remove-duplicate-includes
Remove duplicate header includes
2016-05-27 14:25:39 +08:00
minggo 103bdb3d37 fix conflict 2016-05-27 14:22:03 +08:00
minggo 80039c4aee Merge pull request #15731 from minggo/jsb-debug-issue
fix the bug that will lost message if only received one message
2016-05-27 09:46:36 +08:00
mogemimi fc6c612c4c Remove duplicate header includes 2016-05-26 23:25:44 +09:00
Ricardo Quesada 1a7c22bd97 Merge pull request #15594 from yutaka-takeda-drecom/fix/sprite3d_singlesprite_bug
CCSprite::createNode bug fix.
2016-05-26 08:59:46 -03:00
capone 5b02460989 AudioEngine-linux fix: add map contains IDs of preloaded files 2016-05-26 17:57:56 +06:00
pandamicro 1928d24bf0 Made templates support cc.view.setOrientation on web 2016-05-26 19:24:24 +08:00
zilongshanren f9415734f2 Merge pull request #15732 from zilongshanren/fix-actionNode-studio
fix actionNode studio 1.6 parser error
2016-05-26 18:17:25 +08:00
zilongshanren 13003d9a78 Merge pull request #15727 from dumganhar/editbox-fix
Make sure closeKeyboard run on UI thread
2016-05-26 18:08:03 +08:00
zilongshanren 2476722137 fix default value of studio version 2016-05-26 17:33:44 +08:00
zilongshanren b317588e6e fix include path 2016-05-26 17:25:03 +08:00
zilongshanren 517cb9e437 Merge pull request #15729 from dumganhar/editbox-fix-2
fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread.
2016-05-26 17:24:09 +08:00
zilongshanren 3e941be0ce fix actionNode studio 1.6 parser error 2016-05-26 17:20:51 +08:00
minggo 031e329d64 fix the bug that will lost message if only received one message 2016-05-26 16:32:10 +08:00
James Chen d42b99b10b fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread. 2016-05-26 15:49:57 +08:00
James Chen cf883b5c0f UI thread check. 2016-05-26 12:02:23 +08:00
James Chen a472ab2931 Make sure closeKeyboard run on UI thread 2016-05-26 11:57:57 +08:00
minggo 1f2dea7974 Merge pull request #15724 from dumganhar/catch-exception
Try catch IllegalStateException in Cocos2dxMusic.java.
2016-05-26 11:20:14 +08:00
James Chen 5321a2fc7a Removes unused package import for Cocos2dxSound.java. 2016-05-26 11:15:44 +08:00
minggo 5e8eee2c76 Merge pull request #15721 from mogemimi/fix-minor-typo
Fix minor typo: Texure -> Texture
2016-05-26 10:58:55 +08:00
pandamicro aab8ea5094 Fix android compilation issue with thumb mode 2016-05-26 10:50:19 +08:00
minggo 7073a1c90c Merge pull request #15718 from pandamicro/v3
Fix some small issues
2016-05-26 10:46:54 +08:00
James Chen 1285954cd9 Try catch IllegalStateException in Cocos2dxMusic.java. 2016-05-26 10:25:45 +08:00
minggo 072592d6e3 update version 2016-05-26 10:18:45 +08:00
urokuta 785d02a818 #9367 blend mode does not work with animated sprite 2016-05-26 09:39:48 +09:00
Ricardo Quesada b2c7358370 Merge pull request #15722 from ricardoquesada/issue_15154
Fix crash on windows when using PolygonInfo
2016-05-25 21:25:31 -03:00
Ricardo Quesada 906967c53a fix: make it compile on iOS and Mac 2016-05-25 20:00:48 -03:00
mogemimi f6bee1abc2 Fix minor typo: Texure -> Texture 2016-05-26 02:36:15 +09:00
Dale Stammen 26781ee592 fixed array overrun in triangulate() 2016-05-25 10:14:09 -07:00
pandamicro ea6a6a8586 Reverse include path in network module and update web engine 2016-05-25 23:58:11 +08:00
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
2016-05-25 19:19:27 +08:00
minggo 4e92b82571 Merge pull request #15716 from cezheng/bug/ios_httpclient_ssl
correct assign to equal in cert trust expression
2016-05-25 18:44:01 +08:00
pandamicro 2c05ecc3cd Fix Component event issue 2016-05-25 18:36:02 +08:00
pandamicro 896aeb2d0c Fix android compilation issue with thumb mode 2016-05-25 18:35:38 +08:00
minggo c4a40618f5 Merge pull request #15715 from dumganhar/dlfree-fix
dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE.
2016-05-25 18:34:29 +08:00
Ce Zheng e4bf6584db correct assign to equal in cert trust expression 2016-05-25 18:34:05 +09:00
minggo 47891b81af Merge pull request #15712 from mogemimi/use-nullptr-instead
Use nullptr instead of 0 or NULL
2016-05-25 13:56:52 +08:00
minggo c8c57696be Merge pull request #15705 from minggo/jsb-debug-issue
lock mutext to get element from g_queue
2016-05-25 13:55:34 +08:00
James Chen 1db3c1644d dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE. 2016-05-25 13:54:13 +08:00
Ricardo Quesada 9ad3db0635 fix: make PolygonCode cleaner
not sure if this fixes the bug, but it makes the interfaces cleaner.

Github issue #15154
2016-05-24 20:57:40 -03:00
mogemimi 1e04cb5950 Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
Ricardo Quesada 23c5c18c91 Merge pull request #15646 from Rypac/fix_quadcommand_crash
Fix crash due to reallocation of shared indices memory
2016-05-24 11:29:28 -03:00
Ricardo Quesada 02a9c9aae3 fix: update damping in physics
github issue #15630
2016-05-24 10:53:23 -03:00
alecmilne 5daaa6e49b Adding setBounce to webview (#15623)
* Adding setBounce to webview

This makes the .bounces of the scrollview section of webview publically accessible

When set to true it stops the grey over scroll of webviews

* Adding empty function for setBounces to Android

* Adding empty setBounces function for tizen

* Adding comments for empty Android and Tizen setBounce functions

* Small comment text change
2016-05-24 18:27:59 +08:00
minggo fff7a78efe lock mutext to get element from g_queue 2016-05-24 15:59:00 +08:00
mogemimi 38fd8ebca9 Fix typo in function name: Keybard -> Keyboard 2016-05-24 10:14:36 +09:00
minggo b8e7f37eaf Merge pull request #15640 from xpol/better-lua-print
Print as Lua 5.1 does and remove duplicate code.
2016-05-23 18:42:23 +08:00
Shulepov 758425cfd5 Refactor CCFileUtils-apple to remove code duplication (#15645)
* Refactor CCFileUtils-apple to remove code duplication of conversion from CCValue to NSObject and vise versa

* CCFileUtilsApple: rename helper functions
2016-05-23 18:26:19 +08:00
minggo 16a1605927 Merge pull request #15690 from halx99/patch-2
change if (fontName.c_str()) to if(!fontName.empty())
2016-05-23 16:04:14 +08:00
minggo 5caea3a197 Merge pull request #15692 from mogemimi/prevent-c4996-warning
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-23 14:14:38 +08:00
Vladimir Perminov b6d72e33d8 Fix password style text in UTF-16 (#15620)
* Fix password style text in UTF-16

Label used UTF-16 in internal.
Need string in UTF-8.

* Set correct char for Max and iOS

* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +08:00
mogemimi ad3c305172 Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition() 2016-05-22 07:05:35 +09:00
halx99 86d148c24c change if (fontName.c_str()) to if(!fontName.empty())
fix warnning, change if (fontName.c_str()) to if(!fontName.empty()), The first expression's value always true.
2016-05-20 23:10:28 +08:00
minggo 2c9716d714 Merge pull request #6927 from TimothyZhang/fix-cc-utf8-to-utf16
fixed bug of cc_utf8_to_utf16() when length!=-1
2016-05-20 14:59:06 +08:00
minggo 797cd50a6e Merge pull request #15683 from hopstertv/enable-webview-local-storage-on-android
Enable WebView's local storage on Android
2016-05-20 14:40:22 +08:00
mogemimi 0f3b36e834 Fix gcc warnings and type mismatch issues in AudioEngine for Linux 2016-05-20 01:39:40 +09:00
Greg Rynkowski 21fc67b358 Enable WebView's local storage on Android
Problem:
cocos2d::experimental::ui::WebView' local storage wasn't working on
Android. On iOS worked fine.

Solution:
Enable local storage of android.webkit.WebView in Android.

References:
https://developer.android.com/reference/android/webkit/WebSettings.html
http://stackoverflow.com/questions/5899087/android-webview-localstorage
2016-05-19 14:43:35 +01:00
minggo 3db84916d1 Merge pull request #15677 from mogemimi/refactor-audioengine
Refactor the AudioEngine-Linux to make more maintainable
2016-05-19 18:07:45 +08:00
minggo 9c0acf1e5d Merge pull request #15619 from VisualSJ/v3_audio
audio search path (android)
2016-05-19 18:06:58 +08:00
zilongshanren b154f274a5 Merge pull request #15410 from 1scaR1/up_v3
Make PageView indicator more tunable
2016-05-19 16:19:18 +08:00
mogemimi 09d839be35 Format the code to better align with cocos2d-x code style 2016-05-19 05:17:33 +09:00
mogemimi 7b61aca64e Fix indentation and remove trailing whitespaces 2016-05-19 03:42:34 +09:00
mogemimi 3a80e7d8fb Change 2 spaces to 4 spaces indentation 2016-05-19 03:34:04 +09:00
mogemimi 03be0de2fa Remove unnecessary trailing semicolons 2016-05-19 01:40:00 +09:00
fusijie 36113f507e add comments for ps. 2016-05-18 22:25:43 +08:00
zilongshanren 9223d1d917 Merge pull request #15668 from zilongshanren/fix-issue-of-tizen
fix tizen related issues
2016-05-18 17:20:19 +08:00
zilongshanren c4e6db4e9b fix tizen related issues 2016-05-18 16:26:13 +08:00
pandamicro a03c45ce62 Update network licenses and reformat 2016-05-18 14:29:54 +08:00
minggo c6034787e4 Merge pull request #15664 from mogemimi/replace-ccassert-macro
Replace CCAssert macros with CCASSERT
2016-05-18 11:57:18 +08:00
minggo a54251b854 Merge pull request #15659 from mogemimi/use-const-reference
Use const references whenever possible
2016-05-18 11:55:55 +08:00
mogemimi 320ec027f7 Replace CCAssert macros with CCASSERT 2016-05-18 01:49:35 +09:00
minggo 3e396fedab Merge pull request #15617 from pandamicro/v3
Some modifications merged from Creator
2016-05-17 13:43:41 +08:00
mogemimi 948f64631f Use const references whenever possible 2016-05-17 13:17:56 +09:00
pandamicro c96bd9a4df Resolve local reference leak and function order 2016-05-17 12:06:28 +08:00
minggo 601460682e Merge pull request #15641 from mogemimi/add-missing-references
Add missing references to avoid unnecessary copies
2016-05-17 10:28:08 +08:00
minggo abe020e808 Merge pull request #15654 from minggo/ipv6-compatibility
Ipv6 compatibility
2016-05-17 09:25:14 +08:00
mogemimi a1a8feed71 Add missing references to avoid unnecessary copies 2016-05-17 01:15:07 +09:00
zilongshanren 9203630583 Merge pull request #15651 from zilongshanren/fixNativeCotnrolIssuesV2
fix UI native control onEnter issue
2016-05-16 16:58:32 +08:00
zilongshanren 3ae5b1075b fix native control onEnter issue 2016-05-16 16:14:16 +08:00
minggo 88db5d3660 use AF_UNSPEC to support ipv6 2016-05-16 15:15:29 +08:00
minggo 2b480a75bf use AF_UNSPEC to support ipv6 2016-05-16 14:45:09 +08:00
Ryan Davis 8ca09f7c2a Fix crash due to reallocation of shared indices memory 2016-05-15 12:30:30 +10:00
Xpol Wan a7d9dd9a75 Print as Lua 5.1 does and remove duplicate code. 2016-05-14 14:09:58 +08:00
mogemimi 16878a53b1 Suppress MSVC warning C4800 2016-05-13 11:44:17 +09:00
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
ViusualSJ ada1d1dfe8 audio search path (android) 2016-05-11 17:24:14 +08:00
pandamicro 6b59dc24c7 Add Image::setPNGPremultipliedAlphaEnabled 2016-05-11 16:36:21 +08:00
pandamicro 1023c8730e [JSB] Made cc.log overwrite-able 2016-05-11 11:58:24 +08:00
pandamicro 1cbbde5d8b Fix android LocalStorage return null for empty string value 2016-05-11 11:57:54 +08:00
minggo 48937ca3e6 disable new JSB memory model by default 2016-05-11 11:10:11 +08:00
minggo bb5d1a5e97 Merge pull request #15607 from minggo/iss-15413
remove Content-Type limitation
2016-05-11 10:57:34 +08:00
minggo 2ad6f10bb6 Merge pull request #15609 from pandamicro/v3.11
Fix web engine issues and SocketIO connection fail issue
2016-05-11 09:28:24 +08:00
pandamicro 85812b4f5b Remove client_no_context_takeover extension in WebSocket (not working on Android/iOS/Mac) 2016-05-10 20:35:02 +08:00
minggo fd160a1611 remove Content-Type limitation 2016-05-10 18:15:57 +08:00
minggo 27060e43b7 Merge pull request #15590 from ntotani/v3
add missing lua const values
2016-05-10 14:55:53 +08:00
minggo 36ad79761f Merge pull request #15596 from dabingnn/v3_fix_animation3D_bug
fix animate 3d bug
2016-05-10 14:11:01 +08:00
minggo f4a7ba836c Merge pull request #15599 from Naruto/feature/fix_build_error_using_fileutils-apple
fix build failed using FileUtilsApple on Application code.
2016-05-10 12:07:16 +08:00
Naruto TAKAHASHI 79b9a191d0 declare explicitly FileUtilsApple destructor 2016-05-09 21:50:52 +09:00
minggo d086965683 Merge pull request #15598 from minggo/android-package-name
[ci skip]set correct package name
2016-05-09 18:17:28 +08:00
minggo 2a712a0c3b set correct package name 2016-05-09 18:14:53 +08:00
Huabing.Xu e8acf38212 fix animate 3d bug 2016-05-09 15:21:19 +08:00
TAKEDA Yutaka d17fdfe3cc CCSprite::createNode bug fix. 2016-05-09 15:42:39 +09:00
mogemimi bbbb7e498d Prevent variable shadowing warnings 2016-05-08 12:32:36 +09:00
minggo 5d7cbe622a Merge pull request #15589 from pandamicro/v3.11
Add cc.game.end to close game window
2016-05-07 22:11:46 +08:00
halx99 fc9880ab49 Add captureNode for cocos2d::utils (#15558)
* Add captureNode for cocos2d::utils

Add captureNode for cocos2d::utils and fix CC_DLL syntax.

* Add test case for utils::captureNode

Add test case for utils::captureNode.

* Store captured image to disk with RGB.

* Trigger jenkins check
2016-05-07 22:10:53 +08:00
Naoyuki Totani 04ebba425f add missing lua const values 2016-05-07 16:23:23 +09:00
pandamicro d0fc3ec4c4 Add cc.game.end to close game window 2016-05-07 14:37:36 +08:00
zilongshanren e4d91f5577 fix tizen videoplayer issue 2016-05-06 18:43:26 +08:00
minggo f34acca188 Merge pull request #15575 from stevetranby/capturescreen-drain-autorelease
Prevent memory leak: force drain on autoreleased `data`.
2016-05-06 16:57:29 +08:00
CocosRobot d72fadf6cc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-06 05:44:31 +00:00
minggo 38631ab655 Merge pull request #15576 from minggo/sync-15066
Fix setPhysicsBody method
2016-05-06 13:38:53 +08:00
mogemimi 694259bf80 Suppress warning C4800 on MSVC 2016-05-06 12:30:16 +09:00
TheCodez 4de7ef1515 Fix setPhysicsBody method 2016-05-06 09:29:57 +08:00
Steve Tranby 7c1e60f0b7 Prevent memory leak: force drain on autoreleased `data`. 2016-05-05 08:00:28 -06:00
minggo 9218329968 Merge pull request #15569 from minggo/issue-15522
Fix compile error isnan -> std::isnan
2016-05-05 11:36:24 +08:00
CocosRobot 0445e7c562 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-05 03:07:58 +00:00
minggo 44063b8e85 Merge pull request #15568 from zilongshanren/fix-jsb-related-issues
fix jsb 3.11 related issues
2016-05-05 11:01:44 +08:00
minggo e2c38ed87f make std::isnan work for winrt 2016-05-05 10:29:31 +08:00
zilongshanren 8c046fea92 fix jsb 3.11 related issues 2016-05-05 10:20:00 +08:00
minggo 03b38bcee2 Merge branch 'fix_isnan' of https://github.com/gelldur/cocos2d-x into issue-15522 2016-05-05 10:17:17 +08:00
mogemimi 2df9afbe71 Fix typos in documentation and comments 2016-05-05 08:05:20 +09:00
pandamicro fcfaafa4a5 Fix SocketIO fail to connect issue on Android 2016-05-04 17:43:36 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
halx99 9ff61f915c Add findChild for cocos2d::utils (#15548)
* Add searchNode for cocos2d::utils

Add searchNode for cocos2d::utils

* fix compile error on win32_bak

* convert line terminates to unix sytle.

* Rename searchNode to findChild, and etc.

* fix compile error.
2016-05-04 09:46:00 +08:00
minggo 0eb25af347 Merge pull request #15555 from mogemimi/remove-c-str-calls
Reduce unnecessary c_str() calls
2016-05-04 09:43:01 +08:00
minggo 4766e0dd9b Merge pull request #15545 from minggo/isse-15540
avoid remove event listener multiple times
2016-05-04 09:39:38 +08:00
minggo 6260c67941 Merge pull request #15549 from minggo/issue_15525
use std::atof() instead
2016-05-04 09:38:42 +08:00
Adrien de Sentenac 1a76c9ea3b Add OBB (zip) support (#15515)
* Add OBB support.
OBB must be a zip file with audio and video files stored uncompressed.

* Use introspection to be able to build with Android API level 10.
Using the new audio engine to play sounds from the OBB will only work with API level 12 (Android 3.1) or above.
2016-05-04 09:21:35 +08:00
mogemimi 8429b34010 Reduce unnecessary c_str() calls 2016-05-04 04:18:25 +09:00
dualface 2901f0aea6 fix display.wrapScene() 2016-05-03 21:37:15 +08:00
pandamicro 3d6bddd2c7 Merge pull request #15465 from cezheng/fix/several_network_bugs
[BugFixes]Several serious bug fixes related to network/asset_manager
2016-05-03 17:37:32 +08:00
minggo 1bf56d5a78 use std::atof() instead 2016-05-03 15:50:06 +08:00
minggo f2e5eb332a Merge pull request #15546 from minggo/issue_15526
fix memory leak
2016-05-03 14:02:38 +08:00
minggo fba4bead70 fix memory leak 2016-05-03 11:24:22 +08:00
minggo d41207e99a avoid remove event listener multiple times 2016-05-03 10:56:03 +08:00
minggo 9f678f2f27 Merge pull request #15541 from cocos2d/fix-doxygen-mistakes
Fix doxygen format mistakes in enum class Platform
2016-05-03 09:38:58 +08:00
mogemimi 6433172fae Fix shadow variable warning in GameNode3DReader 2016-05-02 10:57:03 +09:00
Zhe Wang a640f007ef Fix doxygen format mistakes in enum class Platform
An user reported this error in the forum http://forum.cocos.com/t/api-document/36199/2
I noticed that our doxygen was written in wrong format.
2016-04-30 15:20:24 +08:00
Xpol Wan f111583214 Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont().
* Remove unnecessary memory copy in FileUtils::getFileData()
* Add Data::takeBuffer() to simplify FileUtils::getFileData() and CCFreeTypeFont::loadFont().
2016-04-29 09:31:09 +08:00
minggo 788dae5a2e Merge pull request #15531 from pandamicro/v3.11
Fix clipping node memory management issue and update web engine
2016-04-28 16:15:59 +08:00
pandamicro d8d6e55756 Fix clipping node memory management issue 2016-04-28 15:14:03 +08:00
Ricardo Quesada c432b23ef6 fix: removes `friend class Game`
fixes Github issue #15221
2016-04-27 18:57:41 -07:00
CocosRobot 198acb9466 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-28 01:56:50 +00:00
zilongshanren 482788c933 Add tizen support (#15518)
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
Dawid Drozd 0f19bec99d Fix compile error isnan -> std::isnan #15111
Issue: https://github.com/cocos2d/cocos2d-x/issues/15111
2016-04-27 13:15:08 +02:00
minggo 2a4799758d Merge pull request #15511 from xpol/signed-unsigned-mismatch
Fixes signed/unsigned mismatch warnings.
2016-04-27 11:34:10 +08:00
minggo fc5e537327 Merge pull request #15508 from xpol/remove-use-of-getFileData
Remove last internal use of deprecated `FileUtils::getFileData()`.
2016-04-27 09:38:30 +08:00
minggo 51fb49a522 Merge pull request #15512 from minggo/issue-15193
use fullpath to play background music
2016-04-27 09:37:45 +08:00
mogemimi f395cadbac Add CC_GUI_DLL to suppress warning C4275 2016-04-27 04:08:09 +09:00
Xpol Wan 1cc0130bdd Fixes signed/unsigned mismatch warnings.
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
minggo b9184ac452 Merge pull request #15509 from minggo/issue-15449
remove unsupport flags
2016-04-26 16:03:58 +08:00
minggo bb4a54b042 use fullpath to play background music 2016-04-26 15:59:30 +08:00
Xpol Wan bd3c3a7c3d remove default value for size argument. 2016-04-26 14:54:20 +08:00
Xpol Wan 94944082c4 Fixes warning about deprecated cc_wcslen. 2016-04-26 14:21:25 +08:00
minggo 2319860d38 remove unsupport flags 2016-04-26 14:08:23 +08:00
Xpol Wan 3f8910d80c Remove last internal use of deprecated `FileUtils::getFileData()`. 2016-04-26 13:57:53 +08:00
xpol 43a94c0693 Add FileUtils::getContents(). (#15479)
* Add FileUtils::getContents().

* skip FileUtils::getContents() in binding generator config.

* use FileUtils::getContents in CCDataReaderHelper.

* obey the cocos2d-x coding style.

* Explicit constructor.

* More docs.

* More tests.

* Move FileError to FileUtils::Error.

* Fixes wrong buffer size for reading into string and vector.

* Update tests.

* Add note on padding for output buffers.

* FileUtils: implements old methods by using `getContents()`.

methods are:

* FileUtils::getDataFromFile()
* FileUtils::getStringFromFile()
* FileUtils::getFileData()

and follow Android methods are now just calls FileUtils' ones.

* FileUtilsAndroid::getDataFromFile()
* FileUtilsAndroid::getStringFromFile()
* FileUtilsAndroid::getFileData()

* Fixes build error.

* FileUtils::getFileData: Return the size of data.

* Remove old methods form FileUtilsAndroid they are now done in FileUtils.

* Fixes for win32 code.

* Fixes build error in test and add more test.

* Better error message.

* Make template type name more readable.

* Update comments.

* Move internal functions to anonymous namespace.

* Refactor FileUtils test.

* Fix warning about compare signed and unsigned.

* Win32 and WinRT does not use text mode.

That is we don't need simulate convert CRLF to LF.

* Fixes for Win32 and WinRT.

* Update for Win32 and WinRT.

* Win32: return FileUtils:Error::TooLarge when file is large than 2^32-1.
* Win32: remove checkFileName() which has no effect at all.
* WinRT: add FileUtilsWinRT::getContents() using ::CreateFile2.
* WinRT: add override keyword for FileUtilsWinRT::getFileSize().

* Update for coding styles.

* More error strings.

* check read and malloc return codes.

* rename FileUtils::Error to FileUtils::Status.

* Fixes for WinRT, use GetFileInformationByHandleEx to get file size.

* Fixes build error for winrt and cleanup FileUtils::Status.

* Try to fix the build error on Linux.

Status must defined in some header, so move FileUtils.h up.

* Remove support of text mode on WinRT (it is the last platform support text mode).
2016-04-26 13:37:22 +08:00
minggo 2cc6ebc137 Merge pull request #15507 from CocosRobot/update_lua_bindings_1461642261
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 11:49:15 +08:00
CocosRobot 29da95494e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-26 03:47:27 +00:00
minggo a6b59c40be Merge pull request #15496 from treert/patch-2
[fix bug] reset UIGrayScale Shader when reload shaders
2016-04-26 11:44:20 +08:00
minggo 86df9b535a Merge pull request #15493 from njh0602/somefix
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
minggo 2f2373be87 Merge pull request #15497 from stevetranby/tilemap-csv-support
Add CSV format support to tile maps
2016-04-26 11:39:33 +08:00
minggo c8e2dc83d1 Merge pull request #15498 from ynaoto/v3
Warn if fontDef.charID exceeds 16bits.
2016-04-26 11:27:06 +08:00
minggo d5e4cc0b88 Merge pull request #15492 from mogemimi/fix-unused-variable-warning
Fix unused variable warning when building with Xcode
2016-04-25 15:50:58 +08:00
minggo 8792078bb4 Merge pull request #15500 from mogemimi/fix-warning-c4804
Fix compiler warning C4804 under Visual Studio
2016-04-25 13:59:15 +08:00
Josh Bodily 614c3c47d7 Josh/winrt inplace editbox (#15473)
* WinRT in-place edit box

* Fix static analysis errors
2016-04-25 11:17:09 +08:00
mogemimi d2c46167c3 Fix compiler warning C4804 under Visual Studio 2016-04-25 10:46:33 +09:00
Naoto Yoshioka d42cb71a27 Warn if fontDef.charID exceeds 16bits. 2016-04-25 01:02:50 +09:00
Steve Tranby 510e7b831e csv support working test 2016-04-23 17:31:10 -06:00
treert 2c4b634a50 reset UIGrayScale Shader when reload shaders
reset GLProgram for UIGrayScale Shader when reload shaders
2016-04-23 13:33:22 +08:00
NamJunHyone ea2b73c30e Renamed ignoreAnchorPointForPosition() 2016-04-22 22:29:49 +09:00
NamJunHyone 401f3a84ac Renamed ignoreAnchorPointForPosition() 2016-04-22 21:36:02 +09:00
mogemimi 71677ee286 Fix unused variable warning when building with Xcode 2016-04-22 20:25:32 +09:00
minggo 5aa83ef1cf Merge pull request #15490 from mogemimi/fix-signed-unsigned-mismatch
Fix warnings about signed/unsigned mismatch
2016-04-22 13:54:52 +08:00
Steve Tranby 0f0c9b627b Add support for Unsigned with CCValue (#13785)
Add support for Unsigned with CCValue
2016-04-22 13:49:20 +08:00
mogemimi a3ad4cddf8 Fix warnings about signed/unsigned mismatch 2016-04-22 12:20:05 +09:00
minggo 16c7a594c8 Merge pull request #14005 from wighawag/draw_node_shader_fix
allow to use custom shader uniforms and attributes on drawNode
2016-04-22 10:49:41 +08:00
minggo 2c75a4cf39 Merge pull request #15480 from mogemimi/remove-unary-operator
Remove incorrect unary operator to fix warnings
2016-04-21 15:42:29 +08:00
minggo 488ceb485d Merge pull request #14547 from colajam93/fix-linux-clang-build
Add missing header
2016-04-21 15:38:53 +08:00
CocosRobot 361e054d6d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 07:07:41 +00:00
minggo 6459c92ee7 Merge pull request #13950 from Almax27/patch-4
Added CC_PROPERTY const qualifier
2016-04-21 14:56:01 +08:00
minggo 7de8f761d0 Merge pull request #14123 from jgod/patch-2
Check that textureAtlas isn't null before removing quads in SpriteBatchNode
2016-04-21 14:44:32 +08:00
minggo 949112fdc2 Merge pull request #14321 from pandemosth/socketIO_issue_14287
Fix SocketIO crash on reconnect
2016-04-21 14:28:21 +08:00
minggo fcd8aa30f4 Merge pull request #14312 from TimothyZhang/jsb-getDataFromFile-should-return-null-if-read-failed
return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile
2016-04-21 14:17:44 +08:00
minggo de3dac7664 Merge pull request #14090 from SongCF/v3
issues #14050 ActionManager memory leak
2016-04-21 14:09:52 +08:00
mogemimi eae7ec40ef Remove incorrect unary operator to fix warnings 2016-04-21 14:39:42 +09:00
MURAKAMI Yukio 9514b51057 Console refactor (#15013) 2016-04-21 11:31:20 +08:00
Ricardo Quesada b8eae430fb Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor
extend the RichText
2016-04-20 20:05:29 -07:00
CocosRobot f4c9ea3902 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 01:54:49 +00:00
minggo 481c55adb2 Merge pull request #15466 from wefiends/spriteframe-clone
Copy polygonInfo when cloning SpriteFrame
2016-04-21 09:49:00 +08:00
minggo 6b262a55cb Merge pull request #15472 from mogemimi/fix-deprecation-warning
Fix deprecation warning caused by PageView::getPages()
2016-04-21 09:47:49 +08:00
minggo b0ae128ec3 Merge pull request #15066 from TheCodez/patch-2
setPhysicsBody can be called multiple times again
2016-04-21 09:40:28 +08:00
Yukio Murakami a8ddbdc12c defaults and append tag support 2016-04-21 10:03:57 +09:00
Ricardo Quesada 775db978da fix: fix issue 15423 for v3.11
Github issue #15423
2016-04-20 08:41:20 -07:00
mogemimi 4dfdd159b7 Fix deprecation warning caused by PageView::getPages() 2016-04-21 00:28:34 +09:00
TheCodez afdd600045 Fix setPhysicsBody method 2016-04-20 11:46:10 +02:00
CocosRobot a9184f1047 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-20 09:31:06 +00:00
AlwynC 4c7e4671d9 Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. (#15194) 2016-04-20 17:25:31 +08:00
Nicholas Barrios 20b31eb1e8 Copy polygonInfo when cloning SpriteFrame 2016-04-20 03:04:19 -04:00
minggo 0a609e9176 Merge pull request #15461 from ricardoquesada/issue_15423
fix: fix crash in win for rich text
2016-04-20 13:41:07 +08:00
Ce Zheng 200c9fda59 fix HTTPAsyncConnection bad memory management
Removed a redundant release on certDataRef that caused crash on
NSURLConnectionLoader thread.
Fixed a memory leak of SecCertificateRef
This fixes #15464
2016-04-20 14:04:44 +09:00
Ce Zheng d848292860 make android downloader taskQueue thread
My previous fixes for the android downloader in #14530 are not thread
safe, this commit fixes the problem
2016-04-20 13:42:00 +09:00
minggo 08b000bacf Merge pull request #14426 from pyrosphere/fix-controller-ios6
Fix crash when using cocos2d::Controller on iOS6
2016-04-20 11:45:13 +08:00
minggo 3a7195f4b0 Merge pull request #14485 from cpascal/fix_libexport
Fix app-project generates .lib file in Win32
2016-04-20 11:26:25 +08:00
minggo f49f69dac8 Merge pull request #14525 from elvman/key_none
Add enum value for no key
2016-04-20 11:21:43 +08:00
Ce Zheng 7f1b02ab92 Merge branch 'fix/ios_downloader_crashes_with_storage_path_containing_spaces' into fix/several_network_bugs 2016-04-20 12:12:31 +09:00
minggo 095f404738 Merge pull request #14735 from linguofeng/patch-2
CCFileUtils-apple.mm Grammatical errors
2016-04-20 11:00:38 +08:00
minggo 9ef6035951 Merge pull request #15460 from mogemimi/add-missing-float-suffix
Add missing float suffix to avoid warning C4305
2016-04-20 10:35:56 +08:00
minggo e16d016c46 Merge pull request #15452 from 1scaR1/fix_osx_sandbox
Implement createDirectory for apple platform.
2016-04-20 10:26:45 +08:00
Ricardo Quesada 4bb35f2219 fix: fix crash in win for rich text
use `std::locale()` when invoking `std::isXXX` function
to avoid crash

github issue #15423
2016-04-19 13:53:27 -07:00
mogemimi f9f751834a Add missing float suffix to avoid warning C4305 2016-04-20 03:54:47 +09:00
Julien Jorge a3f28a18df Uniformize image support macro usage.
All images format implementation but WIC test the value of a CC_USE_<FORMAT>
preprocessor macro to verify if the implementation must be available or not.
WIC support is checked against the definition of the macro only,
independently of its value, thus making the implementation available even
if CC_USE_WIC = 0.

This commit makes the tests of the CC_USE_WIC macro identical to the tests
of the other similar image format macros.
2016-04-19 14:15:43 +02:00
minggo 29df93c5e4 Merge pull request #15458 from WenhaiLin/v3-0419
Fixed crash and actions may not have been executed.
2016-04-19 18:25:00 +08:00
minggo 09e476af9a Merge pull request #15450 from mogemimi/fix-deprecation-warning
Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning
2016-04-19 16:51:52 +08:00
Wenhai Lin a8847ccf5e Fixed crash and actions may not have been executed. 2016-04-19 16:11:54 +08:00
Бесшапошников Никита a3717b6907 Add error logging of incorrect directory creating. 2016-04-19 10:17:31 +03:00
mogemimi 87be03fe9b Fix compilation error with Platform Toolset v120 for WinRT 2016-04-19 16:13:12 +09:00
minggo 776ee8ac5a Merge pull request #14843 from cezheng/fix/ios_downloader_crashes_with_storage_path_containing_spaces
fix iOS downloader crash when storage path contains spaces
2016-04-19 13:46:02 +08:00
minggo 03ad0f01c9 Merge pull request #15001 from mogemimi/refactor-httprequest
Refactor HttpRequest and HttpResponse
2016-04-19 11:23:59 +08:00
minggo 5c567c54b4 Merge pull request #15198 from perminovVS/v3-dev-wrong-log-detect-image-type
Wrong log message if use tga image
2016-04-19 11:00:55 +08:00
minggo f24eb55378 Merge pull request #15454 from tomi-payne/v3
Update CCSprite3D.cpp
2016-04-19 10:55:38 +08:00
minggo f3d8d043a1 Merge pull request #15447 from xpol/use-decltype-to-avoid-side-effect-warnings
Use decltype and std::remove_pointer to avoid side effect warnings.
2016-04-19 10:53:15 +08:00
minggo 660002c239 Merge pull request #15446 from xpol/fixes-integer-cast-warings
Fixes some integer cast warnings.
2016-04-19 10:27:37 +08:00
minggo df9a9292a2 Merge pull request #15453 from mogemimi/add-missing-dllexport
Add missing dllexport to avoid warning C4275
2016-04-19 10:26:58 +08:00
minggo b182adae5b Merge pull request #15448 from xpol/remove-internal-use-of-getFileData
Fixes deprecated warnings
2016-04-19 10:24:49 +08:00
minggo 5f6f35fb91 Merge pull request #15451 from xpol/fixes-format-warnings
Fixes format warnings.
2016-04-19 10:21:10 +08:00
minggo 3dbabdee05 Merge pull request #15099 from feijing566/v3
Add "id" for parser object
2016-04-19 10:18:04 +08:00
tomi-payne fbadcf188a Update CCSprite3D.cpp
Fixed Sprite3DCache::removeSprite3DData error
2016-04-19 10:11:29 +08:00
mogemimi 24a09a5ae7 Add missing dllexport to avoid warning C4275 2016-04-19 04:01:13 +09:00
mogemimi d1871d1ca7 Refactor HttpRequest and HttpResponse 2016-04-19 02:58:42 +09:00
mogemimi 19c2893509 Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning 2016-04-18 19:50:59 +09:00
minggo f3fd111200 Merge pull request #14944 from mxenabled/josh/export_wicimageloader
Export WICImageLoader form DLL
2016-04-18 18:33:39 +08:00
minggo 93d331f1e8 Merge pull request #14965 from elloop/fix_opengl_log_function
fix opengl log function.
2016-04-18 18:32:00 +08:00
minggo 5bd592ca34 Merge pull request #15231 from SteveKChiu/v3
Fix calculation of base64Encode outLength
2016-04-18 17:54:14 +08:00
Xpol Wan dc0f7bf903 Fixes format warnings. 2016-04-18 17:52:58 +08:00
Бесшапошников Никита e555ed5b9e Implement createDirectory for apple platform. 2016-04-18 12:52:20 +03:00
xiaofeng11 061fc2f287 Fix on win32 platform if cpp-tests' windows been minisized, after window restore, content size is wrong. (#15236) 2016-04-18 17:15:56 +08:00
minggo 37655ea271 Merge pull request #15091 from mogemimi/fix-null-conversion
Fix return value of VertexAttribBinding::init()
2016-04-18 16:52:15 +08:00
minggo 6cc80f28fc Merge pull request #15096 from fnz/volume_control
Set music volume control as default
2016-04-18 16:48:55 +08:00
Xpol Wan bd263d6be4 Fixes deprecated warnings
* remove all internal use of FileUtils::getFileData().
2016-04-18 16:45:46 +08:00
minggo 7749ba6de8 Merge pull request #15444 from xpol/fixes-warings-unused-static-consts-in-cpp
Fixes warning about unused static constants.
2016-04-18 16:37:10 +08:00
xpol 24db45e925 Fixes some warnings in Lua manual bindings. (#15443)
1. Use __Type for deprecated classes.
2. Refactored LuaStack::luaLoadChunksFromZIP() and use FileUtils:getDataFromFile().
3. Fixes wrongly compare NULL with char array.
2016-04-18 16:35:50 +08:00
Xpol Wan 9ea3bc4aa8 Use decltype and std::remove_pointer to avoid side effect warnings. 2016-04-18 16:07:48 +08:00
Xpol Wan 810e855f44 Fixes some integer cast warnings. 2016-04-18 16:01:19 +08:00
zilongshanren 001a0ee812 remove useless warning log of stencil buffer. (#15396)
1. disable GC for Native object

2. improve js tests of label
2016-04-18 15:43:54 +08:00
Xpol Wan 8c3137b07f Fixes warning about unused static constants. 2016-04-18 15:38:51 +08:00
minggo b88dc87b0a Merge pull request #15428 from mogemimi/fix-indent
Fix indentation for readability
2016-04-18 15:20:54 +08:00
Dale Stammen 69bd994760 added missing _USRJSSTATIC preprocessor define (#15438) 2016-04-18 15:10:35 +08:00
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
Stephen Phillips 7b35f31016 Fixed typo in UILayout using clipping rect x instead of y coordinate. 2016-04-15 13:45:21 +01:00
minggo 14c57c524f Merge pull request #15429 from minggo/sync-v3
fix: compile in Windows
2016-04-15 10:06:47 +08:00
Ricardo Quesada 3eb7d62e6e fix: compile in Windows
Github issue #15372
2016-04-15 09:33:19 +08:00
mogemimi 0825b1cc96 Fix indentation for readability 2016-04-15 04:31:19 +09:00
Xpol Wan cb0e768f32 Fixes warning: field 'isVertsOwner' will be initialized after field 'rect'. 2016-04-14 17:09:37 +08:00
xpol 3780064a82 Allow inherit form platform fileutils (#15304)
* Allow inherit form FileUtilsLinux, FileUtilsWin32 and FileUtilsWinRT.

* Removed objc from CCFileUtils-apple.h

define FILEUTILS_APPLE_ENABLE_OBJC to enable FileUtilsApple:setBundle() for compatibility.

* Smart pointers heal us all.

* Add config macro in ccConfig.h and prefix with CC_.

* enabled by default.
* use #if rather than #ifndef.

* Do not deprecate setBundle.
2016-04-14 11:59:24 +08:00
minggo 6e7ab0fb46 Merge pull request #15395 from Sai628/v3
Bug fix: CCValue operator overloading of Comparison "==" in case Type::VECTOR
2016-04-14 11:58:19 +08:00
Dale Stammen fe84af5dbd added zlib.dll 2016-04-12 17:18:47 -07:00
CocosRobot 7d9946a9cc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-11 09:56:18 +00:00
zilongshanren abfce2617e Merge pull request #15399 from geemedia/pageview-turning-time-configurable
Make PageView page turning event time tweak configurable.
2016-04-11 04:50:46 -05:00
Бесшапошников Никита 23d074ea34 Make PageView indicator more tunable:
-add possibility to change texture of index nodes
-add possibility to change color of index nodes
-add possibility to change scale of index nodes
2016-04-11 12:28:47 +03:00
James Chen f3e6e8331a Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener. 2016-04-11 11:54:15 +08:00
Juan Luis Boya García 9c4f3ffa8d Make selectedSprite optional in JSB too 2016-04-11 11:53:53 +08:00
Бесшапошников Никита 54e457f1be Fixed ccui scroll widgets constants for JS bindings 2016-04-11 11:29:00 +08:00
Ricardo Quesada fea84b8af3 fix: use chipmunk v6.2 API whenever possible
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
2016-04-11 11:12:34 +08:00
pandamicro 79cfe8ac0e Fix a issue in cc.CallFunc JSB implementation 2016-04-11 11:12:13 +08:00
CocosRobot 150ec2e7ce [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-11 11:11:54 +08:00
pandamicro f9f9551645 Fix some issues
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-11 11:11:34 +08:00
pandamicro bb2cfc7308 Update engine version 2016-04-11 11:11:17 +08:00
mogemimi 4f32df255d Fix return value of VertexAttribBinding::init() 2016-04-10 08:05:19 +09:00
Adrien de Sentenac 0030beca7a Make PageView page turning event time tweak configurable. 2016-04-08 11:06:36 -04:00
Бесшапошников Никита 9acde1bc06 Fixed ccui scroll widgets constants for JS bindings 2016-04-08 15:34:25 +03:00
Sai628 dfc12c8351 Bug fix: CCValue operator overloading of Comparison "==" in case Type::VECTOR 2016-04-08 14:11:39 +08:00
Wenhai Lin f3d824843b Refine 'CCActionXXXX' (#15319)
add more check to be more stronger and simplify the codes
2016-04-08 13:40:36 +08:00
pandamicro f18763033d Merge pull request #15390 from pandamicro/v3
Fix a issue in cc.CallFunc JSB implementation
2016-04-08 09:54:13 +08:00
zilongshanren 36c5ae4d9c Merge pull request #15389 from CocosRobot/update_lua_bindings_1460042601
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-08 09:30:58 +08:00
Ricardo Quesada c4230f839e Merge pull request #15392 from ricardoquesada/chipmunk_js_fix
Chipmunk js fix
2016-04-07 16:24:28 -07:00
Ricardo Quesada f243cc4ce3 fix: use chipmunk v6.2 API whenever possible
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
2016-04-07 16:22:49 -07:00
colajam93 d023a3ad1a Add missing header 2016-04-08 02:16:22 +09:00
pandamicro f1108bfbe3 Fix a issue in cc.CallFunc JSB implementation 2016-04-07 23:49:57 +08:00
CocosRobot 416d2531fc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-07 15:25:41 +00:00
pandamicro e6d4beef8a Merge pull request #15388 from pandamicro/v3
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
pandamicro 1ada222c36 Fix some issues
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-07 22:40:32 +08:00
pandamicro 817f4f4871 Update engine version 2016-04-07 22:36:29 +08:00
minggo 6ac9a42e6c Merge pull request #15383 from mogemimi/fix-implicit-conversion
Fix implicit conversion issues with Xcode 7.3
2016-04-07 17:58:30 +08:00
minggo d8764ab730 Merge pull request #15200 from perminovVS/v3-dev-wic-image-loader-bad-hresult
WICImageLoader incorrect use S_FALSE constant
2016-04-07 17:31:15 +08:00
pandamicro 9de585077a Merge pull request #15369 from ntrrgc/develop
Make selectedSprite optional in JSB too
2016-04-07 17:07:03 +08:00
minggo aa53e9d8eb Merge pull request #15381 from dumganhar/patch-removeAllEventlistener
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener.
2016-04-07 16:34:07 +08:00
mogemimi c0e4780e77 Fix implicit conversion issues with Xcode 7.3 2016-04-07 17:01:17 +09:00
James Chen 514ac58bf3 Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener. 2016-04-07 15:50:59 +08:00
CocosRobot dfe3dc5e14 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-07 07:46:49 +00:00
minggo 328331df4f Merge pull request #15179 from mogemimi/remove-const-from-return
Remove unnecessary const from return types in PU and Lua
2016-04-07 15:41:00 +08:00
James Chen 6dff5fdc13 std::shared_ptr<bool> -> std::shared_ptr<std::atomic<bool>>
The reference count field in shared_ptr is threadsafe but the value field is not. So we need to wrap a std::atomic for preventing potential thread racing.
2016-04-07 15:06:19 +08:00
Nam Hyeon Uk 7f2b0edc04 Vector iterator declaration & initializer list constructor
* Vector iterator typedef -> alias declaration

* Vector constructor with initializer list

* fix indent
2016-04-07 13:47:01 +08:00
JANG SUN HYUK 107cef0667 getRandomObject() in Vector, Map is changed
* getRandomObject is changed

https://github.com/cocos2d/cocos2d-x/issues/15270

getRandomObject issue in Vector

* Update CCMap.h

* Update CCVector.h
2016-04-07 11:46:54 +08:00
minggo 43a70f0a92 Merge pull request #15342 from xpol/allow-easy-decrypt-plist-files
Allow plist and other ValueMap files be (easy) decrypted.
2016-04-07 11:02:20 +08:00
minggo 4bee2c4e79 Merge pull request #15361 from stevetranby/iterator-erase
Iterator erase pattern
2016-04-07 10:34:55 +08:00
minggo 0732c3892d Merge pull request #15375 from mogemimi/fix-memory-leak-cocostudio
Fix memory leak in DataReaderHelper
2016-04-07 10:21:30 +08:00
Ricardo Quesada ed42305c26 fix: works if no ';' is the the end of defines
Github issue #15376
2016-04-06 13:27:59 -07:00
Ricardo Quesada a0e260bf8b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2016-04-06 10:52:16 -07:00
Ricardo Quesada 9fae3a5ed3 Merge pull request #15204 from perminovVS/v3-dev-gl-program-feature
GLProgram replaceDefines correct and other feature
2016-04-06 10:34:44 -07:00
Ricardo Quesada ae369c1b68 fix: compile in Windows
Github issue #15372
2016-04-06 10:26:46 -07:00
mogemimi 7ec409c3bb Fix memory leak in DataReaderHelper 2016-04-07 02:22:06 +09:00
minggo 944307a5f8 Merge pull request #15260 from mxenabled/dennacerise/color_constructor
Add optional alpha parameter to Color4B and Color4F constructors
2016-04-06 11:50:02 +08:00
mogemimi 985155749b Remove unnecessary const from return types in PU and Lua 2016-04-06 12:36:20 +09:00
minggo 6b167a1aa1 Merge pull request #15335 from mogemimi/fix-typos
Fix typos in comments and strings
2016-04-06 11:32:46 +08:00
mogemimi a184c88e9d Add missing virtual destructor in ILocalizationManager 2016-04-06 01:40:41 +09:00
Juan Luis Boya García 73b900a77f Make selectedSprite optional in JSB too 2016-04-05 12:58:50 +02:00
CocosRobot 81448cd1b8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-02 12:06:57 +00:00
zilongshanren 3192267af0 Merge pull request #15358 from zilongshanren/fixTextFieldPasswordStyle
fix textField password bug
2016-04-02 20:01:45 +08:00
Steve Tranby 24fd25e143 Iterator erase pattern 2016-04-01 18:29:21 -06:00
pandamicro 3d7d5de95d Merge pull request #15317 from pandamicro/v3
Fix Socket IO handshake issue with latest version libwebsocket
2016-04-01 22:27:57 +08:00
zilongshanren 8587440e31 remove unneed c_str call 2016-04-01 10:01:37 +08:00
zilongshanren 90087ae5a7 improve textfield code 2016-04-01 09:31:18 +08:00
zilongshanren dcb7c58216 fix textField password bug 2016-04-01 00:52:55 +08:00
pandamicro d93fbea0f6 Fix Socket IO connection issue on iOS 2016-03-31 21:21:20 +08:00
minggo 5f4e8a65c4 Merge pull request #15348 from minggo/action_issue
some bugs fixed of Repeat
2016-03-31 14:47:54 +08:00
minggo 67e2eb12eb Merge pull request #15355 from xiaofeng11/v3
rollback chipmunk export change
2016-03-31 11:47:06 +08:00
肖峰 5b10ab3c2d rollback chipmunk export change 2016-03-31 11:01:58 +08:00
zilongshanren 016979af3b fix TextField password issue 2016-03-30 18:19:28 +08:00
minggo a11bf8b32e Merge pull request #15352 from minggo/js_version
[ci skip]upgrade engine version
2016-03-30 15:19:11 +08:00
minggo 48d24f14d7 upgrade engine version 2016-03-30 15:17:49 +08:00
minggo fcd64e081d some bugs fixed of Repeat
1. action may be ran more than specified times
2. instant action will ran one frame later
2016-03-30 14:05:22 +08:00
Xpol Wan cd1c26ecd1 Allow plist and other ValueMap files be (easy) decrypted.
The origin implementation of `FileUtilsApple::getValueMapFromFile()` reads the contents of file and parse it by calling one Apple API.
This make it harder to decrypt user encrypted plist files.

This commit use the `FileUtils::getDataFromFile()` to get read file data first then use `getValueMapFromData()`
to parse it into a ValueMap. Where `FileUtils::getDataFromFile()` can be overwrite by user's decoding file utils (say `DecodingFileUtils`).

I know that user's `DecodingFileUtils` can also overwrite `getValueMapFromFile`, but this pr make the author of `DecodingFileUtils` less suffering.
2016-03-29 21:39:16 +08:00
肖峰 44331137d8 Fix in cpp-test bugs test scene 13 crash 2016-03-29 16:45:16 +08:00
zilongshanren 6e3d69dded Merge pull request #15336 from cocos2d/v3.10
V3.10
2016-03-29 11:23:11 +08:00
mogemimi 44080a04d8 Fix typos in comments and strings 2016-03-29 10:52:17 +09:00
Wenhai Lin 392d1e858f Merge pull request #15314 from WenhaiLin/v3-0323
Refine 'CCFontXXXX'
2016-03-25 21:55:00 +08:00
Wenhai Lin c3a8cabe5d refine 2016-03-25 21:21:09 +08:00
pandamicro 7e87b8b389 Fix Socket IO handshake issue with latest version libwebsocket 2016-03-25 17:13:28 +08:00
minggo ffdfcd4aa9 Merge pull request #15311 from MSOpenTech/v3-winrt
Win10 UWP and Windows 8.1 fixes for v3.11
2016-03-25 09:42:13 +08:00
Wenhai Lin a93cbe8a32 Refine 'CCFontXXXX' 2016-03-24 23:05:22 +08:00
Wenhai Lin 66576f19dc Merge pull request #14230 from mogemimi/fix-memory-leak-fontfnt
Fix memory leak in FontFNT
2016-03-24 19:59:14 +08:00
Dale Stammen ee05081f3a fixed include paths 2016-03-23 12:14:12 -07:00
Dale Stammen 12e34ca9d4 updated to v3.11 2016-03-23 12:13:44 -07:00
Dale Stammen bd72d7a6de updated chipmunk include path 2016-03-23 12:12:44 -07:00
zilongshanren db00d4944c Merge pull request #15293 from zilongshanren/fixDetachIME
fix systemFontDirty and lineBreakMode issue
2016-03-23 16:37:53 +08:00
mogemimi de0582844e Fix memory leak in FontFNT 2016-03-23 15:17:05 +09:00
minggo 3c676d9712 Merge pull request #15037 from Shulepov/spriteframecache_pixel_format
SpriteFrameCache: take pixelFormat into account if specified
2016-03-23 09:48:35 +08:00
CocosRobot 6e12d8c98a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-22 12:58:39 +00:00
Xpol Wan a225130010 Fixes windows universal build. 2016-03-22 18:51:58 +08:00
Xpol Wan ae3fbcce79 Manually fixes include path for generated code. 2016-03-22 16:08:28 +08:00
Xpol Wan 71f0537734 Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths 2016-03-22 16:07:02 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
zilongshanren ff6b7080f5 fix systemFontDirty and lineBreakMode issue 2016-03-22 14:47:33 +08:00
CocosRobot 35645d8c26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-22 06:24:54 +00:00
zilongshanren 400e77808c Revert "UIEditBox attachWithIME, detachWithIME make working" 2016-03-22 14:18:39 +08:00
zilongshanren a15a39095f fix system font dirty issue 2016-03-21 22:31:23 +08:00
CocosRobot 97130dc084 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-21 12:56:42 +00:00
Xpol Wan 32e408487f Fixes import path for m and mm files. 2016-03-21 20:12:58 +08:00
Xpol Wan 931d56bc10 Fixes includes in .m and .mm files. 2016-03-21 11:02:00 +08:00
Xpol Wan 768f02bae3 revert pch.cpp for windows 8.1 and windows 10. 2016-03-21 11:00:32 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
minggo dcb3aa20c1 Merge pull request #15237 from njh0602/somefix
remove unnecessary scope operator
2016-03-18 18:31:53 +08:00
CocosRobot e2f820df25 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-18 09:11:18 +00:00
zilongshanren 7993ad93d2 fix jsb API inconsistency.
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
2016-03-18 16:18:40 +08:00
zilongshanren 56878bd441 Merge pull request #14532 from xpol/refactor-utf-module
Overhaul UTF modules and add full set of UTFs conversion functions.
2016-03-18 14:00:47 +08:00
zilongshanren 6ce5ee24b4 Merge pull request #15274 from zilongshanren/fixJsBindings-deprecated
fix polygon api typo
2016-03-18 13:44:40 +08:00
zilongshanren 2bb4847848 Merge pull request #15251 from xpol/detect-apple-platforms
Detect Apple platforms
2016-03-18 13:44:24 +08:00
Xpol Wan 4bbfb56983 Try fixes binding generator error. 2016-03-18 10:21:38 +08:00
zilongshanren 589d7e47bf fix polygon api typo 2016-03-17 17:16:56 +08:00
zilongshanren a1b4cd845f Revert "Fix incorrect function name of getTrianglesCount" 2016-03-17 16:38:17 +08:00
zilongshanren 11ed05a0be Merge pull request #15245 from mogemimi/fix-function-name
Fix incorrect function name of getTrianglesCount
2016-03-17 16:08:40 +08:00
CocosRobot c250ac8bfd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-17 05:53:10 +00:00
zilongshanren 034410f5c5 Merge pull request #15259 from mxenabled/steerlink/ccnode_do_enumerate
Enumerate getChildren() instead of _children.
2016-03-17 13:47:57 +08:00
mogemimi 2f75effe96 Add backwards compatibility for 'getTriaglesCount' 2016-03-17 14:22:09 +09:00
zilongshanren d6f9ed93d6 add bindings 2016-03-17 11:56:48 +08:00
zilongshanren f5119a8dea Merge pull request #15262 from CocosRobot/update_lua_bindings_1458186037
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-17 11:44:02 +08:00
CocosRobot 69960024e5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-17 03:42:52 +00:00
zilongshanren ad7ac83128 Merge pull request #15240 from newnon/v3_not_needed_define
fix unneeded define that breaks some libraries to build on windows
2016-03-17 11:40:51 +08:00
zilongshanren 535d3b3c32 Merge pull request #15241 from newnon/v3_gl_program_imageview
GLProgram for ImageView
2016-03-17 11:39:58 +08:00
zilongshanren 00ec3690b2 Merge pull request #15242 from newnon/v3_cursor_support_for_textfield
Cursor support for text field
2016-03-17 11:39:11 +08:00
zilongshanren 18992b0404 Merge pull request #15252 from xiaofeng11/v3_studioRef
Remove cocos2dx.h reference from all cocos studio related files
2016-03-17 11:38:20 +08:00
YooJaehong 7eeccbc771 UIEditBox attachWithIME, detachWithIME make working
(android, iOS tested)
2016-03-17 10:26:53 +09:00
Denna Lawrence 737455fda6 Add optional alpha parameter to Color4B and Color4F constructors 2016-03-16 16:08:49 -06:00
sheldon.teerlink c54513bb13 Enumerate getChildren() instead of _children. 2016-03-16 15:03:33 -06:00
XiaoFeng 0a657cd219 Remove cocos2dx.h reference from all cocos studio related files 2016-03-16 14:02:08 +08:00
Xpol Wan 0211c372b4 Update comment. 2016-03-16 13:30:11 +08:00
Xpol Wan bfb97739e2 Detect Apple platforms correctly. 2016-03-16 13:15:41 +08:00
mogemimi 23a05ddab2 Fix incorrect function name of getTrianglesCount 2016-03-15 07:39:42 +09:00
Sergey 8541dead20 Cursor support for text field 2016-03-14 18:09:04 +03:00
Sergey 980d5fec68 GLProgram for ImageView 2016-03-14 17:05:39 +03:00
Sergey 0d67d5d533 fix unneeded define that breaks some libraries to build on windows 2016-03-14 16:58:01 +03:00
dimon4eg b7779180b1 fix annoying "callBackName cannot be found" log 2016-03-14 12:11:23 +02:00
NamJunHyone 98cbc6c359 remove unnecessary scope operator 2016-03-14 18:33:58 +09:00
XiaoFeng 06ac05259b More fix to compile libjscocos2dx as dll under win32 2016-03-14 12:06:14 +08:00
Vladimir Perminov 5c1a272178 Remove comment // S_FALSE is succeeded 2016-03-13 19:30:13 +03:00
Steve K. Chiu 4769890d4e Fix calculation of outLength
The order of integer arithmetic is important, the original code fail to
calculate the length correctly, e.g. inLength 20 for base64Encode should
output 28, not 30. It is fixed and simplified with this commit.
2016-03-12 15:42:52 +08:00
CocosRobot 16edf90f70 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-11 14:40:00 +00:00
zilongshanren 1409adc07a Merge pull request #15205 from mogemimi/fix-mojibake-and-typo
Fix typos in the documentation
2016-03-11 22:33:31 +08:00
zilongshanren 5a3a4c356f Merge pull request #15195 from perminovVS/textfiled-support-cursor-v1.2
Textfiled support cursor v1.2
2016-03-11 22:32:55 +08:00
Vladimir Perminov fa7d9c7163 Remarks zilongshanren
Copy constructor remove from StringUTF8
StringUTF8::set change to StringUTF8::replace
TextFieldTTF::setCursorUse change to TextFieldTTF::setCursorEnabled
TextFieldTTF::_cursorUsechange to TextFieldTTF::_cursorEnabled
2016-03-11 15:09:50 +03:00
pandamicro 0424ab2db5 Merge pull request #15222 from xiaofeng11/v3_depsUpdate
update deps
2016-03-11 16:20:09 +08:00
XiaoFeng 3acea03924 Update deps lib and chipmunk manual binding to support both libcocos2dx and libjscocos2dx compiled as dll file under win32 system 2016-03-11 15:44:28 +08:00
xiaofeng11 7b338c2f4c Merge pull request #15223 from geron-cn/v3bugfixs
fix bug: eventframe can be enter one time when event time has a single frame.
It's OK, merged
2016-03-11 13:34:21 +08:00
geron-cn b3ee96ebd2 fix bug: https://github.com/cocos2d/cocos2d-x/issues/15084 2016-03-11 12:56:58 +08:00
Ricardo Quesada 9477bfd801 Merge pull request #15135 from dumganhar/ws-close-fix
Closes websocket connection by dispatching a 'resetDirector' event.
2016-03-10 17:39:47 -08:00
mogemimi 582835b670 Fix typos in the documentation 2016-03-11 00:34:32 +09:00
geron-cn 7824acc34e fix scrollview bugs:
- fix bar's position not right after size changed
- fix bar setAutoHideEnabled some time not right
2016-03-10 18:06:20 +08:00
geron-cn 0bd9d1638d Squashed commit of the following:
commit 976d28b4d1c71576799ecd4d7cc51e39f3d15b2d
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:58:17 2016 +0800

    avoid warning

commit 1c0ad1a56262bdb37f76badc7b40925e413999f3
Merge: 4604c47 b9b3049
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:52:43 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 4604c47ded82a83b675d1f418fe0015683e6a57b
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:51:02 2016 +0800

    fix bugs:
    - fix there is a bar dot after init a scrollview with scrollbar
    - fix some time var can not auto hide after scroll

commit e70b093d8e8a18b532c50c23f4c43b0131933ea4
Merge: 45268ac f2c9994
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Mar 7 15:32:08 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 45268ac10bf579b16a0beb8ad45b55512b47b49f
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Mar 7 15:30:47 2016 +0800

    remove inline

commit a1c70265dfc2fd0ffbe8ff81a987af7d0bbc7a06
Merge: 8269019 b5a44bc
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Mar 4 10:48:41 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 8269019874ca1bd0d265dff14e105e56bcc15bb2
Merge: 46f2e8c a6b02fc
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 18:43:40 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
2016-03-09 19:08:18 +08:00
xiaofeng11 b9b3049acb Merge pull request #15213 from FrostPolaris/v3
Fix the bug that TextField may be set with a multi-line localized text.

It's OK, merged.
2016-03-09 18:34:03 +08:00
pandamicro 849a2ee544 Merge pull request #15215 from minggo/firefox-remote-debug
[ci skip]fix a bug that will miss packets
2016-03-09 16:59:03 +08:00
minggo e44f4d8d61 fix a typo 2016-03-09 16:07:57 +08:00
minggo 8079c55d88 fix bug that will lost incoming packets 2016-03-09 16:03:55 +08:00
beichen.liu 8f9233be00 Fix the bug that TextField may be set with a multi-line localized text. 2016-03-09 09:31:34 +08:00
Vladimir Perminov 7011c3a7e4 GLProgram replaceDefines correct and other feature 2016-03-07 17:05:20 +03:00
Vladimir Perminov 3e16236a95 WICImageLoader incorrect use S_FALSE constant 2016-03-07 15:48:49 +03:00
Vladimir Perminov 8c8c741213 Wrong log message if use tga image 2016-03-07 15:41:20 +03:00
Vladimir Perminov 2a201a5c4e WinRT support key repeat and implement dispatchControlKey 2016-03-07 14:43:44 +03:00
Vladimir Perminov 8eec628e04 Desktop implement dispatchControlKey
And fix bag control char for OSX onGLFWCharCallback
glow send on CharCallback character control key unicode.
2016-03-07 14:33:59 +03:00
Vladimir Perminov 6bc36912ae TextFieldTTF support cursor
If TextField active(focused input text) show text cursor( default '|',
change TextFieldTTF::setCursorChar ).
Show/Hide interval CURSOR_TIME_SHOW_HIDE
Change position text cursor control key: KEY_HOME, KEY_END,
KEY_LEFT_ARROW, KEY_RIGHT_ARROW
CC_PLATFORM_MAC,  CC_PLATFORM_WIN32, CC_PLATFORM_LINUX default use
cursor( For change state TextFieldTTF::setCursorUse )
Text cursor worked only on LabelType::TTF
2016-03-07 14:22:03 +03:00
Vladimir Perminov b3b047e9ad Label '\b' - Next char not change x position
Add TextFormatter for easy use '\n', '\r', '\b'
2016-03-07 14:07:36 +03:00
Vladimir Perminov f2a5a5ef6b StringUTF8 - Utf8 sequence
Store each utf8 chars as std::string, for easily manipulated
2016-03-07 13:59:53 +03:00
Ricardo Quesada 21cd5d08f7 Merge pull request #15177 from ricardoquesada/cmake_fixes
"cocos new" fixes for cmake
2016-03-04 12:38:13 -08:00
Ricardo Quesada 6a31f43a27 compiles on Mac. adds missing libs and files 2016-03-04 10:47:19 -08:00
CocosRobot e31c918264 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-04 08:14:39 +00:00
zilongshanren 7c56f0bc2c Merge pull request #15181 from geron-cn/uitabcontrol
add tab control to js/lua binding generate
2016-03-04 16:08:04 +08:00
geron-cn 9ba5dffb4c add tab control to js/lua binding generate 2016-03-04 13:35:41 +08:00
xiaofeng11 e46e392ff5 Merge pull request #15175 from FrostPolaris/v3_localizeManage
Add language localization support for Button, Text, TextField and TextBMFont.

It's OK, merged
2016-03-04 11:43:47 +08:00
zilongshanren e6d2bfd014 Merge pull request #15145 from grwhitehead/fontatlas_fix
three related bug fixes in FontAtlas::prepareLetterDefinitions
2016-03-04 11:36:36 +08:00
beichen.liu b207d559ae Change the interface of LocalizationHelper::setCurrentManager. 2016-03-04 10:34:04 +08:00
zilongshanren b5a44bc2f4 Merge pull request #15170 from geron-cn/uitabcontrol
add TabControl TabHeader to tolua
2016-03-04 10:26:06 +08:00
geron-cn 46f2e8c8b6 rename deactiveTabItem 2016-03-03 18:09:07 +08:00
zilongshanren a6b02fcc5b Merge pull request #15168 from CocosRobot/update_lua_bindings_1456991724
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-03 16:01:27 +08:00
CocosRobot 169a81c6ea [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-03 07:57:25 +00:00
zilongshanren 93b7e4396b Merge pull request #15150 from mogemimi/fix-incorrect-header-include
Fix compile error on case-sensitive filesystems
2016-03-03 15:53:38 +08:00
zilongshanren e2d31c1c63 Merge pull request #15157 from mogemimi/fix-block-comment
Fix compiler warning: "/* within block comment"
2016-03-03 15:53:22 +08:00
beichen.liu 0489fd76e8 1.Change the interface in LocalizationManager.
2.Add new args of localization in simulator.
2016-03-03 15:49:50 +08:00
pandamicro 18a419a732 Merge pull request #15153 from minggo/firefox-remote-debug
[ci skip]add a function to get object name
2016-03-03 15:23:49 +08:00
geron-cn 4f6fd3ef64 Squashed commit of the following:
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 13:43:04 2016 +0800

    change enum to enum class
    use tabitem as pointer to replace _currentTabItemIndex

commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 11:48:44 2016 +0800

    Merge remote-tracking branch 'gero/tabview' into tabcontrol

commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 11:48:15 2016 +0800

    Squashed commit of the following:

    commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 21:35:06 2016 +0800

        fix

    commit e0eb069846a8ceb4b726c3c945801c944404b102
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 21:30:44 2016 +0800

        fix active deactive in tabcontrol

    commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 20:16:22 2016 +0800

        fix active -1

    commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 16:00:51 2016 +0800

        fix merge file

    commit cdd44f1c577ad190bc175896107a48fbb36b65bb
    Merge: 1658ad6 6bf55ed
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 15:57:48 2016 +0800

        Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview

        # Conflicts:
        #	cocos/ui/CMakeLists.txt

    commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 15:27:31 2016 +0800

        configure for win8.1

    commit ec236bff711b72952d48ec4d8b9137b4812b7a72
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Tue Mar 1 10:20:23 2016 +0800

        configure for iOS mac twos android linux

    commit 9d6678a4388461a791abe968fa637df2fc6839d3
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Tue Mar 1 10:02:17 2016 +0800

        add lack files

    commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 22:05:22 2016 +0800

        add test case for TabControl

    commit 97b8d8d87a37881b33ebe90478392150ef341b3e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 15:43:29 2016 +0800

        add const to getter setter

    commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 14:50:04 2016 +0800

        format the comments

    commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:51:06 2016 +0800

        remove reference

    commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:40:04 2016 +0800

        configure for win8.1

    commit c015ac54028534202f62ff85f9a9d4b62b12801e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:27:54 2016 +0800

        fix error

    commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:25:51 2016 +0800

        add interface

    commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 03:21:22 2016 +0800

        fix compile error for tw-os

    commit 3bfaa2976751e844a591ae5524bfd81249927c7c
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 03:04:23 2016 +0800

        fix linux compile error

    commit fafe3ad660e644924fd02665b77e1df4076a4802
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:54:34 2016 +0800

        re-indent code with X-Code

    commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:37:51 2016 +0800

        add reader configure for android

    commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:22:00 2016 +0800

        format code, remove some warning

    commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:02:27 2016 +0800

        configure for mac project

    commit de21cea12c0a898ea95f9951022be85bdddeefaf
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sat Feb 27 18:28:10 2016 +0800

        add comment for apis

    commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sat Feb 27 15:32:46 2016 +0800

        fix parse objects in container

    commit 53bcce68b053a5b918a29735fed393c210d9cc2c
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Fri Feb 26 22:10:54 2016 +0800

        fix flatbuffer parse

    commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Fri Feb 26 18:26:07 2016 +0800

        Init ui::TabControl

commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 21:35:06 2016 +0800

    fix

commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 21:30:44 2016 +0800

    fix active deactive in tabcontrol

commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 20:16:22 2016 +0800

    fix active -1

commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 16:00:51 2016 +0800

    fix merge file

commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 15:57:48 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview

    # Conflicts:
    #	cocos/ui/CMakeLists.txt

commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 15:27:31 2016 +0800

    configure for win8.1

commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Tue Mar 1 10:20:23 2016 +0800

    configure for iOS mac twos android linux

commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Tue Mar 1 10:02:17 2016 +0800

    add lack files

commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 22:05:22 2016 +0800

    add test case for TabControl

commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 15:43:29 2016 +0800

    add const to getter setter

commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 14:50:04 2016 +0800

    format the comments

commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:51:06 2016 +0800

    remove reference

commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:40:04 2016 +0800

    configure for win8.1

commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:27:54 2016 +0800

    fix error

commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:25:51 2016 +0800

    add interface

commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 03:21:22 2016 +0800

    fix compile error for tw-os

commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 03:04:23 2016 +0800

    fix linux compile error

commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:54:34 2016 +0800

    re-indent code with X-Code

commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:37:51 2016 +0800

    add reader configure for android

commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:22:00 2016 +0800

    format code, remove some warning

commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:02:27 2016 +0800

    configure for mac project

commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sat Feb 27 18:28:10 2016 +0800

    add comment for apis

commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sat Feb 27 15:32:46 2016 +0800

    fix parse objects in container

commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Feb 26 22:10:54 2016 +0800

    fix flatbuffer parse

commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Feb 26 18:26:07 2016 +0800

    Init ui::TabControl
2016-03-03 14:17:48 +08:00
mogemimi 3a87ee46c6 Fix compiler warning: "/* within block comment" 2016-03-03 10:44:51 +09:00
Ricardo Quesada 462f4f4c0a Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
cmake for android
2016-03-02 17:24:35 -08:00
Ricardo Quesada 028f8c28e1 Squashed commit of the following:
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 15:19:48 2016 -0800

    uses new naming convention for projects

    uses _ instead of -

commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:49:22 2016 -0800

    fooling cmake for real

commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:43:05 2016 -0800

    fooling cmake

commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:26:59 2016 -0800

    makes CMake for Mac happy

commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 13:50:15 2016 -0800

    linux fix

commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 11:18:18 2016 -0800

    links correctly!

commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Mar 1 17:44:58 2016 -0800

    Squashed commit of the following:

    commit 2ef52723dae44204c047cb177d5a5670fb659c79
    Merge: 8a5c998 25cf1f1
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Mar 1 16:54:04 2016 -0800

        Merge branch 'v3' into cmake_android

    commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:34:46 2016 -0800

        Fix module name in Android template to match CMake project.

    commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:27:45 2016 -0800

        Add missing platform specific source file to CMake project.

    commit 705389ac6582107a381d0cbc56268eaa98ffc5c3
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:21:12 2016 -0800

        Find AndroidNdkModules.cmake relative to android.toolchain.cmake.

    commit a10075e2cb30af2e1f9a30da99efac880658ad6b
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:03:11 2016 -0800

        Remove cpp-empty-test from project templates.

    commit e070fcbf210b8628f75785e738202a80a95ac0ff
    Author: WenhaiLin <wenhai.lin@chukong-inc.com>
    Date:   Mon Aug 31 09:56:03 2015 +0800

        Fix CMake for Android Target
2016-03-02 16:51:54 -08:00
minggo f8580959f8 add a function to get object name 2016-03-02 15:51:29 +08:00
mogemimi 11f3f95a2c Fix compile error on case-sensitive filesystems 2016-03-02 15:47:42 +09:00
zilongshanren 859aadd5e9 Revert "[ci skip][AUTO]: updating luabinding & jsbinding automatically" 2016-03-02 14:10:40 +08:00
CocosRobot 6e0887b2c9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-02 03:38:29 +00:00
zilongshanren dbfb4c793c Merge pull request #15132 from mogemimi/remove-const-from-return
Remove unnecessary const from return types
2016-03-02 11:31:56 +08:00
Greg Whitehead 1420ea2cbc three related bug fixes in FontAtlas::prepareLetterDefinitions 2016-03-01 16:06:45 -08:00
beichen.liu 4e4558e509 Modify the interface of localization manager. 2016-03-01 14:27:12 +08:00
zilongshanren 4dcbf4c263 Merge pull request #15133 from cocos2d/walzer-patch-1
Fix typos in CCRenderTexture.cpp comments
2016-03-01 09:30:07 +08:00
CocosRobot 56fa8fa759 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-01 00:27:33 +00:00
Ricardo Quesada 5c8d35e484 removes dead code 2016-02-29 14:02:21 -08:00
Ricardo Quesada bc11e24019 Squashed commit of the following:
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 13:11:40 2016 -0800

    binary file 82

commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 12:56:39 2016 -0800

    fore multiple in windows phone 8.1 too

commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 12:50:45 2016 -0800

    force multiple

commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 10:44:40 2016 -0800

    compiles

commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 09:37:24 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Feb 27 01:11:13 2016 -0800

    correct paths for win8.1

commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 22:46:58 2016 -0800

    projects works on win32

commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:57:10 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:26:55 2016 -0800

    trying to make it compile on win32

commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 10:28:12 2016 -0800

    quick hack to make it compile...

    ...autogenerated files will fix it.

commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 09:20:59 2016 -0800

    Squashed commit of the following:

    commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 20:10:13 2016 -0800

        compiles.. sort of

    commit a7990e2888d5ef1e43b811148b23c0b899105ab3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:55:24 2016 -0800

        more chipmunk fixes

    commit 1174f6ec8201324161d7946af0f493b136a56690
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:36:15 2016 -0800

        more chipmunk fixes

    commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
    Merge: f942c5a 0594d3c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:29:27 2016 -0800

        Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed

    commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:28:51 2016 -0800

        correct path for chipmunk

    commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 18:44:05 2016 -0800

        compiles on ios

    commit 379503399c384ad77d25d68a2f83b71a829b1c04
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:51:36 2016 -0800

        chipmunk include fixes

    commit 95839fb7b406a32255853294b016d8c15aec1ed6
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:09:04 2016 -0800

        fixes for cmake + mac

    commit 39449ea3b7efccae2946785c1c11433d964ee480
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:51:25 2016 -0800

        correct includes

    commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:35:40 2016 -0800

        fixes chipmunk with cmake

    commit 337f21f9466703722847635301d841ace9b757cb
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:42:01 2016 -0800

        updates android and linux projects

    commit 7111a9993b97f78cf73206804b25665c21a59ca8
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:18:26 2016 -0800

        cosmetic changes

    commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:53:41 2016 -0800

        chipmunk autogenerated files

    commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:47:41 2016 -0800

        compatibility both in JS (to reduce space)

        and in C for (C++ users)

    commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:10:02 2016 -0800

        mooooore fixes

    commit 9ab23014093677e8eda69b105f50410b8c792aa3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:30:58 2016 -0800

        doesn't crash with collision handler

    commit 69275a16817a038244bbaaff9e82a011b6729cb2
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:16:29 2016 -0800

        adds missing space functions

    commit a6b97bbc76cb9ab293356bb7451cfa858353f589
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 22:22:27 2016 -0800

        queries... better

    commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 19:48:41 2016 -0800

        adds more missing functions

        fixes other chipmunk JS issues

    commit 3797a033896d059da58a05ce0de832ed9c150eff
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 18:30:21 2016 -0800

        yep... poly works ok

    commit d1bb57776891605b9d3e4fb90736c6869d96b944
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:29 2016 -0800

        neede compat files

    commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:04 2016 -0800

        query working!

    commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:57:03 2016 -0800

        almost there

    commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:18:46 2016 -0800

        fixes return values

    commit 7218778da846e1e36a510c0a19a5ee76f91db032
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 20:36:14 2016 -0800

        cpMomentForSegment is manual since parameter 4 is optional

        in chipmunk 6, but not in 7

    commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 17:29:28 2016 -0800

        yeah... process the arguments correctly

        works both for functions and auto_classes

    commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 16:49:00 2016 -0800

        compiles and links

        fixes some issues with the queries.
        returns shapes instad of the queryInfo

    commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 15:03:18 2016 -0800

        adds removeCollisionHandler and other fixes

    commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 18 20:59:24 2016 -0800

        compiles... doesn't work yet

    commit bd64de81713fb2d7652a538d667d73f05f5d9320
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Feb 17 18:17:39 2016 -0800

        WIP: chipmunk bindings
2016-02-29 13:53:00 -08:00
James Chen 48e7d70d9d Removes unused include in CCDirector.cpp 2016-02-29 18:58:17 +08:00
James Chen 037051d9c4 Closes websocket connection by dispatching a 'resetDirector' event. 2016-02-29 18:55:51 +08:00
beichen.liu fe917e00fc Add language localization support for Button, Text, TextField and TextBMFont. 2016-02-29 18:00:14 +08:00
Zhe Wang 1fbef195a3 Fix typos in CCRenderTexture.cpp commnets
Qualcomm Andreno GPU -> Adreno GPU
2016-02-29 16:22:56 +08:00
mogemimi 2a8d84e7f9 Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
肖峰 6b4a0f808f Add cocostudio localization editor export data parser and demo 2016-02-26 17:15:24 +08:00
CocosRobot 78c99e33e9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-26 02:11:26 +00:00
mogemimi 5de611b4b5 Fix typo of function name in AsyncTaskPool 2016-02-26 00:22:46 +09:00
pandamicro e991282ed8 Merge pull request #15109 from dongtaohan/v3
exported api for Cocos Studio.
2016-02-25 14:35:57 +08:00
CocosRobot 9a11556f4b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-25 06:01:49 +00:00
xiaofeng11 c3eeb7c6b9 Merge pull request #15113 from zilongshanren/improve-node-api-docs
improve the api doc for node.
2016-02-25 13:56:23 +08:00
zilongshanren c56835d743 improve the api doc for node.
fixes https://github.com/cocos2d/cocos2d-x/issues/15100
2016-02-25 11:43:36 +08:00
zilongshanren 92dca220ce improve mac editbox 2016-02-25 11:05:18 +08:00
dongtao.han 34b1c1bc18 exported js_get_type_from_native for cocos2d::Node type. 2016-02-25 09:47:19 +08:00
dongtao.han 7955721cb9 exported api. 2016-02-25 09:46:34 +08:00
beichen.liu f1d8a28b96 Add FlatBuffers serialize function for language data used in Cocos Studio. 2016-02-24 14:59:37 +08:00
feijing566 fda721fae2 Add "id" for parser object
Add "id" for parser object
2016-02-23 14:07:04 +08:00
Victor K ce8f85f33e set music volume control as default 2016-02-22 11:43:01 +03:00
Ricardo Quesada 37db8407f1 Merge pull request #14867 from dumganhar/refactor-websocket
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-02-21 06:59:59 -08:00
pandamicro 7607382440 Merge pull request #15094 from pandamicro/v3
Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2016-02-21 20:58:21 +08:00
pandamicro 6e8c46d0be Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS 2016-02-21 20:20:32 +08:00
zilongshanren d28acbf2fe Merge pull request #13906 from perminovVS/unzopen-use-getsuitablefopen
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
2016-02-19 15:36:06 +08:00
zilongshanren 5072e11bac Merge pull request #15069 from chengstory/FixRealBoolValueError
Fix value type error when read value of bool type from .plist file.
2016-02-19 14:07:29 +08:00
zilongshanren dbb10d73e1 Merge pull request #15051 from Shulepov/fix_drawing_in_incorrect_app_states_iOS
Fix drawing in incorrect app states on iOS
2016-02-19 14:00:37 +08:00
CocosRobot b2fd4b0c32 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-19 02:19:55 +00:00
zilongshanren 9a65b0c7a1 Merge pull request #15065 from mogemimi/add-missing-reference-types
Add missing reference-return types
2016-02-19 10:14:07 +08:00
zilongshanren 3a2900494f Merge pull request #15080 from njh0602/somefix
fix return value
2016-02-19 10:09:55 +08:00
mogemimi 1d9e688707 Fix typos in documentation 2016-02-18 16:16:36 +09:00
肖峰 4e501149a3 Fix lua-test link error under linux 2016-02-18 10:53:33 +08:00
NamJunHyone 79c69d77d6 fix return value 2016-02-18 11:23:54 +09:00
mogemimi 8280f06c1f Add missing reference-return types 2016-02-18 05:10:42 +09:00
James Chen 0cb94cc373 Merge branch 'v3_libwebsockets' of https://github.com/xiaofeng11/cocos2d-x into refactor-websocket 2016-02-17 14:56:57 +08:00
James Chen 7d43e35741 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket 2016-02-17 14:56:32 +08:00
CocosRobot 4d7186f5bd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-16 09:07:51 +00:00
zhangcheng 2b1511096e Fix ValueVector read type error. 2016-02-16 17:01:54 +08:00
zhangcheng 53cbc2d32b Fix value type error when read value of bool type from .plist file. 2016-02-16 16:50:54 +08:00
pandamicro ca836aa5cb Merge pull request #15067 from pandamicro/v3
Fix C++ project crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro
2016-02-16 16:27:00 +08:00
pandamicro 1030151047 Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro 2016-02-16 13:43:11 +08:00
zilongshanren 9d8d003ac8 Merge pull request #15039 from Shulepov/scale9sprite_shaders_support
Scale9Sprite: allow to set custom shaders (fix #12753)
2016-02-15 21:24:14 +08:00
zilongshanren ca7fa1ecd2 Merge pull request #15048 from aardvarkk/binaryfontfix
Bitmap font sizes are not loaded from binary .fnt files.
2016-02-15 21:17:04 +08:00
zilongshanren c1013d153a Merge pull request #15061 from xiaofeng11/v3
make UIEditBox code compatible with 32bit MacOSX project
2016-02-15 21:16:49 +08:00
pandamicro cb60561053 Merge pull request #15060 from pandamicro/v3
Cleanup log for New memory model
2016-02-15 17:59:28 +08:00
肖峰 57badc99aa make UIEditBox code compatible with 32bit project 2016-02-15 17:38:54 +08:00
pandamicro 6e7c9ab8db Cleanup log 2016-02-15 17:19:37 +08:00
pandamicro 94c62bed53 Remove ScriptingCore::retainCount 2016-02-15 16:32:00 +08:00
pandamicro bbf89cf016 Fix director restart issue 2016-02-15 16:30:32 +08:00
mogemimi 4c1c238f74 Fix format string warnings 2016-02-15 01:41:08 +09:00
CocosRobot f1f0a7130f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-14 06:53:19 +00:00
pandamicro cb4d24e1ee Merge pull request #14759 from pandamicro/hbmemory
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
pandamicro 39e7759e77 Fix LuaEngine compilation issue 2016-02-14 10:18:27 +08:00
XiaoFeng 85fc074e29 libwebsockets have been compiled as static lib, remove libwebsockets.dll from win10 & win8.1 project 2016-02-14 10:07:00 +08:00
XiaoFeng c6bfe24d5b Merge commit 'refs/pull/14867/head' of https://github.com/cocos2d/cocos2d-x into v3_libwebsockets 2016-02-14 10:05:31 +08:00
pandamicro 6bbfc846da Update bindings generator and Activate new memory model by default 2016-02-14 09:48:29 +08:00
Mikhail Shulepov 014f8e107f fix: ensure calling opengl only when app is active 2016-02-13 11:17:55 +03:00
Mikhail Shulepov ab17455b18 fix: ensure drawing in main thread (layoutSubviews may be called in web thread due to banners) 2016-02-13 11:16:35 +03:00
Ian Clarkson 1dbac01659 Bitmap font sizes are not loaded from binary .fnt files.
This problem causes bitmap fonts based on .fnt files to not appear at all, and no error is thrown.
Fixes #15042.
2016-02-12 14:21:18 -05:00
Mikhail Shulepov 15f0aaa598 Texture2D::getStringForFormat - added missed formats 2016-02-12 19:04:30 +03:00
Mikhail Shulepov ec664bc08b Added aliases for PixelFormat names 2016-02-12 17:25:11 +03:00
Mikhail Shulepov 112fceae81 Texture2D: RGB888 -> A8 conversion (white - full opacity, black - full transparency) 2016-02-12 17:23:56 +03:00
CocosRobot 89c0c801b0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-11 13:40:35 +00:00
zilongshanren 4db0d2c47a Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
add Mac Editbox multiline  support.
2016-02-11 21:33:56 +08:00
Mikhail Shulepov 19e2434326 Scale9Sprite: allow to set custom GLProgram 2016-02-11 16:18:41 +03:00
Mikhail Shulepov 8ad49c1bbc SpriteFrameCache: take pixelFormat into account if specified 2016-02-11 15:47:23 +03:00
Ricardo Quesada 576458f4bd Merge pull request #15027 from ricardoquesada/renderer_merge_tri_quad_squashed
Renderer improvments: TriangleCommand and QuadCommand merged
2016-02-08 13:39:51 -08:00
Ricardo Quesada 4a318c0048 Renderer improvments: TriangleCommand and QuadCommand merged
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
  - QuadCommand is just a subclass of TriangleCommand (simpler)
  - but statically it allocates indices internally (like any TriangleCommand) (more
    memory, but not that much)
- adds more tests for SpritePolygon
- adds test for batching Tri + Quad command
- and fixes some other bugs

Squashed commit of the following:

commit cce893a9114da5dda91a895e4e661894f365e2c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 8 06:56:57 2016 -0800

    QuadCommand: indices are static

    thanks @Darinex

commit e5fd1c14e93d2f07b8266bfec03cf7206d348f59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun Feb 7 19:18:42 2016 -0800

    little improvements in xcode proj management

commit 6cd29764e01ad300f4e89e62aa6b399f73e94f01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun Feb 7 19:05:52 2016 -0800

    Renderer improvments: TriangleCommand and QuadCommand merged

    - more options for batching (faster)
    - less flushing in between commands (faster)
    - less renderer code (easier to maintain)
    - less VBO/VAO (less memory)
    - uses temporary buffer for faster rendering (more memory)

    and fixes some other bugs

    Squashed commit of the following:

    commit af7a209435c5f2430c31ab3ebcc7f45051eacb1a
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Sun Feb 7 18:55:27 2016 -0800

        adds test for batching quads and tris

    commit 25816e3eaeffd4b0cfe5fa15e97ff84e9013b8be
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Sun Feb 7 18:40:15 2016 -0800

        cleanup renderer

    commit 7f9785056681756c865d603516c7e14c46040e82
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Sun Feb 7 15:34:48 2016 -0800

        clean up docs

    commit 92a8b679dd404e4ca2839d85e2bd925195b12996
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Sun Feb 7 15:18:52 2016 -0800

        QuadCommand converted to Triangles command

    commit 7e21ec12d3781f6964b4d639cfa4bdc79eb8ae80
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 5 16:17:29 2016 -0800

        adds missing files... new test as well

    commit d1bd4391785515bdc2e1bebbeb3f321f983b51f2
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 5 14:35:41 2016 -0800

        more tests for poly sprites

    commit 5775a25b1046671bd0f5af4c5ab52b308b34bb39
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 5 00:30:13 2016 -0800

        malloc instead of std::vector

    commit 14a5d45cc978c55a182c03f181ca2bc603776561
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 4 21:40:46 2016 -0800

        little optimization

    commit 5667cb2b62416f8a439a54c3973d5841fbe1b68b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 4 19:13:13 2016 -0800

        quad works as expected

    commit 462aef05baa6586591882faa366839bead4be068
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 4 15:22:59 2016 -0800

        works

    commit c789e6c42811278563c7682b5620296ae8d84aeb
    Merge: d6c3729 de62924
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 4 14:08:49 2016 -0800

        Merge branch 'v3' into uniform_matrix_auto

    commit d6c37297954af752ebf42ec5f71e5e2fe28c9cc2
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 4 13:54:07 2016 -0800

        works ok...

    commit 45c288631989ea735cc31ec5aa683d9d41aacab3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 4 12:58:34 2016 -0800

        quad works!

    commit 7137cff51df09adee7129738cea2b69da090756e
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Feb 3 16:19:34 2016 -0800

        more optimizations... WIP... doesn't work yet

    commit a8324c1a9acb6b82102e05eee6e5e5f341306c7b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 2 21:59:42 2016 -0800

        compiles in release mode

        more tests... better threshold

    commit 884ffc756e7520fcbb9252260181538ec81b8368
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 2 17:21:32 2016 -0800

        initial uniform_auto_matrix commit

        Changes the CC_matrix uniform in runtime depending on whether the command can be batched or not.

        Lot of things missing, though... like performance tests.
2016-02-08 11:25:37 -08:00
mogemimi bf1b9df495 Add missing 'override' keywords 2016-02-08 17:22:17 +09:00
pandamicro c03d2c57d7 Made console.log writable 2016-02-05 15:13:07 +08:00
zilongshanren de62924e60 Merge pull request #15018 from zilongshanren/tweakPageViewTurningEvent
tweak PageView page turning event time.
2016-02-04 17:12:49 +08:00
zilongshanren 805be977fe tweak PageView page turning event time. 2016-02-04 15:57:32 +08:00
zilongshanren 35b0112290 fix linux compile issue 2016-02-04 15:30:16 +08:00
zilongshanren a93bc88d31 add Mac Editbox multiline support.
1. It also refactor the original logic and optimize the iOS EditBox implementation.
2016-02-04 14:21:07 +08:00
mogemimi 44d2a161dc Remove unnecessary c_str() calls 2016-02-04 11:52:14 +09:00
Wenhai Lin 4992037c5c Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
CocosRobot 330751a150 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-03 09:50:03 +00:00
zilongshanren 4f388d769a Merge pull request #15002 from WenhaiLin/v3-TargetedAction-donefix
Fixed TargetedAction::isDone always return false!
2016-02-03 17:44:26 +08:00
pandamicro 72be9a3966 Fix other issues 2016-02-02 23:39:18 +08:00
pandamicro 3c550853bc Fix restart game issue and windows crash issue 2016-02-02 23:38:37 +08:00
pandamicro 08056b7b02 Fix debugger issue 2016-02-02 16:45:17 +08:00
pandamicro fefd05e54d Fix Menu event get released issue 2016-02-02 16:44:32 +08:00
Wenhai Lin bae36b7a98 Label:Fixed characters are displayed incorrectly with some specific font. 2016-02-02 11:16:36 +08:00
Wenhai Lin eba594bb41 Fixed TargetedAction::isDone always return false! 2016-02-02 11:07:38 +08:00
CocosRobot 4ab9ffff4f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-01 06:34:11 +00:00
zilongshanren 36668071bb Merge pull request #14986 from GuoLunHao/v3_version
update cocos2d-x's version to 3.11
2016-02-01 14:28:14 +08:00
zilongshanren ee31d2ad22 Merge pull request #14940 from mxenabled/stop_auto_scroll
Add ability to stop auto scrolling in ui::ScrollView and extension::ScrollView
2016-02-01 14:27:55 +08:00
lunhao.guo b2e5e480fe update cocos2d-x's version to 3.11 2016-01-29 14:49:05 +08:00
CocosRobot 346144742f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-28 04:01:53 +00:00
zilongshanren 41edaa8b32 Merge pull request #14975 from greekman99/master
Fixed subtle documentation issues
2016-01-28 11:55:56 +08:00
minggo e246390c42 Merge pull request #14978 from xpol/const-ref-args-for-file-utils-write-methods
Small refactor FileUtils.
2016-01-28 10:36:31 +08:00
pandamicro 01f41921d1 Fix enableDebugger issue 2016-01-28 01:55:10 +08:00
pandamicro e2568b3a6f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
Conflicts:
	tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
pandamicro de9b51c0cf Fix other GC issues 2016-01-28 01:03:50 +08:00
pandamicro 554523a201 Use JS::Heap instead of Mozilla::maybe to improve stability 2016-01-28 01:03:13 +08:00
zilongshanren b0d0a7a064 Merge pull request #14964 from zilongshanren/fix14909
fix pageview page turning event issue
2016-01-27 20:53:48 +08:00
zilongshanren 366407ca1c fix win32 compile issue 2016-01-27 20:21:32 +08:00
Xpol Wan 56e5cf2101 Fixes indent. 2016-01-27 13:43:55 +08:00
Xpol Wan d8bf7fa767 Remove unnecessary memory copy when saving string. 2016-01-27 13:40:19 +08:00
Xpol Wan ea9dda052b Better name for data to be saved. 2016-01-27 13:39:31 +08:00
Xpol Wan f3aef10d33 Should be const reference for data/string args to be written. 2016-01-27 11:22:46 +08:00
Justin Luong bd4615795e fixed documentation for better reading clarity 2016-01-27 11:42:25 +10:00
pandamicro 93987c7848 Remove PersistentRooted as much as possible and use pure JS references 2016-01-26 19:33:35 +08:00
Justin Luong c89df2f243 Merge remote-tracking branch 'upstream/v3' 2016-01-26 20:52:55 +10:00
zilongshanren 83a6fd36ce Merge pull request #14971 from mogemimi/use-string-instead-of-chars
Replace char* with std::string in HttpRequest
2016-01-26 09:59:23 +08:00
zilongshanren f853a43e04 Merge pull request #14970 from mxenabled/steerlink/cleanup_obsolete_win32
Remove obsolete Win32 references.
2016-01-26 09:58:32 +08:00
mogemimi 7dd7dfede7 Replace char* with std::string in HttpRequest 2016-01-26 05:13:18 +09:00
sheldon.teerlink 60d640442f Remove obsolete Win32 references. 2016-01-25 12:23:53 -07:00
zilongshanren bc44769b8b add more deprecated functions 2016-01-25 18:14:48 +08:00
zilongshanren 00ad5bd620 fix jsb deprecated constants 2016-01-25 15:40:51 +08:00
zilongshanren b43764fc92 fix lua deprecated function bindings 2016-01-25 14:48:17 +08:00
elloop 341575aa4c 1. We should define `std::string ret` in where we really need it. According to my test on android platform the function returns at `return "";`, which makes the `ret` unnecessary.
2. `charsWritten` is not used, we should either delete it or use it. Because we don't check the bytes written, I think we can just delete it.
3.  We don't need (logLength+1) space for `logBytes`, because `logBytes`  returned by calling glGetShaderInfoLog(shader, logLength, nullptr, logBytes) takes `logLength` bytes at most, including the ending null character,  i.e. `(strlen(logBytes) + 1 ==  logLength)` always yield true. According to the offical opengles sdk docs: https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetShaderInfoLog.xml.
and
https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetShaderiv.xml

4. We don't need `logBytes[logLength] = '\0';`, because `logBytes` returned is already null-terminated.
2016-01-25 12:22:30 +08:00
zilongshanren dbf5b2c4a5 fix pageview page turning event issue 2016-01-25 11:53:40 +08:00
pandamicro d6cedb88ec Remove JS::Persistent and move js object reference into JS scope 2016-01-24 19:47:26 +08:00
pandamicro 0daa846020 Improve gc test case and add cycle reference tests
t

Improve gc test case and add action cycle reference test
2016-01-24 19:47:24 +08:00
Justin Luong 6644781698 Merge remote-tracking branch 'upstream/v3' 2016-01-23 21:06:33 +10:00
CocosRobot 039286f814 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-22 14:25:59 +00:00
Ricardo Quesada fccbcdef69 Merge pull request #14947 from ricardoquesada/rich_text_word_wrap
RichText with word wrapping working as expected
2016-01-22 06:20:25 -08:00
Ricardo Quesada 7582518424 default is word-wrap 2016-01-22 06:20:01 -08:00
James Chen 28a3f78c65 Adds missing <mutex>, <memory> include files in WebSocket.h 2016-01-22 18:10:24 +08:00
James Chen b73b16d425 Adds isDestroy std::share_ptr variable to dectect whether websocket instance was destroyed. 2016-01-22 17:43:30 +08:00
James Chen c3e0edde06 'closed' state has to be set before quit websocket thread. 2016-01-22 16:10:49 +08:00
James Chen a64a789308 _readyState must be set to State::CLOSED and _delegate->onClose(this) must be invoked at the end of WebSocket::close. 2016-01-22 15:20:43 +08:00
James Chen ed9ed6c92f Don't change the behavior of WebSocket::close method. WebSocket::close is an synchronous method before, adds a WebSocket::closeAsync method for asynchronous closing. 2016-01-22 14:22:33 +08:00
Justin Luong 57d218421e Merge remote-tracking branch 'upstream/v3' 2016-01-22 16:02:07 +10:00
Ricardo Quesada 25f78e490d RichText with word wrapping working as expected 2016-01-21 21:44:45 -08:00
Justin Luong c4df3ccd10 please ignore just a test 2016-01-22 11:05:43 +10:00
Josh Bodily c75cfcbbfa Export WICImageLoader form DLL 2016-01-21 15:35:51 -07:00
mogemimi 37b0d7c217 Mark equals() functions as const 2016-01-22 06:09:27 +09:00
Shane Smit ace1e9d563 Fixed variable rename to _autoScrollTotalTime 2016-01-21 11:18:52 -07:00
zilongshanren be7c8c7553 Merge pull request #14888 from xiaofeng11/v3_actiontimeline
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-21 15:35:30 +08:00
Ricardo Quesada ec2d29ed16 Merge pull request #14930 from ricardoquesada/rich_text_fixes
adds JS tests for RichText
2016-01-20 22:47:35 -08:00
xiaofeng11 015994da37 Merge pull request #14926 from geron-cn/scroll_bar
add scrollview bar parse for cocostudio in reader
2016-01-21 13:09:34 +08:00
geron-cn 7b405b29bc fix code indent 2016-01-21 11:33:13 +08:00
Ricardo Quesada 4c11432781 fixed bold 2016-01-20 19:08:31 -08:00
zilongshanren 841ad8ae99 Merge pull request #14716 from newnon/v3.10_editbox_ios_mac_fix
fix font for EditBox in iOS & Mac
2016-01-21 11:05:12 +08:00
zilongshanren d9af70f913 Merge pull request #14600 from enhhh/enh_v3
We should not intercept touch event if scrollview's _direction is NONE
2016-01-21 10:58:20 +08:00
zilongshanren 790c7b4b79 Merge pull request #14891 from mogemimi/fix-extra-tokens-warning
Fix warning: extra tokens at end of #ifdef directive
2016-01-21 10:51:01 +08:00
zilongshanren 4d128a83f4 Merge pull request #14659 from elvman/resizable_window
Resizable window
2016-01-21 10:49:33 +08:00
zilongshanren 8fda08abcd Merge pull request #14755 from mogemimi/fix-redefinition-warning
Fix OpenGL macro redefinition warning in JS bindings/Mac
2016-01-21 10:46:58 +08:00
zilongshanren 2ed4965b6d Merge pull request #14751 from newnon/v3_get_version_windows
getVersion win32 implementation
2016-01-21 10:42:19 +08:00
Ricardo Quesada 60d273e31b underline and strikethrough working ok on system fonts 2016-01-20 18:41:59 -08:00
zilongshanren 2fbf4c1539 Merge pull request #14932 from CocosRobot/update_lua_bindings_1453343722
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-21 10:41:00 +08:00
CocosRobot 4dab20b715 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-21 02:37:23 +00:00
zilongshanren fd0ed05f18 Merge pull request #14902 from mogemimi/update-docs-to-v3
Update docs to reflect latest API changes
2016-01-21 10:35:27 +08:00
zilongshanren e1e87c0205 Merge pull request #14914 from steerlink/font_family
Add ability to get the font family
2016-01-21 10:34:13 +08:00
zilongshanren c642014d1e Merge pull request #14927 from mogemimi/fix-unsigned-comparison-warn
Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF()
2016-01-21 10:32:56 +08:00
zilongshanren 061c6c7c6f Merge pull request #14907 from neokim/feature/scroll_view_touch_total_time_threshold
Add a setter for touch total time threshold in ScrollView
2016-01-21 10:31:31 +08:00
geron-cn be6fd6a2ee format code indent 2016-01-21 10:27:37 +08:00
Ricardo Quesada 7735a75651 adds JS tests for RichText 2016-01-20 17:59:13 -08:00
Shane Smit 6fdefeb7a7 Make ui::ScrollView::scrollTo* functions virtual
This mirrors the "jumpTo*" functions, which are already virtual
2016-01-20 17:07:22 -07:00
Shane Smit c8ecab84a3 Add stopAutoScroll() to ui::ScrollView
Immediately stops inner container scroll initiated by any of the "scrollTo*" member functions
2016-01-20 17:05:52 -07:00
mogemimi 9c5eecacc7 Update docs to reflect latest API changes 2016-01-21 01:08:32 +09:00
mogemimi 639bf3f682 Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF() 2016-01-20 23:59:45 +09:00
mogemimi 73793a8317 Fix macro redefinition warning in JS bindings/Mac 2016-01-20 23:17:24 +09:00
geron-cn 87434e2774 add scrollview bar parse for cocostudio in reader 2016-01-20 21:13:59 +08:00
zilongshanren 44acbbfeb6 Merge pull request #14921 from CocosRobot/update_lua_bindings_1453285144
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-20 18:24:28 +08:00
zilongshanren 74f9f3fd0e Merge pull request #14905 from WenhaiLin/v3-remove-CocosPlayClient
Remove CocosPlayClient
2016-01-20 18:24:16 +08:00
CocosRobot b340e48cb1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-20 10:21:41 +00:00
zilongshanren a10e2d2309 Merge pull request #14915 from MSOpenTech/v3-winrt-fix
v3 added missing getFileSize() method for winrt
2016-01-20 18:16:06 +08:00
Ricardo Quesada e36d71a24c adds Invalid test
UIRichText reports error on console when parsing invalid xml
2016-01-19 21:16:53 -08:00
Ricardo Quesada 86e8f7d0b3 oops... removing debugging code 2016-01-19 20:46:57 -08:00
Ricardo Quesada 27c8e5227d Adds xml support in UIRichText
Supported tags:
- <small>: makes the font 20% smaller
- <big>: makes the font 25% bigger
- <img src="" />: to add an image
- <font face="path to font" size="size" color="#00ffaa">: font
  attributes
- <i>: italics
- <b>: bold
- <u>: underline
- <del> strike-through
- </br>: new line

Also adds support for strikethrough, italics, bold and underlie to
`Label`

Contains tests for UIRichText and Label

Squashed commit of the following:

commit a0d6ae0513d40dbf414930210ab032a49d8984a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 19 20:39:21 2016 -0800

    cleanup LabelTestNew

commit 0cf423af85d88a42fc1317207feeb3d05da7f8ab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 19 20:34:53 2016 -0800

    adds maaaany tests

    ...and fixes width and height in <img src="">

commit e8ba6acd5d79bbc766d7aa02ef166e166c801d01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jan 15 19:41:37 2016 -0800

    Label + URL working Ok

commit 36689e29ee3d77310e92264a09084cc06e30664c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jan 15 18:24:44 2016 -0800

    adding this code just in case...

    ... should use a listener component instead

commit af03708950e74483b875d0baad593aa6ed242a04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Jan 14 20:23:36 2016 -0800

    URL node

    plus <de><u> and <a img

commit e3a4930b012c0b3756752dac6ffb5ad43d24ae99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jan 13 18:42:18 2016 -0800

    strikethrough and underline implemented

    they support multiline and horizontal alignment as well
    includes test
    however vertical alignment might not work

commit 640ccf39f56e153db46785a61be7000e898174c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 12 18:14:57 2016 -0800

    bug fixes

commit 5e41fb76e91c571639585a609a255eb41797a302
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 12 16:47:20 2016 -0800

    adds italics and bold "disable test"

commit 202c5a45bb9c8ea160b9f6880ef858874e07814b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 12 14:40:13 2016 -0800

    adds italics test

commit d1a8b421445053cc36860fc376f52692a3672dfe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jan 11 20:53:23 2016 -0800

    italics is working ok

commit fdd02087fce920c27c2409301ec88685fe68085b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jan 8 17:18:56 2016 -0800

    color, size and face working

commit c01bdef6b1d49f8805b69d4c162b74cd00c8f5b3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Jan 7 19:02:16 2016 -0800

    initial commit
2016-01-19 20:41:31 -08:00
pandamicro 39ab445f7d Merge pull request #14904 from pandamicro/v3
[ci skip]Add more test case to jsb memory test
2016-01-20 11:43:49 +08:00
Dale Stammen a64be12646 added missing getFileSize() method for winrt 2016-01-19 12:36:10 -08:00
sheldon.teerlink 535dfdac27 Fix warning. 2016-01-19 11:47:18 -07:00
sheldon.teerlink 41d7a27485 Implement getFontFamily(). 2016-01-19 11:43:35 -07:00
Neo Kim df2aae0498 Add a setter for touch total time threshold in ScrollView 2016-01-18 19:25:08 +09:00
Wenhai Lin 718d2c690b Remove CocosPlayClient 2016-01-18 17:58:04 +08:00
pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
Conflicts:
	cocos/base/ccConfig.h
	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
pandamicro f8016978ff Fix an improper macro syntax for windows platform 2016-01-18 14:28:39 +08:00
mogemimi b14a3730ca Fix warning: extra tokens at end of #ifdef directive 2016-01-17 03:17:00 +09:00
pandamicro 8bc9f712ea Merge pull request #14895 from minggo/firefox-remote-debug
web console supports for JSB projects
2016-01-15 21:27:27 +08:00
minggo 5f9bd06bee support webconsole 2016-01-15 18:05:59 +08:00
minggo e062ade514 make require() returns the value of last statement 2016-01-15 18:02:11 +08:00
pandamicro 2640396822 Merge pull request #14890 from minggo/firefox-remote-debug
can use new firefox version to debug cocos2d-x jsb projects
2016-01-15 12:48:46 +08:00
minggo 299a56d52e can use new firefox version to debug cocos2d-x jsb projects 2016-01-15 11:39:17 +08:00
James Chen b04e4754d7 Refactor CCBundle3D, remove wrong use of getDataFromFile. _jsonBuffer is std::string, _binaryBuffer is Data instance now. 2016-01-15 00:55:10 +08:00
James Chen 057db2444c Removes unused code in Material::initWithFile. 2016-01-15 00:55:10 +08:00
James Chen e7ed79f655 const Data -> const Data& for function argument, performance improvement. 2016-01-15 00:55:10 +08:00
James Chen 7e0a1344ca The fix for BMFontConfiguration::parseConfigFile reads string file.
'strchr' finds a char until it gets a '\0', if 'contents' self doesn't end with '\0',
'strchr' will search '\n' out of 'contents' 's buffer size, it will trigger potential and random crashes since
lineLength may bigger than 512 and 'memcpy(line, contents + parseCount, lineLength);' will cause stack buffer overflow.
2016-01-15 00:55:10 +08:00
XiaoFeng 0f3cb16efd Fix when add two ActionTimeLine object in one node, play state is wrong 2016-01-14 16:16:37 +08:00
zilongshanren 9c86d1f0f1 Merge pull request #14880 from mogemimi/fix-minor-typo
Fix typos in comments and documentation
2016-01-14 09:58:29 +08:00
xiaofeng11 be6f9c0f03 Merge pull request #14882 from geron-cn/playableframe
add PlayableFrame
2016-01-14 09:42:17 +08:00
Ricardo Quesada d589e44b0a Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
James Chen f0066d03d7 whitespace cleanup. 2016-01-13 21:15:48 +08:00
James Chen dacd51c839 More function name renames. createThread -> createWebSocket, quitSubThread -> quitWebSocketThread. 2016-01-13 21:15:48 +08:00
James Chen 649ed67371 Removes lws_get_internal_extensions, adds permessage-deflate extension. 2016-01-13 21:15:48 +08:00
James Chen fc38857e6b LWS_SEND_BUFFER_PRE_PADDING -> LWS_PRE 2016-01-13 21:15:48 +08:00
James Chen 5d1e98340e Updates WebSocket::onSocketCallback & WebSocketTest.js 2016-01-13 21:15:48 +08:00
James Chen 2b5fde79e0 Comment fix & function name fix for WsThreadHelper:
sendMessageToUIThread -> sendMessageToCocosThread
sendMessageToSubThread -> sendMessageToWebSocketThread
joinSubThread -> joinWebSocketThread
2016-01-13 21:15:48 +08:00
James Chen 763559cd1e Invoking WebSocket::closeAllConnection while reseting Director. 2016-01-13 21:15:48 +08:00
James Chen d122784ad4 Adds WebSocket::closeAllConnections() method. 2016-01-13 21:15:48 +08:00
James Chen f9e8ae0f09 WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test). 2016-01-13 21:14:38 +08:00
geron-cn eab1de0f1e format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885 2016-01-13 16:34:04 +08:00
geron-cn e3c50caf11 add test case for PlayableFrame 2016-01-13 15:25:31 +08:00
geron-cn 0babe85947 add PlayableFrame 2016-01-12 17:21:01 +08:00
mogemimi 18a793792e Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
zilongshanren cd7671088f Merge pull request #14712 from xpol/fix-include-for-compile-under-crystax-ndk
crystax-ndk-10.3.0 needs <stdint.h> to be included in cocos/ui/UIWebViewImpl-android.h.
2016-01-12 11:56:43 +08:00
zilongshanren e1d0d7f722 Merge pull request #14854 from zilongshanren/fixScale9GrayShader
fix scale9sprite gray state opacity issue.
2016-01-12 11:50:41 +08:00
zilongshanren 161be986af Merge pull request #14340 from fnz/easyjni
easy jni
2016-01-12 11:50:16 +08:00
zilongshanren cf6fc000e7 Merge pull request #14709 from kcisoul/v3
Fix  #14428 CCRenderTexture does not work properly on some devices wh…
2016-01-12 11:35:00 +08:00
mogemimi 41dd44c75d Fix some typos in docs 2016-01-11 19:23:05 +09:00
XiaoFeng ab0efd933a Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	CHANGELOG
	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
	tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
Ricardo Quesada dc785f63ea garbage collect when transition is finished 2016-01-07 10:52:03 -08:00
zilongshanren 7d943f200f fix scale9sprite gray state opacity issue.
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 17:17:55 +08:00
zilongshanren 2797277de8 Revert "fix scale9sprite gray state opacity issue." 2016-01-07 17:07:27 +08:00
Ce Zheng 963efe78fe fix iOS downloader crash when storage path contains spaces 2016-01-07 16:58:16 +09:00
zilongshanren 1910f79b2f fix scale9sprite gray state opacity issue.
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 15:26:14 +08:00
Ricardo Quesada ddb142e211 ouch... doesn't crash on pure C++ projects 2016-01-06 11:16:55 -08:00
XiaoFeng 0fcfb359d2 Fix more js parser font setting error 2016-01-06 20:42:27 +08:00
XiaoFeng d82b6b6f1c Fix js parser use resource path name for font name when font name is blank in BMFontLoader and ButtonLoader 2016-01-06 19:36:32 +08:00
zilongshanren b45e96f77e fix indent issue 2016-01-05 10:20:05 +08:00
zilongshanren 100a119181 add overFlow enum to jsb and lua.
1. change clamp to 1 and shrink to 2
2016-01-04 21:43:37 +08:00
Andreas Loew 69eed4b99c Updated comment 2016-01-04 11:19:40 +01:00
Wenhai Lin 168e851cce Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android. 2015-12-31 10:42:06 +08:00
zilongshanren efbbdb1f58 Merge pull request #14813 from xiaofeng11/v3.10_xf_fix
Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK
2015-12-30 13:51:41 +08:00
Ricardo Quesada b92b67edad moves macro definition to `ccConfig.h` 2015-12-29 17:36:02 -08:00
Ricardo Quesada 7cd80cb669 Adds iOS tests, calls GC after replacing scene
and some bug fixes

Squashed commit of the following:

commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 19:07:01 2015 -0800

    adds missing file

commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 19:02:27 2015 -0800

    disables GC by default

commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 18:57:14 2015 -0800

    Adds iOS test and calls GC after replacing the scene

commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 15:29:01 2015 -0800

    Merge branch 'v3' into v3_js_memory_test_and_fixes

commit 79e926a970e3153ee826b299c3417fb6ac599153
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 21:27:19 2015 -0800

    fixes crashes

commit 76f3910748e15c4ea179eab846f24f3e65d52d2d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 11:57:56 2015 -0800

    Adds standalone test for JS GC memory

    and fixes leaks on extended/subclassed objects
2015-12-29 17:36:02 -08:00
Ricardo Quesada 77aa3871b6 fixes compilation issues on tvOS 2015-12-29 12:30:00 -08:00
pandamicro 6ea389f475 Merge pull request #14815 from pandamicro/v3.10
Made require overwritable
2015-12-29 22:06:00 +08:00
pandamicro daac6ceb08 Made require overwritable 2015-12-29 21:28:30 +08:00
肖峰 770f3d7f8e Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK 2015-12-29 18:31:20 +08:00
Ricardo Quesada b6d1edc8e7 Merge branch 'tvos_support' of github.com:ricardoquesada/cocos2d-x into tvos_support 2015-12-28 16:43:01 -08:00
Ricardo Quesada 666a6c6f88 adds missing scheme files 2015-12-28 16:42:44 -08:00
Ricardo Quesada 492389fd5b Update CCPlatformConfig.h 2015-12-28 16:03:48 -08:00
Ricardo Quesada 692c0f8a0e adds tvOS support
Ported tests:
 - js-tests
 - cpp-tsts
 - lua-tests
 - game-controller tests

all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
xiaofeng11 69a6406661 Merge pull request #14805 from pandamicro/v3.10
Fix JSB issues on win32
2015-12-25 20:06:47 +08:00
pandamicro fe1336bdc7 Fix chipmunk cpSpaceAddCollisionHandler issue on argument parsing 2015-12-25 19:08:33 +08:00
pandamicro 2ce866c4ba Fix jsb_ref_rebind issue on win32 (mystery GC crash) 2015-12-25 19:08:32 +08:00
pandamicro eea1c814df Merge pull request #14803 from super626/v3.10
Fix NavMeshDebugDraw bug on iphone5s
2015-12-25 18:41:42 +08:00
yangxiao 50d16c13df remove unused code 2015-12-25 17:54:58 +08:00
xiaofeng11 d61ec5bb08 Merge pull request #14804 from xiaofeng11/v3.10
Fix variable type mismatch.
2015-12-25 17:53:08 +08:00
肖峰 728682d68e Fix variable type mismatch. 2015-12-25 17:18:15 +08:00
xiaofeng11 b219828d69 Merge pull request #14801 from xiaofeng11/v3.10
Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10
2015-12-25 16:14:27 +08:00
yangxiao 20e2b4acbd fix NavMeshDebugDraw on iphone5s 2015-12-25 16:02:03 +08:00
Liam c92b563c28 fix layout backimage size error with neweset scale9sprite 2015-12-25 14:11:56 +08:00
肖峰 dea99211fb Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10 2015-12-25 11:44:11 +08:00
Liam d005bd18b7 remove error logic 2015-12-24 14:39:15 +08:00
xiaofeng11 434c79ae90 Merge pull request #14793 from super626/fixsprite2
It already been reviewed and compile by jenkins in https://github.com/cocos2d/cocos2d-x/pull/14697.
We need merge it to V3.10 to file TMX render bug.
2015-12-24 09:40:36 +08:00
Ricardo Quesada 707f08c557 Revert "fix setflip for batch sprite" 2015-12-23 09:54:04 -08:00
Ricardo Quesada 0d0534a2e1 Merge pull request #14697 from super626/v3.10-fixsprite
fix setflip for batch sprite
2015-12-23 09:53:24 -08:00
pandamicro dea1ef1290 Merge pull request #14790 from pandamicro/v3.10
Fixed WebSocket JSB crash issue
2015-12-24 01:37:17 +08:00
pandamicro acf03c06d5 Fixed WebSocket JSB crash issue 2015-12-23 23:28:14 +08:00
zilongshanren 830eb3433f Merge pull request #14786 from liamcindy/v3_ui_widget
fix uiWidget clipping error with Node
2015-12-23 18:57:15 +08:00
mogemimi b0c4adcbd0 Fix method name spelling in AutoPolygon 2015-12-23 19:07:03 +09:00
Liam 0cac519e5c fix uiWidget clipping error with Node 2015-12-23 16:05:52 +08:00
zilongshanren 851d288d0b Merge pull request #14781 from zilongshanren/rollbackSlider
Rollback slider and loadingbar in non scale9 mode
2015-12-23 15:04:55 +08:00
zilongshanren 2a2f184449 refine code with DRY. 2015-12-23 14:43:25 +08:00
zilongshanren 847094ec7d ui::loadingBar -> add flip logic back 2015-12-23 14:34:36 +08:00
XiaoFeng 3fd8f36a90 Limit force GC in menu item only work in lua-binding 2015-12-23 12:30:59 +08:00
zilongshanren d4a5d0da44 rollback uislider 2015-12-22 20:03:56 +08:00
zilongshanren ab77e8c520 Revert "loading bar use new scale9 feature"
This reverts commit a671bf7ce9.
2015-12-22 19:53:24 +08:00
XiaoFeng 82867b0073 Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
2015-12-22 18:41:44 +08:00
zilongshanren 064cd8d04f Merge pull request #14722 from newnon/v3.10_webp_improvement
WebP loading improvements WebP loaded as premultiplied alpha if it has
2015-12-22 13:43:11 +08:00
xiaofeng11 954a54f7bb Merge pull request #14770 from pandamicro/v3.10
Fix VS crash issue caused by unsupported macro syntax
2015-12-22 09:42:24 +08:00
pandamicro a91a669972 Fix VS crash issue caused by unsupported macro syntax
piece of shit...
2015-12-21 22:44:59 +08:00
CocosRobot 30f3096c92 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-21 11:36:07 +00:00
Liam 98a6558018 add interface for BMFont 2015-12-21 18:49:46 +08:00
ArisLittle 68e166568e fix some minor typos in the comments
change spelling from "a item" to "an item", "a event" to "an event", "a index" to "an index" in cocos/ui/UIListView.h
2015-12-21 14:26:50 +08:00
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