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

4622 Commits

Author SHA1 Message Date
Ricardo Quesada 6461e26c9f Squashed commit of the following: 
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 14:03:53 2014 -0700

    More WP8 fixes

commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 12:19:41 2014 -0700

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

commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 12:19:19 2014 -0700

    Adds missing resources for Windows Phone 8

commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 11:54:15 2014 -0700

    Updates CHANGELOG

commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 11:48:59 2014 -0700

    Adds Sprite3d files and tests

commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 11:16:13 2014 -0700

    fixes compiler warnings for windows

commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 10:53:34 2014 -0700

    fixes for Sprite3D

    Adds copyright header
    removes compilation warnings
    cleans code a bit

commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 20:46:26 2014 -0700

    Merge pull request #34 from dumganhar/pull/6731

    fix compilation error of missing bind Mesh for luabindings.

commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:45:12 2014 -0700

    use const & and changed typo

commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date:   Sat May 17 11:43:10 2014 +0800

    fix compilation error of missing bind Mesh for luabindings.

commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94 5c5a6b9
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date:   Sat May 17 11:33:01 2014 +0800

    Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731

commit 5c5a6b9bde410027db948b539bc3111dc243cf0b
Merge: d4285e3 5f41732
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:23:58 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit d4285e336808699f828b82c6b90a83b1b0c0978c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:22:49 2014 -0700

    remove empty lines

commit 5f4173271101e2411ffb6cbf600066e204df98d3
Merge: e272583 ac8cf25
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 20:15:44 2014 -0700

    Merge pull request #33 from dabingnn/mesh3d_work

    Mesh3d work

commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:14:01 2014 -0700

    added mesh3d file to template

commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 19:10:45 2014 -0700

    Merge pull request #32 from dabingnn/mesh3d_work

    Mesh3d work

commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 18:18:13 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 6a1b847065a1b9d369892ab011478c47e80c9195
Merge: 4feae11 4ece4b3
Author: Trace0429 <yangtuo0429@gmail.com>
Date:   Fri May 16 17:15:39 2014 -0700

    Merge pull request #31 from Trace0429/mesh3d_work

    windows work now

commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date:   Sat May 17 08:12:46 2014 +0800

    windows work now

commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 16:32:58 2014 -0700

    Merge pull request #30 from dabingnn/mesh3d_work

    Mesh3d work

commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:32:00 2014 -0700

    fix compile error after merge (MAC can work)

commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:24:11 2014 -0700

    Merge branch 'v3' into mesh3d_work

    Conflicts:
    	build/cocos2d_libs.xcodeproj/project.pbxproj
    	cocos/2d/cocos2d.vcxproj
    	cocos/2d/cocos2d.vcxproj.filters
    	cocos/Android.mk
    	cocos/CMakeLists.txt
    	cocos/renderer/CMakeLists.txt

commit 510fc0cea76bdedfae858bb930d98715ce54f7e9
Merge: e098ed7 7fea347
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 16:11:39 2014 -0700

    Merge pull request #29 from dabingnn/mesh3d_work

    Mesh3d work

commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:08:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:05:37 2014 -0700

    bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw

commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 16:02:27 2014 -0700

    bind buffer to 0 when finish draw

commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 14:00:38 2014 -0700

    fix outline width

commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 13:47:17 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 13:47:12 2014 -0700

    make some member protected

commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 13:06:17 2014 -0700

    Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d

commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 13:04:27 2014 -0700

    linux work now

commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 12:48:34 2014 -0700

    inc drawcall

commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 12:31:44 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 12:31:31 2014 -0700

    Merge pull request #28 from dabingnn/mesh3d_work

    Mesh3d work

commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 12:30:01 2014 -0700

    optimize code

commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 12:29:37 2014 -0700

    adjust code style

commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 12:06:53 2014 -0700

    Merge pull request #27 from dabingnn/mesh3d_work

    Mesh3d work

commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 12:06:02 2014 -0700

    fix visual error for outline

commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 11:54:54 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 11:54:47 2014 -0700

    fix shader, add multiple sprite to Sprite3DEffectTest

commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 11:33:31 2014 -0700

    Merge pull request #26 from dabingnn/mesh3d_work

    Mesh3d work

commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 11:30:34 2014 -0700

    share the same glprogram in effect3DOutline

commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 11:19:56 2014 -0700

    add class static variable for EffectOutline

commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837cea
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 11:07:04 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 213bbb0c289e579895e92620153b95a8cf374521
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 10:55:28 2014 -0700

    add mesh.h in cocos2d.h

commit 94d789610c9d4426b14e655a73197c652afc74f6
Merge: fa69e09 9af9da5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 10:41:24 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 10:41:05 2014 -0700

    remove namespace

commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 10:30:23 2014 -0700

    Merge pull request #25 from dabingnn/mesh3d_work

    Mesh3d work

commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 10:27:28 2014 -0700

    remove redundant uniform CC_Texture0

commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 10:20:01 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit ff15926f47edfbb1250440b060c1d887cfecd033
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 09:11:36 2014 -0700

    warning more than one texture

commit 5debbf8d6de4563361974b67aa52e572f7df9dd6
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 08:45:03 2014 -0700

    remove redundant line

commit ed357e7484a63bc3eb208d589943f802b7832e4d
Merge: a1e2306 25dd07e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 22:53:10 2014 -0700

    Merge pull request #24 from dabingnn/mesh3d_work

    Mesh3d work

commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 22:52:33 2014 -0700

    fix memory leak

commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 22:49:04 2014 -0700

    remove unused member variable

commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 22:37:16 2014 -0700

    Merge pull request #23 from dabingnn/mesh3d_work

    Mesh3d work

commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 22:35:48 2014 -0700

    fix memory leak

commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 20:01:49 2014 -0700

    Merge pull request #22 from dabingnn/mesh3d_work

    Mesh3d work

commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 20:01:29 2014 -0700

    android work now

commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:53:39 2014 -0700

    remove sprite3dEffect include

commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:50:17 2014 -0700

    remove unused Sprite3dEffect

commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:48:12 2014 -0700

    remove unused outline shader files

commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:43:17 2014 -0700

    fix error on IOS

commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 18:47:37 2014 -0700

    Merge pull request #21 from dabingnn/mesh3d_work

    Mesh3d work

commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:46:54 2014 -0700

    adjust indent, and line to the end of the file

commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:35:18 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

    Conflicts:
    	cocos/3d/CCSprite3D.cpp
    	cocos/3d/CCSprite3D.h
    	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp

commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:31:06 2014 -0700

    add testCase for outline

commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:03:34 2014 -0700

    extract base class Effect3D

commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 18:02:45 2014 -0700

    RendeMeshData member rename

commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 17:57:29 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date:   Thu May 15 17:54:24 2014 -0700

    Merge pull request #20 from Trace0429/mesh3d_work

    Mesh3d work

commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 17:54:03 2014 -0700

    android meshcommand

commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date:   Fri May 16 08:50:38 2014 +0800

    windows work now

commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 17:38:41 2014 -0700

    raw EffectSprite

commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 16:37:20 2014 -0700

    remove SpriteEffect from Sprite3D

commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 16:34:36 2014 -0700

    raw effectSpriteTest

commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 16:14:57 2014 -0700

    use meshcommand

commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 15:38:30 2014 -0700

    use meshcommand

commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 15:31:43 2014 -0700

    comment out effect framework

commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 15:11:25 2014 -0700

    Merge pull request #19 from dabingnn/mesh3d_work

    Mesh3d work

commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:55:06 2014 -0700

    fix compile error in testcases

commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:52:43 2014 -0700

    fix compile error after merge with v3

commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:48:19 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit d6f6f633927eb00df984ec4239555f9ce2c7e44d
Merge: c6fbd6e 76d2523
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 14:26:40 2014 -0700

    Merge pull request #18 from dabingnn/mesh3d_work

    Mesh3d work

commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:25:40 2014 -0700

    move 3d shaders to shader cache

commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 13:56:00 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 13:55:49 2014 -0700

    meshcommand

commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 13:21:36 2014 -0700

    add mesh rebuild when come to foreground in android

commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 13:13:59 2014 -0700

    android work now

commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 12:21:40 2014 -0700

    Merge pull request #17 from dabingnn/mesh3d_work

    Mesh3d work

commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 12:19:24 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 12:18:49 2014 -0700

    commit the changed IOS/MAC project file

commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 12:17:57 2014 -0700

    remove MeshPart

commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 11:03:54 2014 -0700

    Merge pull request #16 from dabingnn/mesh3d_work

    Mesh3d work

commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 10:59:10 2014 -0700

    raw version of single Mesh

commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 10:44:04 2014 -0700

    fix outline

commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 10:09:45 2014 -0700

    without normal no outline effect

commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 22:39:03 2014 -0700

    android listenBackToForeground

commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 21:58:09 2014 -0700

    add boss1 with normal

commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 21:54:20 2014 -0700

    change cache

commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 21:35:59 2014 -0700

    depress no .mtl crash

commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 15:58:50 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 15:58:36 2014 -0700

    merge dabingnn

commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 15:53:58 2014 -0700

    Merge pull request #15 from dabingnn/mesh3d_work

    Mesh3d work

commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 15:52:58 2014 -0700

    android can work now

commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 15:33:07 2014 -0700

    refactoring render code

commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 15:27:21 2014 -0700

    Merge pull request #14 from dabingnn/mesh3d_work

    Mesh3d work

commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 15:26:19 2014 -0700

    Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work

commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 15:25:55 2014 -0700

    android can compile now(can not work)

commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 14:21:09 2014 -0700

    Merge pull request #13 from dabingnn/mesh3d_work

    Mesh3d work

commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 14:15:16 2014 -0700

    include Sprite3DEffect in the cocos2d header

commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 12:51:09 2014 -0700

    outline sprite

commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 10:48:55 2014 -0700

    meshvertexattrib work

commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 10:40:55 2014 -0700

    use meshvertexattribute

commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 09:41:57 2014 -0700

    Merge pull request #12 from dabingnn/mesh3d_work

    Mesh3d work

commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:40:14 2014 -0700

    remove compile error

commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:31:14 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc
Merge: da24c48 5a2127d
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 00:25:47 2014 -0700

    vertex attrib

commit da24c48c981029493900bcd2143495e546faa75e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 23:49:09 2014 -0700

    mesh vertex attribute

commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd
Merge: d98adb7 5148f76
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 19:06:38 2014 -0700

    Merge pull request #11 from dabingnn/mesh3d_work

    Mesh3d work

commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 19:05:40 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 19:04:15 2014 -0700

    fix texcoord y flipped

commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 18:35:08 2014 -0700

    Merge pull request #10 from dabingnn/mesh3d_work

    Mesh3d work

commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 18:22:16 2014 -0700

    added blendFunc

commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 16:03:01 2014 -0700

    Merge pull request #9 from dabingnn/mesh3d_work

    Mesh3d work

commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 16:01:59 2014 -0700

    fix compile error after merge

commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 15:56:46 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit da7d6a087f22f4a11827ff3410fbcd2561f155fc
Merge: 0caad32 f413b4e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 14:19:24 2014 -0700

    Merge pull request #8 from dabingnn/mesh3d_work

    Mesh3d work

commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 14:17:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 14:15:06 2014 -0700

    add new interface for createSprite3D

commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 13:58:35 2014 -0700

    default GLProgram to object

commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 13:13:24 2014 -0700

    remove compile warning

commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 13:01:20 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 12:59:59 2014 -0700

    rename init->initWithFile in Sprite3D

commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 12:58:23 2014 -0700

    Merge pull request #7 from super626/mesh3d_tmp

    Mesh3d

commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 12:56:06 2014 -0700

    Merge branch 'mesh3d_tmp' into mesh3d

commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 11:59:46 2014 -0700

    Merge pull request #6 from dabingnn/mesh3d_work

    Mesh3d work

commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:53:17 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:52:41 2014 -0700

    adjust line indent and header file define

commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 11:44:22 2014 -0700

    using vbo

commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 11:42:10 2014 -0700

    Merge pull request #5 from dabingnn/mesh3d_work

    Mesh3d work

commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:39:06 2014 -0700

    add CCSprite3d include into cocos2d.h

commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:33:18 2014 -0700

    remove cocos2d.h include in Sprite3DTest.h

commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 11:28:47 2014 -0700

    Merge pull request #4 from dabingnn/mesh3d

    Mesh3d

commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:26:40 2014 -0700

    fix compile error after rename

commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:07:30 2014 -0700

    rename FileXXX to CCFileXXX

commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 10:52:36 2014 -0700

    rename _model to _mesh

commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Mon May 12 22:23:59 2014 -0700

    Merge pull request #3 from dabingnn/mesh3d

    Mesh3d

commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Mon May 12 22:21:22 2014 -0700

    fix retain/release in sprite3D

commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Mon May 12 20:04:16 2014 -0700

    remove compile warnings

commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 19:16:25 2014 -0700

    using glprogramstate work ok

commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 18:38:52 2014 -0700

    add obj

commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 18:33:23 2014 -0700

    use glprogramstate

commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 13:01:56 2014 -0700

    sprite3d

commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Mon May 12 10:52:17 2014 -0700

    Merge pull request #1 from dabingnn/newcode

    Newcode

commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Mon May 12 10:50:14 2014 -0700

    Merge branch 'v3' into newcode

commit 23a5232fe5bb4c0b0bc821d1945426486dafe253
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 09:44:41 2014 -0700

    3d mesh initial code
 2014-05-18 14:49:16 -07:00
vision 81ddbaa7b1 update the calculation of device pixel resolution 2014-05-19 01:12:56 +08:00
zifter d875f27c67 Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 
Conflicts:
	cocos/ui/UIListView.h
	cocos/ui/UIPageView.h
 2014-05-17 10:40:36 +03:00
James Chen 7da07342fe Merge pull request #6734 from 2youyouo2/v3 
fixed no effect with stopping tween between two frames
 2014-05-17 12:17:34 +08:00
CocosRobot 844cc9bcef [AUTO]: updating luabinding automatically 2014-05-17 03:20:49 +00:00
Ricardo Quesada ef700f2e3a Fixes android build issues 
also restores file for VS
 2014-05-16 18:16:20 -07:00
Ricardo Quesada a1243ca9ed Squashed commit of the following: 
commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 17:37:58 2014 -0700

    little fixes in project

commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 17:33:11 2014 -0700

    CopyTemplates working

commit 8c1555cb0369bf123f84733839ef30c30f70f4ff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 17:22:05 2014 -0700

    Re-adds CopyTemplate to VS solution

commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 16:40:22 2014 -0700

    Updated shaders

    and project fixes
 2014-05-16 17:38:52 -07:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

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

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00
Huabing.Xu 38b4e7ad2c fix memory leak for GLProgramState create logic 2014-05-16 11:02:23 -07:00
minggo e3f2c3985d Merge pull request #6777 from boyu0/physics_rollback_for_lua 
Roll back lua PhysicsTest.
 2014-05-16 21:55:52 +08:00
minggo 540418840b Merge pull request #6737 from seobyeongky/dispatcher_bug_fix 
EventDispatcher bug fix
 2014-05-16 18:35:51 +08:00
minggo bf2250a67a Merge pull request #6738 from cocoscodeide/v3 
update template project lua
 2014-05-16 18:10:10 +08:00
boyu0 74335a92f7 Roll back lua PhysicsTest. 2014-05-16 17:19:02 +08:00
minggo eb38809630 Merge pull request #6756 from zifter/FixTwiceCallingOnExit 
Fix twice calling on exit
 2014-05-16 17:10:42 +08:00
Jason Xu 67a558c83d for 93562d6aa6 
update Cocos2dxHelper and AndroidManifest.xml template.
 2014-05-16 15:55:00 +08:00
andyque b434840bc9 issue #5183, add layout parameter type to widget for convenient access 2014-05-16 10:33:28 +08:00
andyque 1b3c28ea90 Merge branch 'v3' into refactorLayout 
Conflicts:
	cocos/ui/UILayout.cpp
 2014-05-16 10:22:53 +08:00
James Chen d6007a395c Adds a virtual method for loading native libraries. 2014-05-16 10:20:49 +08:00
Ricardo Quesada 7e4597508c Does not crash on Mac if the .ttf file is not found 2014-05-15 17:22:53 -07:00
Ricardo Quesada 9d1ab1ba07 uniform sampler CC_Texture0 MUST NOT be defined on shaders 
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
 2014-05-15 16:47:54 -07:00
AlexV 234c902630 fixing cmakelist after merge 2014-05-15 22:26:41 +09:00
AlexV 0bec438be8 Merge branch 'v3' of github.com:asmodehn/cocos2d-x into asmo_newv3_cmake_win32 2014-05-15 22:24:33 +09:00
minggo 9f67e74878 Merge pull request #6764 from minggo/monkey-test 
EditBox: Check text content before being sent to cpp
 2014-05-15 18:22:35 +08:00
samuele3hu 6f6cfba21b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-15 16:57:08 +08:00
samuele3hu cde4e4811b Update some GuiConstants and resubmission pr#6361. 2014-05-15 16:54:55 +08:00
CocosRobot 44c6c4d542 [AUTO]: updating luabinding automatically 2014-05-15 08:18:44 +00:00
samuele3hu 95dfbf7dae Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-15 15:40:28 +08:00
samuele3hu 5a14b1d67b fix compile error and synchronizate the UI change for Lua 2014-05-15 15:39:15 +08:00
minggo 385b2507aa Merge pull request #6615 from xhcnb/fix_ActionObject 
FIx: correct TotalTime of ActionObject.
 2014-05-15 15:39:15 +08:00
zifter c8a1004a4d Little refactor. 2014-05-15 09:43:18 +03:00
andyque fc8d286fcb closed #5188, fixed android NULL pointer exception 2014-05-15 12:11:11 +08:00
minggo 39d3d65157 Merge pull request #6754 from minggo/monkey-test 
Matrix -> Mat4
 2014-05-15 11:10:39 +08:00
minggo 67f809e223 Matrix -> Mat4 2014-05-15 11:09:17 +08:00
andyque cfa0342618 Merge branch 'v3' into issue5005 
Conflicts:
	cocos/ui/UIWidget.cpp
 2014-05-15 11:03:03 +08:00
andyque 3f08dd2758 issue #5183, remove no needed type 2014-05-15 10:48:33 +08:00
andyque b32ca246e7 issue #5183, done 2014-05-15 10:44:19 +08:00
andyque 5697d2417a issue #5183, done 2014-05-15 10:23:25 +08:00
andyque 0639e49031 issue #5183, add LayoutProtocol 2014-05-15 10:07:42 +08:00
byeonggee.seo c6f2a2aeb3 name fix 2014-05-15 10:19:59 +09:00
zifter 287b10f070 Fixed double calling onExit method. 2014-05-14 23:28:47 +03:00
Ricardo Quesada 6c025d22b5 Merge pull request #6746 from ricardoquesada/shadertest2_fixes 
Improvments on the shader2 tests
 2014-05-14 13:10:17 -07:00
Ricardo Quesada 839170c147 Improvments on the shader2 tests 2014-05-14 13:09:33 -07:00
CocosRobot 7b45fc90a8 [AUTO]: updating luabinding automatically 2014-05-14 17:16:02 +00:00
Ricardo Quesada dc711643cd Squashed commit of the following: 
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 14 10:03:44 2014 -0700

    math renames

    `Vector2` -> `Vec2`
    `Vector3` -> `Vec3`
    `Vector4` -> `Vec4`
    `Matrix` -> `Mat4`

commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:24:28 2014 -0700

    raw version of rename Vector3

commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:07:14 2014 -0700

    rename Vector2 after merge

commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:05:30 2014 -0700

    Merge branch 'v3' into v3_renameMathClassName

    Conflicts:
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp

commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 08:51:45 2014 -0700

    rename vector2 in tests/cpp-empty-test folder

commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:58:23 2014 -0700

    rename vector2 in tests/cpp-tests cpp files

commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:52:57 2014 -0700

    rename vector2 in tests/cpp-tests head files

commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:49:48 2014 -0700

    rename vector2 in extension folder

commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:47:22 2014 -0700

    rename vector2 in cocos/2d cpp files

commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:44:39 2014 -0700

    rename vector2 in cocos/2d head files

commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:59 2014 -0700

    rename vector2 in cocos/base folder

commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:43 2014 -0700

    rename vector2 in cocos/deprecated folder

commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:26 2014 -0700

    rename vector2 in cocos/editor-support folder

commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:36:48 2014 -0700

    rename vector2 in cocos/ui folder

commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:39 2014 -0700

    rename vector2 in cocos/renderer folder

commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:15 2014 -0700

    rename vector2 in cocos/physics folder

commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:25:01 2014 -0700

    rename vector2 in cocos/math folder

commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:16:55 2014 -0700

    rename Vector2 to Vec2
    deprecate typedef Vector2
 2014-05-14 10:07:09 -07:00
zifter 6fcef92708 Fix Progress Action. 2014-05-14 19:13:14 +03:00
vision 90e2b8a4af move the method from ccUtils to Director 2014-05-14 19:42:24 +08:00
minggo abc08e703f Merge pull request #6728 from pandamicro/FixParticlesInit 
Fixed #5040: Remove memory allocation assertion to permit multiply init
 2014-05-14 18:39:13 +08:00
minggo d46362abb3 Merge pull request #6681 from minggo/director-fix 
[ci skip] don't trigger onExitTransitionDidStart
 2014-05-14 18:24:26 +08:00
andyque 967c071c68 issue #5183, refator LayoutExecutant 2014-05-14 18:24:23 +08:00
andyque 8c8f9611f7 issue #5183, add CCLayoutExecutant file 2014-05-14 18:03:44 +08:00
James Chen 8a92b6cc7f Merge pull request #6736 from CocosRobot/update_lua_bindings_1400061063 
[AUTO]: updating luabinding automatically
 2014-05-14 18:02:30 +08:00
byeonggee.seo 76cd9911cb bug fix 2014-05-14 18:58:55 +09:00
minggo fba3bf2d15 Merge pull request #6735 from Dhilan007/v3_labelfix 
label's small improvement.
 2014-05-14 17:58:46 +08:00
CocosRobot 6f6d233ea5 [AUTO]: updating luabinding automatically 2014-05-14 09:52:20 +00:00
minggo db0ea94b8a Merge pull request #6730 from andyque/refactor5110 
refactor ui framework
 2014-05-14 17:47:47 +08:00
andyque 6cb3b47488 closed #5110, refactor 2014-05-14 17:07:24 +08:00
Dhilan007 059ea3dd8a label's small improvement. 2014-05-14 16:41:26 +08:00
vision dfb016dde3 move the utility from Renderer to UtilsHelper 2014-05-14 16:25:47 +08:00
andyque 9d5c2ba773 closed #5110, add const specifier to getStringLength function 2014-05-14 16:25:30 +08:00
andyque 09fce798f0 closed #5110, add const reference to typedef 2014-05-14 16:14:28 +08:00
andyque 437b30487c issue #5110, refactor UITextBMFont 2014-05-14 16:02:31 +08:00
andyque 76cefcaa3f issue #5110, refactor UITextAtlas 2014-05-14 15:51:50 +08:00
andyque e6889dca36 issue #5110, refactor UIText 2014-05-14 15:26:14 +08:00
yinkaile e30e05ce92 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-14 15:13:38 +08:00
samuele3hu ee4e5e4800 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-14 14:45:15 +08:00
andyque 578ff2735d issue #5110, fix VideoPlayer android compile error 2014-05-14 14:44:04 +08:00
samuele3hu 534ad2aafb fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value 2014-05-14 14:43:10 +08:00
minggo f22804241a Merge pull request #6725 from dumganhar/ref-tracker 
Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses
 2014-05-14 13:44:22 +08:00
James Chen 4c23ff5b8c trackRef and untrackRef are static function now. 2014-05-14 11:55:20 +08:00
pandamicro a463a1630f Fixed #5040: Remove memory allocation assertion to permit multiply init 2014-05-14 11:49:09 +08:00
andyque 46cf6251b6 issue #5110, rename a member variable and delete gui prefix in ui tests 2014-05-14 11:26:04 +08:00
vision 7b0cf3c860 replace std::function with const std::function& 2014-05-14 11:21:46 +08:00
andyque e6a36fde18 issue #5110, refactor VideoPlayer 2014-05-14 11:18:11 +08:00
andyque 08801c035e issue #5110. refactor UILoadingBar, remove unneeded deprecats 2014-05-14 10:48:16 +08:00
vision e7df247d65 replace more tabs with spaces to uniform the code styles. 2014-05-14 10:40:56 +08:00
James Chen 54176b0267 Include <algorithm> for std::find 2014-05-14 10:31:09 +08:00
James Chen c14482254d Fixes wrong indention and whitespace cleanup 2014-05-14 10:25:45 +08:00
James Chen ba3f5f8eee Updates indention in CCRef.h 2014-05-14 10:17:08 +08:00
James Chen 72d29976c3 Disables memory tracker by default 2014-05-14 10:16:05 +08:00
James Chen eb8f07370c Remove a comment in CCRef.cpp 2014-05-14 10:12:49 +08:00
James Chen d9d4d9d51a Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses 2014-05-14 10:07:03 +08:00
CocosRobot 20c50ef189 [AUTO]: updating luabinding automatically 2014-05-14 02:03:18 +00:00
minggo 0303e5d270 Merge pull request #6716 from andyque/issue4900 
closed #4900, add TTF font to UIText
 2014-05-14 09:57:57 +08:00
andyque ca4a7a7e53 issue #4900, refactor 2014-05-14 09:55:55 +08:00
andyque 92d9120967 issue #4900, refactor 2014-05-14 09:37:21 +08:00
andyque df86b07f15 closed #5005, refactor 2014-05-14 09:23:56 +08:00
vision 021be6ef9b Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot 2014-05-14 09:22:36 +08:00
Ricardo Quesada 723938e292 Adds effectNode in ShaderTest2 2014-05-13 18:12:58 -07:00
Ricardo Quesada 0171e27747 Merge pull request #6714 from Dhilan007/v3_nodefix 
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
 2014-05-13 14:14:27 -07:00
zifter 249dffa346 getter always must be a const method. 2014-05-13 23:28:04 +03:00
Ricardo Quesada 6462a1bf79 Adds simple sample for multitexturing 2014-05-13 12:55:34 -07:00
Ricardo Quesada 31dd70dba2 Matrix::identity() -> IDENTITY 
consistency with the rest of the  cocos2d API
 2014-05-13 10:26:25 -07:00
visiblelight 541d03d668 Now it shoudl run fine on iOS 2014-05-14 01:06:26 +08:00
visiblelight 4df8624a54 Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot 2014-05-13 22:37:40 +08:00
andyque a28bdb0ed5 closed #5005, refactor 2014-05-13 18:41:38 +08:00
minggo 05c16de87a Merge pull request #6715 from dumganhar/iss5160-animation-notification 
closed #5160: Dispatch a custom event after an animation frame is displayed
 2014-05-13 18:38:44 +08:00
visiblelight fe91f46882 The target filename shuld use a writable path. 2014-05-13 18:34:35 +08:00
andyque 2a25afbb76 closed #4900. add comment 2014-05-13 18:15:53 +08:00
minggo 7d7d0b8251 Merge pull request #6712 from dumganhar/dont-using-cocos2d-namespace-in-header 
PLEASE NEVER `using namespace cocos2d;` in header file
 2014-05-13 18:07:18 +08:00
cocoscodeide 0b301d6602 Merge pull request #5 from cocos2d/v3 
update cocos2d-x
 2014-05-13 17:59:18 +08:00
andyque 31a2194dcb closed #4900, add TTF font to UIText 2014-05-13 17:45:15 +08:00
visiblelight 0de27ad4f1 Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot 2014-05-13 17:30:16 +08:00
James Chen 1ced31a2d3 issue #5160: Don't use static variables, use member variables 2014-05-13 17:29:05 +08:00
visiblelight 5459b581b0 replace tab with spaces; remove the 'flipped' parameter; 2014-05-13 17:17:15 +08:00
andyque 41fe56ee70 closed #5005, fix a null pointer exception 2014-05-13 17:12:48 +08:00
James Chen 0cd2196b88 closed #5160: Dispatch a custom event after an animation frame is displayed 2014-05-13 17:08:30 +08:00
James Chen d0c98d6269 Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables. 2014-05-13 17:03:48 +08:00
andyque 2d88c8ea92 closed #5005, fix visible and enable issue 2014-05-13 16:37:41 +08:00
Dhilan007 1a7ca64be2 Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix 2014-05-13 16:36:42 +08:00
visiblelight 47e4ee4ff2 add a new utility function to capture the screen 2014-05-13 16:23:35 +08:00
James Chen 86411837c6 PLEASE NEVER `using namespace cocos2d;` in header file 2014-05-13 16:15:21 +08:00
Ricardo Quesada cd194cad9f Merge pull request #6711 from ricardoquesada/indent_issues 
fixes more indentation issues
 2014-05-13 00:10:30 -07:00
Ricardo Quesada 8aea6fe89f fixes more indentation issues 2014-05-13 00:10:01 -07:00
CocosRobot 7ad48b632a [AUTO]: updating luabinding automatically 2014-05-13 07:03:12 +00:00
Ricardo Quesada f25de7869b indentation issues 2014-05-12 23:57:46 -07:00
andyque 1c47c833c6 issue #5005, fixed widget visit method 2014-05-13 14:56:44 +08:00
andyque 810c25b85e Merge branch 'v3' into issue5005 2014-05-13 14:52:49 +08:00
andyque 1a319b3f12 issue #5005, deprecated setTouchEnabled 2014-05-13 14:52:27 +08:00
Ricardo Quesada cdac920b5f Merge remote-tracking branch 'cocos2d/v3' into multitexturingsupport 2014-05-12 23:52:02 -07:00
Ricardo Quesada 71848aca93 Initial multitexturing support 2014-05-12 23:51:37 -07:00
Nite Luo 7d8cfc4cca set parent transform dirty when addChild 2014-05-12 23:28:20 -07:00
minggo 75196d96ce Merge pull request #6696 from andyque/issue5121 
issue 5121, fix loading bar init flicker and refator percentage
 2014-05-13 13:45:01 +08:00
Dhilan007 a71ee9924e closed issue:5020:The game still oriented in landscape mode when update the describes of orientation to Portrait in 'MainPage.xaml'. 2014-05-13 12:53:43 +08:00
andyque 7049fd253d closed #5121, add const to getPercent method 2014-05-13 12:06:28 +08:00
andyque b2397f4059 issue #5005, fix widget hittest problem 2014-05-13 12:04:43 +08:00
CocosRobot bf6ed6eb8b [AUTO]: updating luabinding automatically 2014-05-13 03:39:46 +00:00
minggo ccb55448da Merge pull request #6685 from andyque/refactor5118 
closed #5118, remove WidgetType and refactor LayoutType to Type
 2014-05-13 11:35:36 +08:00
andyque 7db02fc0e9 closed #5121, change percentage from int to float 2014-05-13 10:34:08 +08:00
andyque 5e01c61d8b closed #5118, fix indent 2014-05-13 10:15:29 +08:00
andyque 9125673c1c issue #5121, fix LoadingBar percentage when initialize 2014-05-13 10:13:08 +08:00
Ricardo Quesada 012f1020ca GLProgramState fixes 
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
 2014-05-12 19:12:56 -07:00
andyque c2f7c10f1c closed #5118, refactor, improving variable name 2014-05-13 09:56:10 +08:00
Ricardo Quesada 5d24b3d99a Merge pull request #6693 from MSOpenTech/wp8-v3-fix2 
Fixes for WP8 V3 build recently broken by recent commits
 2014-05-12 10:06:32 -07:00
Dale Stammen 78df412669 updated project files to latest version of cocos2d 2014-05-12 09:27:52 -07:00
Dale Stammen 34b0245cfe updated WP8 precompiled shaders 2014-05-12 09:27:27 -07:00
Dale Stammen bad71e38d0 fixed for ABSOLUTE and RELATIVE winrt compiler reserved words 2014-05-12 09:26:39 -07:00
Dale Stammen 50336dca40 updated to latest version of cocos2d 2014-05-12 09:25:37 -07:00
James Chen 602d89126f Value: initialize Value with Type::None when its move and copy 
contructor is called.
Memory leak fix in `operator =(Value&&)` move assignment.
 2014-05-12 23:32:51 +08:00
James Chen b24f742c92 Null ptr check in value assignment 2014-05-12 18:45:36 +08:00
andyque ebffc66a83 closed #5118, fix CCSGUIReader setAnchorPoint 2014-05-12 18:07:13 +08:00
andyque a0a4df5ac5 closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
minggo 9ab2dae212 Merge pull request #6635 from dumganhar/iss4660-unicode 
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
 2014-05-12 17:57:25 +08:00
CocosRobot 16b31e3157 [AUTO]: updating luabinding automatically 2014-05-12 08:14:14 +00:00
minggo f290d4d3ff Merge pull request #6632 from andyque/refactor5057 
issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of
 2014-05-12 16:10:21 +08:00
andyque 9a8c87601c Merge branch 'v3' into refactor5057 2014-05-12 15:52:47 +08:00
Dhilan007 64b2562e1f fixed compile fail on android. 2014-05-12 15:22:57 +08:00
minggo 1053cacc16 don't trigger onExitTransitionDidStart 2014-05-12 15:05:21 +08:00
andyque da3e794631 issue #5057, convert const char* to std::string& 2014-05-12 14:59:00 +08:00
Dhilan007 fc72dc040d Label:fixed wrong logic of alignment. 2014-05-12 14:34:25 +08:00
andyque 56f417c520 issue #5057, fix windows compile error 2014-05-12 14:11:44 +08:00
minggo 94f50b1856 Merge pull request #6535 from dumganhar/value-optimize 
closed #5099: Optimization for Value
 2014-05-12 13:57:50 +08:00
andyque 8232b98525 issue #5057, fix android compile error 2014-05-12 13:54:30 +08:00
CocosRobot 5c735e5277 [AUTO]: updating luabinding automatically 2014-05-12 05:44:32 +00:00
minggo b23056537b Merge pull request #6602 from minggo/remove-unneeded-codes 
remove unneeded codes
 2014-05-12 13:41:12 +08:00
andyque b735ce3ffc issue #5057, fix andriod and linux compile 2014-05-12 11:55:00 +08:00
andyque 9d7d06a1f8 issue #5047, refactor UIVideoPlayer 2014-05-12 11:35:57 +08:00
andyque 4f3c128c4f issue #5057, refator UITextField 2014-05-12 11:29:22 +08:00
andyque eeaf48d3e5 issue #5047, refactor UISlider 2014-05-12 11:17:06 +08:00
andyque 74ac5d1d5a issue #5057, refactor UIScrollView 2014-05-12 11:08:10 +08:00
andyque ba802e1308 issue #5057, refactor UIRichText 2014-05-12 10:39:30 +08:00
andyque 77a463bac3 issue #5057, refactor UIPageView 2014-05-12 10:31:52 +08:00
andyque 7f15a14d55 issue #5057, refactor LoadingBar 2014-05-12 10:12:22 +08:00
andyque 43eb75fb1a issue #5057, refactor Listview 2014-05-12 09:51:23 +08:00
yinkaile 3f83367b61 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-11 17:25:39 +08:00
James Chen 5b14338d1f Update Android.mk 2014-05-11 13:22:42 +08:00
James Chen 449d1af7a8 Merge pull request #6672 from dumganhar/linux-android-fix 
Linux android build fix
 2014-05-11 12:51:27 +08:00
James Chen 292c1a5aa4 Linux android build fix 2014-05-11 12:50:51 +08:00
James Chen 14b6a046a3 Warning fix in CCDeprecated.cpp and CCGLProgramState.h 2014-05-11 12:14:17 +08:00
James Chen 3d22c30933 issue #4660: Warning fix in CCLabel.cpp and ConvertUTF.c 2014-05-11 11:24:01 +08:00
James Chen 602fa28577 issue #4660: Updates comments and doc for deprecated ccutf8 api 2014-05-10 21:51:42 +08:00
James Chen 448c1ad352 issue #4660: Removes unused function in ccUTF8.cpp 2014-05-10 19:34:49 +08:00
Dhilan007 4692c67b78 issue #4660:remove unnecessary API. 2014-05-10 19:33:05 +08:00
James Chen 645a9761c8 issue #4660: CCTweenFunction.h/.cpp must be in 'action' filter 2014-05-10 19:33:05 +08:00
James Chen f0cf415228 issue #4660: Fix windows include path doesn't contain `external/ConvertUTF` 2014-05-10 19:33:05 +08:00
James Chen 3a30adde0f issue #4660: A warning fix in CCFontAtlas.cpp 2014-05-10 19:33:05 +08:00
James Chen 07204a0602 issue #4660: Updates win32 project 2014-05-10 19:33:05 +08:00
James Chen e693a51c6e issue #4660: Linux build ok 2014-05-10 19:24:04 +08:00
James Chen 20adf418fd Updates 2d/CMakeLists.txt 2014-05-10 19:24:04 +08:00
James Chen e003a09a2c Updates CMakeLists.txt 2014-05-10 19:24:04 +08:00
James Chen dd3ed008b9 issue #4660: Updates Android.mk 2014-05-10 19:24:04 +08:00
James Chen b003ba5eb0 issue #4660: Oops, utf16 is 2 bytes. 2014-05-10 19:24:03 +08:00
James Chen a61b1097db issue #4660: Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String 2014-05-10 19:24:03 +08:00
James Chen 5fda13639d issue #4660: Uses new utf api for Label. 2014-05-10 19:24:03 +08:00
James Chen ed8633141f issue #4660: Updates android.mk 2014-05-10 19:24:03 +08:00
James Chen 9f4d2acaee issue #4660: StringUtils is a namespace now 2014-05-10 19:24:03 +08:00
James Chen 20a8808b78 issue #4660: Refactors utf8 api, make it safer and easier to use. 2014-05-10 19:24:03 +08:00
Huabing.Xu bbac0be9a6 add deprecated alias cc.VERTEX_ATTRIB_TEX_COORDS 2014-05-09 22:04:19 -07:00
Ricardo Quesada 4d579892b1 Merge pull request #6668 from dabingnn/v3_fix_accident_changes 
V3 fix accident changes
 2014-05-09 21:38:09 -07:00
Huabing.Xu ba63befa5e roll back target=android-10 2014-05-09 21:36:35 -07:00
Ricardo Quesada a8c2fb5431 Fixes deprecated warnings 2014-05-09 21:29:24 -07:00
Ricardo Quesada 605fe8e4f3 fixes double free crash on GLProgramStateCache 2014-05-09 21:06:02 -07:00
CocosRobot f0c240f885 [AUTO]: updating luabinding automatically 2014-05-10 03:47:56 +00:00
Ricardo Quesada 32d96ca9ad Compiles on Windows Phone 8 
... but does not run
 2014-05-09 19:42:57 -07:00
Ricardo Quesada 488a8deae9 Shader fixes for windows 2014-05-09 19:13:12 -07:00
Ricardo Quesada e8d2cf7871 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 19:08:08 -07:00
Ricardo Quesada 8f71e65482 Compiles on windows, sort of 2014-05-09 19:07:22 -07:00
yangxiao d46729862c android rename ShaderCahe to GLProgramCache 2014-05-09 19:05:39 -07:00
Ricardo Quesada b62f4e51a4 Updates Linux project 2014-05-09 18:40:53 -07:00
Ricardo Quesada 77c03fcf11 ShaderCache -> GLProgramCache 2014-05-09 18:39:25 -07:00
AlexV d7f1af876a fixed network link library curl in win32 case : libcurl_imp 2014-05-10 10:07:57 +09:00
AlexV 83018eb69a adding headers in src files so they appear in IDE 2014-05-10 10:03:46 +09:00
Ricardo Quesada b5fdbf2d49 it is v3.1-alpha1 2014-05-09 17:03:34 -07:00
Ricardo Quesada faf617bc37 fixes for Linux 2014-05-09 16:57:11 -07:00
Ricardo Quesada f511b1f8a1 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 16:46:35 -07:00
Ricardo Quesada fec1b82c0a Shader files use STRINGIFY 2014-05-09 16:45:42 -07:00
yangxiao 1be6ba961c Merge branch 'newcode' into improved_glprogram 2014-05-09 16:05:42 -07:00
yangxiao 877d8dd771 android works!! 2014-05-09 15:59:49 -07:00
Ricardo Quesada 9cad6cf027 removes some unused directories from the propery sheet 
... for Visual Studio
 2014-05-09 15:35:53 -07:00
Ricardo Quesada 4c623f1f5e compiles and runs on Windows Phone 8 
What's missing is to have the pre-compiled shaders from MS
to test the the ShaderTest
 2014-05-09 15:14:50 -07:00
yangxiao 879958855b UniformValue use union array 2014-05-09 14:38:36 -07:00
Ricardo Quesada 739af170ad compiles and runs on Windows!!! 2014-05-09 13:24:56 -07:00
Ricardo Quesada 9ffaeec515 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 12:00:33 -07:00
Ricardo Quesada 16c6b2163d More VisualStudio fixes 2014-05-09 11:59:52 -07:00
Huabing.Xu e72633c066 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram 2014-05-09 11:53:22 -07:00
Huabing.Xu a8b27de799 fix bug for y flipped coord (particle system) 2014-05-09 11:50:37 -07:00
Ricardo Quesada 78dd92a7ef Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-09 11:40:13 -07:00
Ricardo Quesada 8565e899f9 adds missing files to VisualStudio 2014-05-09 11:38:43 -07:00
Ricardo Quesada dec753f0c4 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 11:36:02 -07:00
Ricardo Quesada 34a87f8332 Merge remote-tracking branch 'super626/improved_glprogram' into improved_glprogram 2014-05-09 11:28:16 -07:00
Ricardo Quesada 00834b1d6e adds missing files for Windows 2014-05-09 11:28:06 -07:00
yangxiao a986455e63 store useCache in GLProgramState 2014-05-09 10:23:24 -07:00
andyque e1fe26543d issue #5057, refactor & remove deprecated warnings 2014-05-09 18:37:22 +08:00
andyque 264769f814 issue #5057, refactor LinearGravity 2014-05-09 17:54:25 +08:00
andyque 0c0f18e7f3 issue #5047, refactor LayoutParameterType 2014-05-09 17:38:05 +08:00
andyque d12a71f738 issue #5057, refactor UILayoutDefine 2014-05-09 17:16:11 +08:00
andyque 09a53e7b03 issue #5057, refactor BackGroundColorType 2014-05-09 17:05:36 +08:00
andyque e8e0d007bd issue #5057, refactor LayoutType 2014-05-09 16:49:00 +08:00
andyque 305f052344 issue #5057, refactor LayoutClippingType 2014-05-09 16:31:22 +08:00
andyque 451b7a1b6b issue #5057, refactor UICheckBox event callback 2014-05-09 16:04:55 +08:00
andyque c5a505ec4c issue #5057, Merge branch 'v3' into refactor5057 
Conflicts:
	cocos/ui/CocosGUI.h
 2014-05-09 15:39:02 +08:00
andyque d799ffce40 issue #5057, remove include dependency 2014-05-09 15:32:51 +08:00
andyque f070fc335f issue #5057, refactor BrightStyle to strong typed enum 2014-05-09 15:23:34 +08:00
andyque 762e8d9249 issue #5057, refactor WidgetType to strong typed enum 2014-05-09 15:16:33 +08:00
andyque 6a7277c38f issue #5057, refactor TextureResType to strong typed enum 2014-05-09 14:56:05 +08:00
andyque 57ce0ee2cf issue #5057, refactor addTouchEventListener to std::function<> 2014-05-09 14:30:39 +08:00
chuanweizhang2013 d502e41af4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3 
Conflicts:
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
 2014-05-09 14:28:14 +08:00
yangxiao 95e036dd1b GLProgramStateCache 2014-05-08 21:54:49 -07:00
Dhilan007 06f264e87d rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
andyque 21e4d05e6e issue #5057, refactor SEL_TouchEvent to std::function 2014-05-09 11:28:36 +08:00
andyque a699230e75 issue #5057, replace license 2014-05-09 09:39:18 +08:00
andyque 1d7726133c issue #5057, refactor enum SizeType to strong typed enum 2014-05-09 09:37:51 +08:00
andyque 3ef1facfb0 issue #5057, replace deprecated enum with strong typed enum 2014-05-09 09:29:07 +08:00
Ricardo Quesada 7fee9cc266 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-08 18:02:27 -07:00
Ricardo Quesada 62d9c24518 moves shaders files from 2d/ to renderer/ 2014-05-08 18:01:48 -07:00
Huabing.Xu 1d5bfb5a10 roll back _yCoordFlipped changes 2014-05-08 16:45:08 -07:00
Ricardo Quesada 51f498fc94 fixed deprecation warnings 2014-05-08 16:42:36 -07:00
Ricardo Quesada 2e669c1d28 GLProgram::create() returns a linked GLProgram 2014-05-08 16:04:59 -07:00
Ricardo Quesada 580ebf939f working Ok with new API 2014-05-08 15:43:12 -07:00
Ricardo Quesada 453b670ad2 Removes CCVertexAttribBind 2014-05-08 14:01:26 -07:00
Ricardo Quesada 9ea4aa1e16 Simplified VertexAttrib 2014-05-08 14:01:03 -07:00
Ricardo Quesada 8f2ba467ff Yeahhhhhh 
it is working
 2014-05-08 12:34:26 -07:00
Ricardo Quesada a2361b30de Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-08 10:16:49 -07:00
Ricardo Quesada 087378926f Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-08 10:16:09 -07:00
yangxiao 815f0b7bd9 useCallback to false 2014-05-08 10:12:12 -07:00
Dale Stammen eea1ba6946 added missing files to projects 2014-05-08 10:11:42 -07:00
cocoscodeide 6efaa2fe8f Merge pull request #2 from chuanweizhang2013/v3luaruntime 
modify luadebug and adjust code file
 2014-05-08 22:09:06 +08:00
minggo 56622dc765 Merge pull request #6555 from Dhilan007/v3_video 
issue #4859:Add a widget to play video
 2014-05-08 18:33:51 +08:00
andyque fd362d2ace issue #5057. deprcated PositionType and make a new enum class instead 2014-05-08 18:25:49 +08:00
Dhilan007 af26fb9b07 issue #4870:Add a ui widget of playing video 2014-05-08 18:13:50 +08:00
Dhilan007 bda73bc7b3 issue #4868:Use system widget to play video on iOS 2014-05-08 18:12:53 +08:00
Dhilan007 bda8a73ae5 issue #4867:Use system widget to play video on Android 2014-05-08 18:12:03 +08:00
andyque 0c2fd977ea issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of 
Widget and also simplify the enum value
 2014-05-08 18:10:21 +08:00
minggo f12bdeca9a Merge pull request #6627 from nutty898/v3_nutty_fixedreaderbug 
Fixed bug of guireader
 2014-05-08 18:06:21 +08:00
minggo c886bf21a8 Merge pull request #6631 from Dhilan007/v3_labelhotfixed 
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
 2014-05-08 17:24:08 +08:00
minggo d84e26c7b4 Merge pull request #6626 from Ryeeeeee/v3_pause_sound_background 
sounds pause automatically when switching background
 2014-05-08 17:11:29 +08:00
Ryeeeeee 80103487fe rename variable 2014-05-08 16:53:24 +08:00
chuanweizhang2013 8f7cb74dd1 fixed debug 2014-05-08 16:02:55 +08:00
CaiWenzhi 0a46b3c8d2 Merge branch 'v3' into v3_nutty_fixedreaderbug 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-05-08 15:56:34 +08:00
Dhilan007 966e7e2b20 closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT. 2014-05-08 15:47:37 +08:00
minggo a8d728ffc9 Merge pull request #6610 from zawasp/vs2013project 
upgrade win32 projects for Visual Studio 2013
 2014-05-08 15:40:02 +08:00
CaiWenzhi a562f19880 Fixed bug of guireader 2014-05-08 15:15:09 +08:00
Ryeeeeee eec96e9e96 sounds pause automatically when switching background 2014-05-08 14:44:47 +08:00
CocosRobot 119ef29a87 [AUTO]: updating luabinding automatically 2014-05-08 06:03:37 +00:00
minggo e9caee282f Merge pull request #6574 from andyque/focus3861 
issue #3861, add focus functionality to ui framework
 2014-05-08 13:44:01 +08:00
Ricardo Quesada 4b15b884e7 Uniform is a struct 2014-05-07 20:38:15 -07:00
andyque f6d0135b9b Merge branch 'v3' into focus3861 2014-05-08 11:27:57 +08:00
andyque 238ffcc545 issue #4861, fix pass focus to child 2014-05-08 11:24:09 +08:00
Ricardo Quesada 90ec7dd9ec Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram 2014-05-07 20:21:03 -07:00
Ricardo Quesada b401f6adc1 Lots of new code 
Adds GLProgramState
 2014-05-07 20:20:19 -07:00
CocosRobot 7aff750381 [AUTO]: updating luabinding automatically 2014-05-08 03:19:36 +00:00
Jason Xu 5b09ef9b63 just unschedule, no need release here. 2014-05-08 10:56:59 +08:00
Jason Xu 2b581aba18 Fix crash: use cocostudio gui editor, create a action in editor, when you play like: 
auto _action = getActionByName("action_name");
        _action->play(CallFunc::create([](){
		CCLOG("done.");
        }));
It'll crash.
 2014-05-08 10:52:31 +08:00
andyque b5f1f7455b issue #4861, fix a problem when layout focus loops 2014-05-08 10:46:05 +08:00
Jason Xu 8507fd7f8d FIx: correct TotalTime of ActionObject. 2014-05-08 10:28:41 +08:00
Dhilan007 7495f22708 closed #4906:Fixed the label continue to appear when its opacity is set to 0. 2014-05-08 10:12:29 +08:00
yinkaile 7d937f1c79 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-08 09:30:55 +08:00
Huabing.Xu 41f48e7fa9 Merge branch 'v3' into tony_improved_glprogram 2014-05-07 15:30:04 -07:00
Ricardo Quesada 98454eeb69 Adds GLProgram::createXXX() 2014-05-07 14:38:41 -07:00
Ricardo Quesada 02405a8efe Improved samples 2014-05-07 12:41:04 -07:00
Ricardo Quesada a2c4ddf028 beautify Uniform and VertexAttrib 2014-05-07 11:26:26 -07:00
Ricardo Quesada b1ed7178fe Improved API for Uniforms 2014-05-07 10:44:45 -07:00
yangxiao 5190fb27c8 use proposed vertex attribute api 2014-05-07 09:27:44 -07:00
Mircea Rila b66b4c6f1d upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 
remove C4005 warnings after upgrading projects
 2014-05-07 17:41:04 +03:00
andyque 05b7d274c8 issue #4861. fix distance calculation 2014-05-07 18:27:05 +08:00
minggo 1cbe29071b remove unneeded codes 2014-05-07 16:49:32 +08:00
James Chen edcef656cc Merge pull request #6599 from CocosRobot/update_lua_bindings_1399451378 
[AUTO]: updating luabinding automatically
 2014-05-07 16:39:41 +08:00
James Chen 9862fab58f Comments fix in CCRenderTexture.h 2014-05-07 16:37:21 +08:00
CocosRobot 36843196c5 [AUTO]: updating luabinding automatically 2014-05-07 08:30:46 +00:00
James Chen 9fb38cb332 Merge pull request #6595 from samuele3hu/v3_lua_fix 
close #5032: A potential crash bug of Lua binding for sp.SkeletonAnimation.setAnimation
 2014-05-07 16:26:13 +08:00
yinkaile ba5544b63d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-07 15:47:37 +08:00
andyque def0505ba7 closed #4861, refactor 2014-05-07 14:26:41 +08:00
andyque 1282252c25 closed #4861, refactor 2014-05-07 14:06:44 +08:00
andyque 8baa88e2e1 closed #4861, fixed temparory variable issue 2014-05-07 11:55:00 +08:00
andyque 657720e509 Merge remote-tracking branch 'upstream/v3' into focus3861 2014-05-07 11:42:09 +08:00
cocoscodeide 04600227ae Merge pull request #1 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-05-07 11:34:35 +08:00
zhangbin 9966d83c02 Export the `2d` include directory of engine on android. 2014-05-07 10:43:42 +08:00
andyque ef70c684de issue #4861, add requestFocus method and the layout current can get focus 2014-05-07 10:23:57 +08:00
samuele3hu fb60b9f65a issue #5032:A potential crash bug of Lua binding 2014-05-07 10:09:54 +08:00
andyque 62a66872aa issue #4861, fixed some boundary conditions 2014-05-07 10:05:20 +08:00
Ricardo Quesada db759005e0 Improvements for Attributes and Uniform API 2014-05-06 17:58:14 -07:00
Ricardo Quesada 21dd6fef69 Improves code a little bit 2014-05-06 12:46:35 -07:00
Trace cf9e8ff0bd Merge branch 'newV3' into improved_glprogram 
Conflicts:
	cocos/2d/CCGLProgram.cpp
	cocos/2d/CCGLProgram.h
 2014-05-06 12:07:42 -07:00
Trace 69fd841b30 fix the include error 2014-05-06 11:19:51 -07:00
Ricardo Quesada 720852681e Adds license to VertexAttribBind 2014-05-06 11:15:40 -07:00
yangxiao bbd4533c5e Improves GLProgram 
Adds vetex attrib bind class
 2014-05-06 11:03:24 -07:00
andyque 9d71ae29b9 issue #4861. fixed all widget focus diabled bug 2014-05-06 17:28:12 +08:00
andyque a15dd55baa closed #3861, fixed some typo and indent problem 2014-05-06 12:04:52 +08:00
andyque bcd2d3ccb3 issue #3861, fix layout contentSize caculation 2014-05-06 11:46:28 +08:00
minggo 7830818fc0 Merge pull request #6553 from Dhilan007/v3_labelhotfixed 
[hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font.
 2014-05-06 11:41:24 +08:00
Dhilan007 989b3830aa fixed indent 2014-05-06 11:22:23 +08:00
Dhilan007 e412f91103 [hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font. 2014-05-06 10:36:55 +08:00
minggo 302ec843e7 Merge pull request #6577 from MSOpenTech/v3-wp8-fix 
V3 wp8 fix
 2014-05-06 10:26:19 +08:00
andyque e65b144ee6 issue #3861, fixs windows compile error 2014-05-06 10:17:10 +08:00
andyque 16ebe8d41c issue #3861, fix linux compile error 2014-05-06 09:40:50 +08:00
yinkaile ede895ed6d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-06 09:34:34 +08:00
Huabing.Xu c581f74142 Merge branch 'v3' into v3.1_unify_ZERO_ONE 2014-05-05 18:10:13 -07:00
Huabing.Xu 32f9a8ffc6 comment out warning code in quaternion.cpp 
unify ZERO, ONE, UNIT_X/Y/Z/W into a consistent convention
 2014-05-05 18:07:58 -07:00
CocosRobot db99518c80 [AUTO]: updating luabinding automatically 2014-05-06 00:46:16 +00:00
Ricardo Quesada afaa701cff math cocos2d fixes 2014-05-05 17:42:11 -07:00
Ricardo Quesada f12ea26611 Merge pull request #6582 from ricardoquesada/math_fixes 
math fixes
 2014-05-05 17:11:37 -07:00
Ricardo Quesada 4483d653d5 math fixes 
- Moves deprecated Point to CCDeprecated.h
- Adds Point2 and Point3
- removes `math` from `cocos2d::math` namespace
 2014-05-05 17:10:41 -07:00
CocosRobot 5db3fa8df0 [AUTO]: updating luabinding automatically 2014-05-05 23:58:54 +00:00
Ricardo Quesada e413b86295 Revert `new Sprite` change done a few days ago 
Use `std::nothrow` for new in Sprite (should be done in all `new` code)
 2014-05-05 16:53:37 -07:00
Ricardo Quesada 0e6dd9afe5 Particles can be created without texture 
Needed for complex particles like in EarthWarrior3D
 2014-05-05 15:50:08 -07:00
Dale Stammen 9a05e86ab6 updated missing files 2014-05-05 13:26:28 -07:00
Dale Stammen 78204c7c91 removed obsolete headers 2014-05-05 13:25:57 -07:00
chuanweizhang2013 cd7ea468e8 modify lua_debugger.c 2014-05-05 21:18:33 +08:00
James Chen 0995204abc Optimization for Value 2014-05-05 19:00:46 +08:00
andyque 0d9d2a57dc issue #3861. fix a indent problem 2014-05-05 17:54:21 +08:00
andyque 34b3114e55 issue #3861. add license to CCEventFocus and CCEventListenerFocus 2014-05-05 17:49:31 +08:00
2youyou2 44b93f3548 change tab to 4 space 2014-05-05 17:46:06 +08:00
2youyou2 d4f644814c change tab to 4 space 2014-05-05 17:43:15 +08:00
andyque 2d0de93baf issue #4861, fixed a widget bug and add VBox test 2014-05-05 11:37:40 +08:00
andyque afb65bbebd issue #4861, fix widget query method 2014-05-05 11:37:39 +08:00
andyque 503be87675 issue #4861. refactor UILayout to search widget by index 2014-05-05 11:37:39 +08:00
andyque a7fbd590dc issue #4861. add a horizontal focus test 2014-05-05 11:37:39 +08:00
andyque 9383900123 issue #4861. cleanup some code of UILayout and UIWidget 2014-05-05 11:37:39 +08:00
andyque 33f7a500f3 issue #4861. add android keypad support 2014-05-05 11:37:38 +08:00
andyque 47acbc24e0 issue #4861, add CCEventFocus and CCEventListener 2014-05-05 11:37:38 +08:00
andyque b35ddfe5b5 issue #4861, add focus functionality into Widget class 2014-05-05 11:37:38 +08:00
andyque 1dee81a166 issue #4861, refactor setFocused into setHilighted 2014-05-05 11:37:38 +08:00
2youyou2 f6eac43a0a fixed no effect with stopping tween between two frames 2014-05-05 09:45:06 +08:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
James Chen 3b3c1c4dbb issue #4674: Removed large files and updated .gitignore 2014-05-04 14:36:16 +08:00
CocosRobot cdd04ee11f [AUTO]: updating luabinding automatically 2014-05-02 01:12:32 +00:00
Ricardo Quesada b67f3008a5 Lua compiles again 2014-05-01 18:07:25 -07:00
CocosRobot d75a7c51a3 [AUTO]: updating luabinding automatically 2014-05-02 00:37:21 +00:00
Ricardo Quesada 207e67318d rolling back tests 2014-05-01 16:55:28 -07:00
Ricardo Quesada 462338879e rolling back physics in layer 2014-05-01 16:42:35 -07:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -07:00
Ricardo Quesada 25213c81f6 linux cmake improvements 
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
 2014-05-01 13:01:51 -07:00
Ricardo Quesada 1cfd133555 fixes tmx maps 2014-05-01 11:51:11 -07:00
CocosRobot 7cb5f4c418 [AUTO]: updating luabinding automatically 2014-05-01 02:25:38 +00:00
Ricardo Quesada 9bd6ace582 compiles on iOS 2014-04-30 19:21:10 -07:00
Ricardo Quesada b8eba4e1c1 oops 2014-04-30 19:13:58 -07:00
Ricardo Quesada 7b2e558bb0 Merge pull request #6531 from ricardoquesada/fix_builder_squash 
Fixes linux build
 2014-04-30 19:10:12 -07:00
Ricardo Quesada 40fe815ab9 Squashed commit of the following: 
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:05:18 2014 -0700

    more linux fixes

commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:04:04 2014 -0700

    more linux fixes

commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:02:07 2014 -0700

    fixes linux isuses

commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:58:50 2014 -0700

    more linux fixes

commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:57:33 2014 -0700

    more linux fixes

commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:53:43 2014 -0700

    more linux fixes

commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:49:28 2014 -0700

    more linux fixes

commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:47:43 2014 -0700

    more linux fixes

commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:46:00 2014 -0700

    more linux fixes

commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:43:15 2014 -0700

    more linux fixes

commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:36:06 2014 -0700

    more fixes for linux

commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:35:29 2014 -0700

    more fixes for linux

commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:34:44 2014 -0700

    more fixes for linux

commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:33:45 2014 -0700

    fixes for linux

commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:16:48 2014 -0700

    compiles on Windows

commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:07:20 2014 -0700

    fix builder
 2014-04-30 19:09:13 -07:00
James Chen 35505aa63f Merge pull request #6528 from CocosRobot/update_lua_bindings_1398905829 
[AUTO]: updating luabinding automatically
 2014-05-01 09:33:33 +08:00
CocosRobot 94e01a2e81 [AUTO]: updating luabinding automatically 2014-05-01 00:58:35 +00:00
Ricardo Quesada 598bb91133 you should be 10 2014-04-30 17:56:14 -07:00
Ricardo Quesada 53b293e85f Merge branch 'v3' into improved_directory_structure 2014-04-30 17:52:52 -07:00
Ricardo Quesada 98f26b4987 Compiles on Windows 2014-04-30 17:44:41 -07:00
Ricardo Quesada b5f513ce16 Merge branch 'v3' into improved_directory_structure 2014-04-30 13:15:10 -07:00
Huabing.Xu 183dd1ec64 inverse and conjugate, negate for matrix 2014-05-01 01:59:36 +08:00
Huabing.Xu 8fe4c472fd inverse and conjugate for quaternion 2014-05-01 01:32:16 +08:00
Huabing.Xu 16105df503 getNormalize->getNormalized 2014-05-01 01:10:18 +08:00
Huabing.Xu c722b74e36 Merge branch 'v3' into v3_refactor_normalize 2014-04-30 20:08:37 +08:00
Huabing.Xu 84515b521d refactor normalize in Quaternion 2014-04-30 20:06:49 +08:00
Huabing.Xu 441279c7ab refactor normalize in Vector4 2014-04-30 19:59:06 +08:00
Huabing.Xu 3ccb6dcbed refactor normalize in Vector3 2014-04-30 19:50:36 +08:00
Huabing.Xu 7bc9b96d1a remove some cumbersome struct keyword 2014-04-30 18:37:30 +08:00
Huabing.Xu ea4fee2c31 refactor normalize in Vector2 2014-04-30 18:07:05 +08:00
minggo 2cbbaed5b3 Merge pull request #6512 from dabingnn/v3_renderTextureBug 
V3 render texture bug
 2014-04-30 17:52:14 +08:00
minggo 0dff539a18 Merge pull request #6521 from boyu0/particle_yCoordFlipped_bug 
Fix ParticleSystem yCoordFlipped bug.
 2014-04-30 17:03:01 +08:00
boyu0 489adaf315 fix indent 2014-04-30 16:33:35 +08:00
boyu0 c1d60f4b33 Fix ParticleSystem yCoordFlipped bug. 2014-04-30 16:18:39 +08:00
boyu0 0699aa94fe Change Value::asBool() return false by default. 2014-04-30 15:07:26 +08:00
yangxiao 11dc9367ff wrong rotation 2014-04-29 18:19:30 -07:00
yangxiao 3237d7b23d Revert "wrong rotation" 
This reverts commit 3c9560017e.
 2014-04-29 18:14:41 -07:00
Ricardo Quesada 1954edc655 Adds Apache2 license to GamePlay3d files 2014-04-29 17:50:12 -07:00
Ricardo Quesada 8bb8416c26 Improved directory structure 2014-04-29 17:37:36 -07:00
yangxiao 3c9560017e wrong rotation 2014-04-29 17:27:32 -07:00
samuele3hu 58a9e40b82 Modify some functions return value from `bool` to `int` 2014-04-29 17:17:18 +08:00
samuele3hu 4eaec951b6 use `new` and `CC_SAFE_DELETE_ARRAY` to replace `malloc` and `free` 2014-04-29 16:04:08 +08:00
Huabing.Xu 331c2d3872 readd wp8 code which is removed by accident 2014-04-29 16:03:50 +08:00
Huabing.Xu faa0f67644 using pointer instead of Director::getInstance() in RenderTexture 2014-04-29 15:13:24 +08:00
Huabing.Xu bd93a5cb76 fix bug for renderTexture created which is bigger than screen size 2014-04-29 15:08:44 +08:00
samuele3hu ae488e5afa Replace `vec2s` with `points` 2014-04-29 14:39:19 +08:00
samuele3hu 84c1f9281e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error 2014-04-28 16:28:44 +08:00
samuele3hu d729a161a4 Add some deprecated functions and replace the Point related to Vector2 2014-04-28 16:28:15 +08:00
CocosRobot 78a7c98b26 [AUTO]: updating luabinding automatically 2014-04-28 07:01:59 +00:00
James Chen e96883ec43 Merge pull request #6394 from samuele3hu/dev_compile_error 
Fix compile error for Lua
 2014-04-28 14:57:48 +08:00
James Chen 35207fd8ba Merge pull request #6399 from dumganhar/v3 
fullPathForFilename optimization: Checking whether the path is an empty string.
 2014-04-28 14:56:01 +08:00
James Chen 4f41b9d3ac fullPathForFilename optimization: Checking whether the path is an empty string. 2014-04-28 14:53:30 +08:00
samuele3hu c3f40bdc24 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error 2014-04-28 14:05:08 +08:00
samuele3hu d3670644bf Fix compile error for Lua 2014-04-28 14:04:37 +08:00
James Chen 8538b27385 Merge pull request #6391 from dabingnn/v3_optimize 
V3 optimize
 2014-04-28 13:39:15 +08:00
Huabing.Xu e6f7854225 clean for kazmath in project file 2014-04-28 13:14:22 +08:00
James Chen 6e0ee08d84 Merge pull request #6390 from Dhilan007/v3 
fixed compile fail on wp8
 2014-04-28 11:59:06 +08:00
Dhilan007 b4a9381238 fixed return type is not right 2014-04-28 11:55:45 +08:00
Dhilan007 35f83fc40a fixed compile fail 2014-04-28 11:42:54 +08:00
James Chen aa04176d83 Merge pull request #6386 from pipu/fixed_bug_ui_layout_clip 
fixed the clipping of ui layout read from CocoStudio could not work
 2014-04-28 11:08:40 +08:00
pipu c492f4d3c3 fixed ui layout clip 2014-04-28 10:06:11 +08:00
James Chen cbcf2e2bc8 Merge pull request #6384 from dabingnn/v3_optimize 
change tab to space for CCDirector.cpp
 2014-04-28 09:54:43 +08:00
Huabing.Xu 64d7a6bd37 change tab to space 2014-04-28 09:51:10 +08:00
Ricardo Quesada d0ebc14076 compiles on linux 2014-04-26 10:41:57 -07:00
Ricardo Quesada 81c2d92355 yeah... love in includes 
<3
 2014-04-26 10:35:57 -07:00
Ricardo Quesada 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

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

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 2014-04-26 10:11:22 -07:00
Ricardo Quesada b053a9145a Compiles on Windows32 2014-04-25 22:03:25 -07:00
Ricardo Quesada c7a606fc78 Adds auto-culling for labels! 
yeah!
 2014-04-25 19:00:22 -07:00
Ricardo Quesada 22fb1a774a version is v3.1-alpha0 2014-04-25 18:03:35 -07:00
Ricardo Quesada b801995bbe Merge branch 'v3' into develop_migrate_math_lib 2014-04-25 17:56:52 -07:00
James Chen c1f220447a Merge pull request #6373 from xhcnb/deprecated_callback 
use new ccHttpRequestCallback.
 2014-04-25 17:34:11 +08:00
Jason Xu 42c374157d CC_CALLBACK_2 not std::bind directly 2014-04-25 17:32:21 +08:00
James Chen d868196aae Merge pull request #6372 from twhittock/mac-application-retcodes 
Returns correct value for Application::run on Mac platform
 2014-04-25 17:19:51 +08:00
Jason Xu 5cc483276b use new ccHttpRequestCallback. 2014-04-25 17:15:57 +08:00
Tom Whittock ec42b7c76a Use correct return codes from mac CCApplication 2014-04-25 10:01:10 +01:00
Huabing.Xu 85e97f246d Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib 2014-04-25 16:37:31 +08:00
Huabing.Xu dbf241c38d fix compile error after merge 2014-04-25 16:30:51 +08:00
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 2014-04-25 16:20:24 +08:00
Huabing.Xu 613ba6e5b6 work on linux now 2014-04-25 15:10:37 +08:00
James Chen 828401a23d Merge pull request #6302 from zifter/FixParticle 
closed #4880: Particle systems loading incorrectly in CocosBuilder
 2014-04-25 14:15:44 +08:00
James Chen 8ffd663eb6 Merge pull request #6154 from newnon/develop_jni_improvements 
[android] Adds onActivityResult listeners
 2014-04-25 13:51:36 +08:00
James Chen 1b82cd7f08 Merge pull request #6093 from dplusic/develop 
fixed cc.pGetAngle not using absolute value
 2014-04-25 13:41:41 +08:00
CocosRobot e9b51a2a42 [AUTO]: updating luabinding automatically 2014-04-25 04:00:21 +00:00
James Chen cd6fe294b8 Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer 
closed #4771: Move PhysicsWorld to Layer
 2014-04-25 11:52:32 +08:00
James Chen efd16bc37e Merge pull request #6264 from iSevenDays/patch-10 
Fix loosing precision: int -> size_t for the return value of `recv`
 2014-04-25 11:11:52 +08:00
James Chen 328408d792 Merge pull request #6263 from Mazyod/develop-cpp11-http-client 
closed #4702: Update HTTPClient to use C++11 callbacks
 2014-04-25 11:06:06 +08:00
James Chen 477fc9f0e0 Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-04-25 10:59:11 +08:00
James Chen 7beb8b78fe Merge pull request #6325 from MSOpenTech/wp8-3.0-update 
Wp8 3.0 update：
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
 2014-04-25 10:41:58 +08:00
Huabing.Xu adcacbf5eb Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelAtlas.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2014-04-24 16:58:46 +08:00
minggo 55911e1e78 Merge pull request #6356 from Dhilan007/develop_v3 
fixed drawDebugData of LabelBMFont/LabelAtlas.
 2014-04-23 15:24:30 +08:00
minggo 1c15d7fd08 Merge pull request #6355 from nutty898/develop_nutty_fixedbugofguireader 
Fixed bug of gui reader
 2014-04-23 15:16:31 +08:00
Dhilan007 a4ac5ab054 fixed drawDebugData of LabelBMFont/LabelAtlas. 2014-04-23 15:05:02 +08:00
CaiWenzhi 4750e8b417 Fixed bug of gui reader 2014-04-23 15:02:35 +08:00
Huabing.Xu 587f65098f Fix compile error after merging 2014-04-23 14:59:45 +08:00
Huabing.Xu f65973d9f0 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCActionInterval.cpp
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelBMFont.cpp
	tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
 2014-04-23 14:46:14 +08:00
Dhilan007 75772af82b fixed compilation fails if CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled. 2014-04-22 23:18:23 +08:00
minggo 506d628619 Merge pull request #6352 from natural-law/develop 
Solve compiling errors when some macros changed in ccConfig.h.
 2014-04-22 17:00:28 +08:00
minggo ccc935137b Merge pull request #6343 from dumganhar/fixed-tilemaptest-crash 
Fixed tilemaptest crashes when clicking 'next' button quickly, it could be reproduced on win32
 2014-04-22 16:53:32 +08:00
zhangbin 2305ba59e6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos/2d/CCActionInterval.cpp
 2014-04-22 16:49:27 +08:00
zhangbin 093bd20a74 Solve compiling errors when some macros changed in ccConfig.h. 2014-04-22 16:42:13 +08:00
James Chen b8e77d8968 Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION 2014-04-21 22:38:15 -07:00
James Chen 99654289ed Invokes 'Node::onExit' only when the node is running. 2014-04-21 22:31:34 +08:00
James Chen 8038d3daa5 Fixed tilemaptest crashes when click 'next' button quickly 2014-04-21 22:24:44 +08:00
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
Huabing.Xu 83ee1b4bdc android OK 2014-04-21 17:38:10 +08:00
Huabing.Xu 68e058b12d IOS/Mac OK: remove kazMath 
Make code compatible with old tests
 2014-04-21 17:37:52 +08:00
minggo 3ac08b7349 Merge pull request #6300 from elvman/develop 
Flipping RenderTexture's sprite instead of scaling it by -1
 2014-04-21 15:23:10 +08:00
CocosRobot 77130708c2 [AUTO]: updating luabinding automatically 2014-04-21 06:45:09 +00:00
minggo 0a5b92c56f Merge pull request #6305 from samuele3hu/developAudio 
fix the bug that exit layer can’t end the SimpleAudioEngine
 2014-04-21 14:40:40 +08:00
minggo 02c2fc8abf Merge pull request #6333 from chuanweizhang2013/luaruntime 
translate
 2014-04-21 14:06:32 +08:00
minggo 8a75bccdc1 Merge pull request #6332 from minggo/develop 
update version
 2014-04-21 13:44:40 +08:00
minggo b53b9ceb3e update version 2014-04-21 13:43:42 +08:00
boyu0 710fe9d940 closed #4771: modify test. 2014-04-21 13:32:47 +08:00
chuanweizhang2013 1fe52b1557 translate 2014-04-21 11:07:14 +08:00
minggo 1c44dbe385 Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios 
closed #4904: fix ios Image::saveToFile crashes when save jpg file.
 2014-04-21 11:02:11 +08:00
boyu0 a1024353f1 issue #4904: fix iOS Image::safeToFile crashes when save jpg file. 2014-04-21 10:25:34 +08:00
Huabing.Xu e74f8719cf fix warning in compiling 2014-04-21 09:52:59 +08:00
Dale Stammen 9792a4708a fixed curl DEBUGASSERT for release builds 2014-04-19 10:33:40 -07:00
Dale Stammen 6646e6c860 input event refactor. console enabled for wp8 2014-04-19 10:12:34 -07:00
Dale Stammen d235539b39 added missing include paths 2014-04-19 10:12:06 -07:00
Dale Stammen 8d6fe7be1a added missing files 2014-04-19 10:11:44 -07:00
Dale Stammen 4a7fa029cc updated property sheet include paths and warnings 2014-04-19 10:09:10 -07:00
Dale Stammen 467ededeff enabled console for wp8 2014-04-19 10:08:01 -07:00
Dale Stammen b0adaee331 added missing WP8 device orientation 2014-04-19 10:06:27 -07:00
Dale Stammen 768e0bd53f updated wp8 precompiled shaders 2014-04-19 10:05:21 -07:00
Dale Stammen 8f14597717 check if _currentUTF16String is null 2014-04-19 09:38:45 -07:00
Dale Stammen 9cf463bf6a start of input queue support 2014-04-19 09:37:54 -07:00
Dale Stammen 12b01dcb25 input events refactor 2014-04-19 09:32:59 -07:00
Dale Stammen 1a56f435fe added missing files 2014-04-19 09:32:12 -07:00
Dale Stammen bebfe31b48 removed input files from refactor 2014-04-19 09:28:37 -07:00
Dale Stammen 66ed186a56 added missing files 2014-04-19 09:27:28 -07:00
Dale Stammen f2b5d7c395 updated winrt project file 2014-04-19 09:26:52 -07:00
Dale Stammen d19e898f21 removed ccset.h 2014-04-19 09:26:38 -07:00
Dale Stammen 4baa7ebacf added CC_PLATFORM_WINRT 2014-04-19 09:25:54 -07:00
Dale Stammen 1403737d2d added functions to display ip address of device 2014-04-19 09:12:20 -07:00
Dale Stammen f233251f4f added functions to display ip address of device 2014-04-19 09:12:04 -07:00
Dale Stammen 008bde1e27 fixed font path when fontname is empty string 2014-04-19 09:11:20 -07:00
Dale Stammen b54a1064fd fixed accelerometer for wp8 2014-04-19 09:10:34 -07:00
Huabing.Xu 3b83d52f95 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/ui/UIButton.cpp
	cocos/ui/UIButton.h
	cocos/ui/UICheckBox.cpp
	cocos/ui/UICheckBox.h
	cocos/ui/UIImageView.cpp
	cocos/ui/UIImageView.h
	cocos/ui/UILayout.cpp
	cocos/ui/UILayout.h
	cocos/ui/UILoadingBar.cpp
	cocos/ui/UIRichText.h
	cocos/ui/UISlider.cpp
	cocos/ui/UIText.cpp
	cocos/ui/UIText.h
	cocos/ui/UITextAtlas.cpp
	cocos/ui/UITextAtlas.h
	cocos/ui/UITextBMFont.cpp
	cocos/ui/UITextBMFont.h
	cocos/ui/UITextField.cpp
	cocos/ui/UITextField.h
	cocos/ui/UIWidget.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
 2014-04-19 00:30:34 +08:00
minggo 8e83cd7900 Merge pull request #6261 from iSevenDays/patch-9 
Fix memory leak
 2014-04-18 14:19:17 +08:00
minggo 0e7280b1ca Merge pull request #6304 from dumganhar/iss4568-crash 
closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
 2014-04-18 14:00:40 +08:00
minggo b7e5306275 Merge pull request #6313 from chuanweizhang2013/luaruntime 
update android runtime
 2014-04-18 13:59:32 +08:00
samuele3hu 7e81f32016 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText 2014-04-18 11:55:30 +08:00
samuele3hu 914516a4e0 fix the compile error about luabindings and add the `RichText` test cases. 2014-04-18 11:54:57 +08:00
chuanweizhang2013 2a9c99ff66 Merge pull request #25 from cocos2d/develop 
update cocos2d-x
 2014-04-18 11:45:53 +08:00
CocosRobot a78a1090c3 [AUTO]: updating luabinding automatically 2014-04-18 02:51:14 +00:00
minggo 7399ef2527 Merge pull request #6308 from nutty898/develop_nutty_widgetsupportscontentsize 
Develop nutty widgetsupportscontentsize
 2014-04-18 10:47:10 +08:00
minggo a8a8ef85e6 add comment for EventListenerTouchOneByOne::checkAvailable() 2014-04-17 14:46:52 +08:00
CaiWenzhi a8bfa094c0 Remove useless codes 2014-04-17 14:27:21 +08:00
CaiWenzhi ed4fcd5d1a Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes 2014-04-17 14:23:08 +08:00
CaiWenzhi 19f6526ef8 Widget supports contentsize 2014-04-17 14:08:25 +08:00
samuele3hu 11515f6ab3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio 2014-04-17 11:06:20 +08:00
samuele3hu 1331fff62c fix the bug that exit layer can’t end SimpleAudioEngine 2014-04-17 10:36:08 +08:00
James Chen 30e1d41dbf Makes 'compareRenderCommand' as a static function instead of a global function 2014-04-17 10:16:37 +08:00
andyque a9ed075d50 closed #4883. fixed slider hittest problem 2014-04-17 10:15:58 +08:00
James Chen 63f54cb5f7 closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled. 
CC_SAFE_RELEASE(_eventDispatcher); should be after 'delete _renderer;'
in Director's destructor.
 2014-04-17 10:15:11 +08:00
zifter 08d975268d Fix for issue http://www.cocos2d-x.org/issues/4880. 2014-04-17 03:15:43 +03:00
Elviss Strazdins 5ddef013ba Flipping RenderTexture's sprite instead of scaling it by -1 2014-04-17 02:22:34 +03:00
Huabing.Xu d14d3007d0 remove kazmath include file 2014-04-16 14:08:58 +08:00
Huabing.Xu 346d42f723 remove warning message---finished 2014-04-16 11:20:45 +08:00
Huabing.Xu 6fd7197d96 remove warning message---continue 2014-04-16 11:18:23 +08:00
Huabing.Xu a32bb8cd23 remove warning message---continue 2014-04-16 10:58:34 +08:00
Huabing.Xu b01941b6ac remove warning message---continue 2014-04-16 10:42:39 +08:00
Huabing.Xu 2bb32a8e4b remove warning message 2014-04-16 10:27:17 +08:00
Huabing.Xu 30dec564e6 remove kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
Huabing.Xu debad86ec1 fix compile error after merge 2014-04-15 22:35:35 +08:00
Huabing.Xu 95cb7721f6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCSprite.cpp
	tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
 2014-04-15 22:21:04 +08:00
Huabing.Xu 63b52dd287 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
Huabing.Xu e2a24dec84 replace Point with Vector2 2014-04-15 18:08:29 +08:00
Huabing.Xu 917ae6e88b deprecate Point, using Vector2 instead 2014-04-15 17:46:44 +08:00
Huabing.Xu 5303f50904 Migrate to Vector2 in DrawPrimitive.h 2014-04-15 17:29:23 +08:00
cw 312cd49b1a Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-15 17:10:24 +08:00
cw d361efacae add update 2014-04-15 17:10:11 +08:00
Huabing.Xu 9c33b48b50 remove Point in CCNode.h and CCSprite.h 2014-04-15 17:09:18 +08:00
Huabing.Xu 511e868ac4 migrate getAnchorPoint, getAnchorPointInPoints and relative member variable to Vector2 2014-04-15 16:59:16 +08:00
Huabing.Xu e351b778c1 migrate setAnchorPoint to Vector2 2014-04-15 16:47:29 +08:00
Huabing.Xu 6686b657a4 Migrate getPostion and correspondent member variable to Vector2 2014-04-15 16:28:59 +08:00
Huabing.Xu 071cbc7565 migrate setPosition to Vector2 2014-04-15 16:16:14 +08:00
Huabing.Xu ec2ef0f64b migrate convertXXXX to Vector2 step2 2014-04-15 14:41:09 +08:00
Huabing.Xu 633173005b migrate convertXXXX to Vector2 2014-04-15 14:29:12 +08:00
Huabing.Xu 4df714b9d8 Migrate to Vector2 in class Director 2014-04-15 14:18:40 +08:00
Huabing.Xu 44be9a38ec Node convertToNodeSpace and convertToWorldSpace use Vector2 2014-04-15 14:09:46 +08:00
minggo 46e7058587 update version information 2014-04-15 13:58:51 +08:00
Huabing.Xu 11fc8ac308 conversion from Vector2 and Point 2014-04-15 13:58:08 +08:00
minggo 38b982f938 Merge pull request #6286 from dumganhar/rename-listener-method 
Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'-> 'EventListener::(s|g)etAssociatedNode'
 2014-04-15 13:43:25 +08:00
boyu0 b53961b78d issue $4771: fix lua test and fix some bugs 2014-04-15 13:40:44 +08:00
James Chen 8134404734 Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority' 
-> 'EventListener::(s|g)etAssociatedNode'
 2014-04-15 12:50:33 +08:00
Huabing.Xu 3f496069b4 add interface in Vector2 for Point 2014-04-15 11:58:08 +08:00
CocosRobot 4f9387447d [AUTO]: updating luabinding automatically 2014-04-15 03:41:34 +00:00
Ricardo Quesada 3978cee2ee compiles on windows 2014-04-14 20:00:06 -07:00
Ricardo Quesada 584ccf65e4 Culling working again 2014-04-14 16:46:19 -07:00
boyu0 c98f50026f issue $4771: move PhysicsWorld to layer. 2014-04-15 03:21:18 +08:00
Huabing.Xu c081fc61aa comment kmMat4 & Matrix conversion code 2014-04-14 17:49:45 +08:00
Huabing.Xu 15cc63c2ba remove kmVec3 in ActionCamera 2014-04-14 15:26:05 +08:00
minggo de5f52857a Merge pull request #6273 from CocosRobot/update_lua_bindings_1397458473 
[AUTO]: updating luabinding automatically
 2014-04-14 14:56:35 +08:00
CocosRobot daccbdb2bf [AUTO]: updating luabinding automatically 2014-04-14 06:55:48 +00:00
minggo 26494c000b Merge pull request #6257 from dumganhar/group-command-manager-not-singleton 
GroupCommandManager should not be a singleton, it should be managed by Renderer.
 2014-04-14 14:52:39 +08:00
minggo bb15d0ecf9 Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option 
Add interface setCullingEnabled(), culling is disabled by default
 2014-04-14 14:50:11 +08:00
Huabing.Xu 3601fe9297 android can work 2014-04-14 14:30:17 +08:00
Huabing.Xu c3bf78494a remove CCFrustum.cpp, we will use new instead 2014-04-14 14:18:32 +08:00
James Chen eb651a6ae4 Merge pull request #6272 from Dhilan007/develop 
LabelTTF:fixed display incorrect if create by FontDefinition.
 2014-04-14 14:09:50 +08:00
Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
 2014-04-14 14:08:19 +08:00
Dhilan007 aef2767d23 change variable name. 2014-04-14 13:42:37 +08:00
Dhilan007 6fe64b83f8 LabelTTF:fixed display incorrect if create by FontDefinition. 2014-04-14 11:33:46 +08:00
Huabing.Xu 9935e8ddfb setCullingEnabled set to public access 
changed renderer->culling test case
 2014-04-14 11:33:40 +08:00
minggo 4faa1c9651 Merge pull request #6243 from koowolf/wp8_audio 
closed #4762: fix some problems in cocosdension in wp8
 2014-04-14 10:47:45 +08:00
minggo 9f9a87f09d Merge pull request #6254 from dumganhar/clippingnode-leak 
Memory leak fix for ClippingNode
 2014-04-14 10:17:37 +08:00
minggo 4669e7fa39 Merge pull request #6255 from dumganhar/cocostudio-leak 
Memory leak fix in macro IMPLEMENT_CLASS_INFO
 2014-04-14 10:13:52 +08:00
James Chen 44a01be0f5 Merge pull request #6266 from dumganhar/develop 
Const love: std::function<void(Texture2D*)> -> const std::function<void(Texture2D*)>&
 2014-04-14 10:04:44 +08:00
James Chen 5000873778 Const love: std::function<void(Texture2D*)> -> const 
std::function<void(Texture2D*)>&
 2014-04-14 10:01:17 +08:00
Huabing.Xu 37bfeff8f0 Add interface setCullingEnabled(), culling is disabled by default 2014-04-14 09:56:01 +08:00
Huabing.Xu 80f96398b3 1. changed comment message in CCNode.cpp 
2. changed Director projection to Matrix
 2014-04-14 09:30:51 +08:00
Sachin Garg 69223549f3 Add support for orientation change callback (applicationScreenSizeChanged) in Android Java activity. 2014-04-14 05:46:30 +05:30
Anton Sokolchenko 503d270f8f Fix loosing precision 
I had a warning on building for iPhone 64 bit.
As you can see above variable "rc" has a type of size_t too( void Console::commandUpload(int fd) );
 2014-04-13 01:55:43 +03:00
Anton Sokolchenko 65cf2e1256 Update CCImage.cpp 2014-04-13 01:13:58 +03:00
Mazyad Alabduljaleel 40e6288ac7 [NEW]: update HTTPClient to use C++11 callbacks 
[NEW]: updated tests to use the new API
[DEP]: deprecated old target/selector API
 2014-04-13 01:06:04 +04:00
Anton Sokolchenko a9ccb812ed Fix memory leak 2014-04-12 18:47:00 +03:00
Sergey 436285accd isActivityVisible method 2014-04-12 12:38:01 +04:00
James Chen b276c42ae6 GroupCommandManager should not be a singleton, it should be managed by Renderer. 2014-04-12 13:01:42 +08:00
James Chen b715a87791 Memory leak fix in macro IMPLEMENT_CLASS_INFO 2014-04-12 12:58:00 +08:00
James Chen 922b399ef2 Memory leak fix for ClippingNode 2014-04-12 12:56:36 +08:00
James Chen 377b50e6fd Merge pull request #6249 from dumganhar/develop 
Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' in ConsoleTest.
 2014-04-11 20:28:00 +08:00
James Chen 576d9d872c Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' 
in ConsoleTest.
 2014-04-11 20:07:54 +08:00
James Chen 6417c8f8e9 Merge pull request #6244 from dumganhar/develop 
Warning fixes in ui, getZOrder -> getLocalZOrder
 2014-04-11 18:14:54 +08:00
James Chen 7c5b4be0b1 Warning fixes in ui, getZOrder -> getLocalZOrder 2014-04-11 18:06:53 +08:00
koowolf 5b3d5badfa closed #4763: 1.fix stopalleffect lead to stop background music 2.fix play effect may lead to memory leak 2014-04-11 17:53:00 +08:00
James Chen b40773f6d0 Merge pull request #6240 from dabingnn/develop_add_rendererAssert 
Trigger an assert if a command is added while render is rendering.
 2014-04-11 17:37:02 +08:00
Huabing.Xu a8378a2b99 adjust comment 2014-04-11 17:31:35 +08:00
Huabing.Xu 866c4ad735 remove kmMat4 in Armature 2014-04-11 17:25:28 +08:00
Huabing.Xu 7af4d558c6 remove kmMat4 in AffineTransform.cpp 2014-04-11 17:19:32 +08:00
Huabing.Xu 7c027b16b0 change assert message 2014-04-11 16:07:55 +08:00
Huabing.Xu 51289e8a4c 1. add assert condition of rendering when adding command 
2. fix bug: renderTexture->SpriteRenderTextureBug
 2014-04-11 16:05:22 +08:00
James Chen c44e2f9bc8 Merge pull request #6211 from chuanweizhang2013/luaruntime 
update lua template runtime
 2014-04-11 15:08:15 +08:00
samuele3hu 2f1f09d5bf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-11 14:35:07 +08:00
samuele3hu 5b2cf595a2 fix the crash invoked by calling the `glGetUniformfv` 2014-04-11 14:31:44 +08:00
Huabing.Xu 554ede75f0 remove kmMat4 in ActionCamera.cpp 2014-04-11 14:00:55 +08:00
Huabing.Xu e5802a56da remove kmMat4 in RenderTexture.cpp 2014-04-11 13:58:42 +08:00
James Chen 588d825691 Merge pull request #6236 from dumganhar/develop 
Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop
 2014-04-11 13:53:54 +08:00
James Chen 85cc100ac4 Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop 2014-04-11 13:51:40 +08:00
Huabing.Xu 685b9ea297 android can work now 2014-04-11 12:02:56 +08:00
Huabing.Xu 1670e07300 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-04-11 11:18:13 +08:00
Huabing.Xu ad18add1af remove kmMat4 in Sprite.cpp 2014-04-11 11:00:08 +08:00
James Chen 48a5fd555b Compilation error fix in CCQuadCommand.cpp 2014-04-11 10:50:38 +08:00
James Chen dbeefcdff2 Merge commit 'refs/pull/6230/head' of git://github.com/cocos2d/cocos2d-x into pull/6230 2014-04-11 10:48:29 +08:00
chuanweizhang2013 41933a6fd0 Merge pull request #23 from cocos2d/develop 
update cocos2d-x
 2014-04-11 09:55:51 +08:00
samuele3hu f136108037 fix compile error 2014-04-11 09:52:09 +08:00
chuanweizhang2013 337bc2f2e8 Merge pull request #22 from cocos2d/develop 
update cocos2d-x
 2014-04-11 09:33:04 +08:00
samuele3hu 70dec15e76 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-10 23:38:57 +08:00
samuele3hu c687b97c6e fix the crash invoked by deprecated `create` function of `Label` 2014-04-10 23:36:25 +08:00
Huabing.Xu 591b1e9231 remove kmMat4 in Node.cpp 2014-04-10 23:12:29 +08:00
minggo 951bf1cbfa remove unneeded codes 2014-04-10 22:56:40 +08:00
Huabing.Xu d70305cf3b remove kmMat4 in Render.cpp GLProgram, Grid, Layer 2014-04-10 22:38:57 +08:00
James Chen 8e2bd0d2ee Merge pull request #6229 from dumganhar/develop 
[win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui
 2014-04-10 21:16:19 +08:00
James Chen 6b21e598c5 [win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui 2014-04-10 21:14:24 +08:00
James Chen cfc2a05194 Merge pull request #6228 from dumganhar/develop 
Initializes member variables for QualCommand class.
 2014-04-10 21:01:22 +08:00
James Chen 1fdcaaa2c6 Initialzies member variables for QualCommand class. 2014-04-10 20:31:44 +08:00
James Chen f99b9bbabe Merge pull request #6225 from heliclei/fix-console-linux-crash2 
fix CCConsole linux crash
 2014-04-10 19:57:50 +08:00
James Chen 7b4bec1395 Merge pull request #6226 from dumganhar/develop 
Initializes member variables for TransitionScene class
 2014-04-10 19:33:17 +08:00
James Chen e7a4ac531a Initializes member variables for TransitionScene class 2014-04-10 19:29:07 +08:00
heliclei 157fce785c fix CCConsole linux crash 2014-04-10 18:31:28 +08:00
Huabing.Xu 84cf5ca895 remove kmMat4 in Director.cpp 2014-04-10 17:36:47 +08:00
James Chen 167682fb46 Merge pull request #6222 from Dhilan007/develop 
Add CCFontFNT.h to cocos2d.h
 2014-04-10 17:33:36 +08:00
Dhilan007 8472e51b85 Add CCFontFNT.h to cocos2d.h 2014-04-10 17:31:42 +08:00
James Chen 2d131cf96a Merge pull request #6221 from dumganhar/develop 
Removed unused comments in GUIDefine.h
 2014-04-10 17:19:56 +08:00
James Chen 39b25c9307 Removed unused comments in GUIDefine.h 2014-04-10 17:15:59 +08:00
James Chen 5d882cea23 Merge pull request #6213 from koowolf/wp8_fix 
fix compiler error in wp8
 2014-04-10 17:10:08 +08:00
Huabing.Xu 4e0be639a2 remove typo 2014-04-10 17:09:48 +08:00
James Chen 443195df40 Merge pull request #6123 from ololomax/patch-1 
set _node to null in createNodeWithSceneFile
 2014-04-10 17:05:45 +08:00
Huabing.Xu 7441c06680 change matrix projection compatible with kazmath logic 2014-04-10 17:02:36 +08:00
CocosRobot 431f843773 [AUTO]: updating luabinding automatically 2014-04-10 08:20:27 +00:00
samuele3hu 748391f252 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-10 15:55:45 +08:00
samuele3hu 249163c32d Update config files for lua bindings-generator and `lua_cocos2dx_manual.cpp` file 2014-04-10 15:52:51 +08:00
James Chen 428cea061c Merge pull request #6214 from dumganhar/iss4744-set-dirty-for-node 
closed #4744: EventDispatcher::setDirtyForNode doesn't consider node's children
 2014-04-10 15:35:29 +08:00
James Chen a258df38a9 closed #4744: EventDispatcher::setDirtyForNode doesn't consider node's children 2014-04-10 15:31:22 +08:00
koowolf aa51e5dd22 fix compiler error in wp8 2014-04-10 15:15:17 +08:00
samuele3hu c4c4358708 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-10 15:05:41 +08:00
samuele3hu 2800133c99 Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF` 2014-04-10 14:54:14 +08:00
CocosRobot 3f1e8c83a4 [AUTO]: updating luabinding automatically 2014-04-10 06:19:59 +00:00
James Chen 7ec9d6907e Moved the constructor and init function of SpriteBatchNode to protected access. 2014-04-10 14:11:40 +08:00
James Chen 6bdef136a7 Merge pull request #6145 from wefiends/set_fullscreen_videomode 
CCGLView: Add createWithFullscreen overloaded method that sets video mode.
 2014-04-10 12:45:57 +08:00
James Chen 599e14efaa Merge pull request #6207 from CocosRobot/update_lua_bindings_1397100218 
[AUTO]: updating luabinding automatically
 2014-04-10 11:27:04 +08:00
CocosRobot 782bdd90f5 [AUTO]: updating luabinding automatically 2014-04-10 03:24:38 +00:00
James Chen efb443dea0 Merge pull request #6200 from dumganhar/iss4729-deprecated-folder 
issue #4729: Move deprecated stuff to deprecated folder
 2014-04-10 11:17:21 +08:00
James Chen ba1f535201 Merge pull request #6199 from Dhilan007/develop_label 
closed #4743: Label:Makes the create functions of Label clearer.
 2014-04-10 11:15:56 +08:00
Huabing.Xu 231cdcb906 adjust comment message 2014-04-10 11:14:46 +08:00
James Chen 117f248a3b Fix for FileUtils::getData 2014-04-09 20:07:00 -07:00
Dhilan007 8ab372fdd9 Label:Add compatible API of the create functions. 2014-04-10 10:58:49 +08:00
Huabing.Xu 07ac817a7c Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-10 10:52:15 +08:00
James Chen 782d3cd3be issue #4729: Linux fixes 2014-04-09 19:51:05 -07:00
chuanweizhang2013 91e42a17f5 Merge pull request #21 from cocos2d/develop 
update cocos2d-x
 2014-04-10 10:28:12 +08:00
Dhilan007 390685ae93 Label:Change setter of system font name. 2014-04-10 10:23:00 +08:00
James Chen 9a25613eb2 Merge pull request #6203 from dumganhar/develop 
Fix for CC_CALLBACK_3 macro
 2014-04-10 10:08:34 +08:00
James Chen 7db741cf42 Fix for CC_CALLBACK_3 macro 2014-04-10 10:07:01 +08:00
Anton Sokolchenko eb568998b2 Update SimpleAudioEngineOpenAL.cpp 2014-04-10 01:00:23 +03:00
Anton Sokolchenko 5fadd6f9ab Fix memory leak 
471: If this executed "if (!file.file) ", then
473: dynamically allocated variable "data" is leaked.
 2014-04-09 23:25:54 +03:00
James Chen 890dd64d38 issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
James Chen 364fc4722a issue #4729: Updates CCInputDelegate.h 2014-04-10 00:52:41 +08:00
James Chen 5dc6dd87e9 issue #4729: include "ccTypes.h" in ccCArray.cpp for CC_INVALID_INDEX 2014-04-10 00:36:43 +08:00
James Chen 5615717617 issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
James Chen 377086d67a issue #4729: don't use 'using namespace std;' 2014-04-10 00:36:42 +08:00
James Chen e59374de81 issue #4729: Move CC_INVALID_INDEX from ccCArray.h to ccTypes.h, 
probably there is a better place to define this variable, but let's just
choose ccTypes.h now.
 2014-04-10 00:36:42 +08:00
James Chen 9d8d256bee issue #4729: Android build works ok. 2014-04-10 00:36:42 +08:00
James Chen a240c7b240 issue #4729: Moved CCNotificationCenter.h/.cpp to deprecated folder. 2014-04-10 00:36:42 +08:00
James Chen 0bb8f3da78 issue #4729: Updates win32/winrt xxx_headers.props 2014-04-10 00:36:42 +08:00
James Chen 43d6e1176a issue #4729: Compilation error fixes for linux 2014-04-10 00:36:42 +08:00
James Chen 2fc6c0150c issue #4729: iOS/Mac works fine 2014-04-10 00:36:41 +08:00
James Chen 5b296a62e9 issue #4729: Moved deprecated classes to 'cocos/deprecated' folder 2014-04-10 00:36:41 +08:00
minggo 2beed5d398 Merge pull request #6166 from dabingnn/develop_fix_rendererBug 
Develop fix renderer bug
 2014-04-10 00:27:33 +08:00
Nick Barrios 64fc13cae2 CCGLView.h: Remove createWithFullscreen declaration. 2014-04-09 12:15:24 -04:00
Dhilan007 05b8123803 Label:Makes the create functions of Label just do one thing. 2014-04-09 23:31:05 +08:00
Dhilan007 67652357e1 1.Makes the create functions of Label clear. 2014-04-09 21:35:08 +08:00
James Chen 61134426a8 Some fixes detected by xcode analyze 2014-04-09 20:41:09 +08:00
Sergey fdb863ae00 merge error fix 2014-04-09 13:59:22 +04:00
Anton Sokolchenko 87015ae888 2026:72: Result of 'malloc' is incompatible with type 'unsigned char *' 
2026:72: Result of 'malloc' is converted to a pointer of type 'unsigned char', which is incompatible with sizeof operand type 'unsigned char *'
 2014-04-09 11:37:56 +03:00
samuele3hu b6579aa322 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-09 16:25:44 +08:00
James Chen d71483632f Merge pull request #6187 from Dhilan007/develop_activity 
closed #4659:Remove the usage of OpenSL
 2014-04-09 15:39:06 +08:00
Sergey a6dc241986 On activity result listener added 
it is strongly need fro most extensions like Game Center and In app billing
 2014-04-09 11:27:53 +04:00
James Chen 39cca5012c Merge pull request #6188 from Mazyod/develop-cocos2dx 
[FIX]: HTTPClient should not report 2xx status codes as errors!
 2014-04-09 15:27:52 +08:00
James Chen 671832acb7 Merge pull request #6184 from shujunqiao/lua-manual-console 
[lua] add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp
 2014-04-09 15:16:27 +08:00
Mazyad Alabduljaleel 1928a0cb07 = [FIX]: HTTPClient should not report 2xx status codes as errors! 2014-04-09 11:07:51 +04:00
Dhilan007 d310d8d099 closed #4659:Remove the usage of OpenSL 2014-04-09 14:57:07 +08:00
Huabing.Xu a269ac2864 remove kmMat4 interface in cocostudio and UI 2014-04-09 14:44:54 +08:00
samuele3hu 1c124f52ad Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-09 14:29:04 +08:00
samuele3hu dbd01051d8 close #4721:clone for EventListeners of lua didn't clone the related property 2014-04-09 14:26:05 +08:00
Huabing.Xu 504fa2aa60 remove kmMat4 interface in AffineTransform 2014-04-09 14:21:41 +08:00
shujunqiao 2c2876698d add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp. 2014-04-09 14:20:02 +08:00
James Chen c344a1e349 Merge pull request #6182 from Dhilan007/develop_activity 
closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work
 2014-04-09 14:08:06 +08:00
James Chen d93a7e6445 Merge pull request #6177 from DarraghCoy/small_dangling_ptr_fix 
Small dangling ptr fix to EventDispatcher::removeEventListenersForTarget
 2014-04-09 13:22:24 +08:00
Huabing.Xu 8d01d4e07d remove kmMat4 interface in cocos/2d folder 2014-04-09 11:53:01 +08:00
Huabing.Xu 491c97bfeb remove kmMat4 interface in class RenderTexture and TextureFieldTTF file 2014-04-09 11:41:20 +08:00
Huabing.Xu 092d8d9ae9 remove kmMat4 interface in class Sprite 2014-04-09 11:28:34 +08:00
Huabing.Xu e3a9972c4c remove kmMat4 interface in class MotionStreak and ProgressTimer 2014-04-09 11:21:05 +08:00
Huabing.Xu 9496399cd0 remove kmMat4 interface in class Layer 2014-04-09 10:37:41 +08:00
Huabing.Xu be4901d078 remove kmMat4 interface in class Label 2014-04-09 10:06:30 +08:00
Huabing.Xu 3e16857c92 remove kmMat4 interface in class DrawNode 2014-04-09 09:59:56 +08:00
chuanweizhang2013 c75466f555 Merge pull request #20 from cocos2d/develop 
update cocos2d-x
 2014-04-09 09:43:01 +08:00
Darragh Coy 93724b3806 Add in missing template parameter in function arg. 2014-04-08 12:34:22 -07:00
Darragh Coy cbf85259cd Convert tabs to spaces 2014-04-08 11:44:54 -07:00
Darragh Coy 14b210a082 RefPtr<T> - add move semantics 
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
 2014-04-08 11:34:27 -07:00
Nick Barrios 9c2a148256 CCGLView: Remove createWithFullScreen(const std::string& viewName, Size size) overload. Use more specific createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) instead. 2014-04-08 14:02:36 -04:00
Darragh Coy a34b952e8d Revert "Fix Android build for RefPtr addition." 
This reverts commit 586383a05e.
 2014-04-08 10:35:55 -07:00
Nick Barrios 6b8d5dd090 CCGLView: Add support for specifying video mode and monitor for fullscreen window creation. 2014-04-08 13:33:24 -04:00
Darragh Coy 117f22d895 Tweak formatting and change spaces to tabs so indentation appears consistent on github. 2014-04-08 08:47:26 -07:00
Darragh Coy 0082900d10 Small dangling pointer tweak/fix to CCEventDispatcher 
If cleaning a target node that has a listener in the 'to be added' listeners list then ensure that listener does not have a stale reference to the node. This is a minor tweak in addition to pull request 6160 (https://github.com/cocos2d/cocos2d-x/pull/6160).
 2014-04-08 08:46:09 -07:00
Huabing.Xu 409b696bab remove kmMat4 interface in class Node 2014-04-08 23:05:33 +08:00
Huabing.Xu fcff284fd5 getParentToNodeTransform return Matrix 2014-04-08 22:13:59 +08:00
Huabing.Xu 3837c23ebe draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
Huabing.Xu b9af100493 visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00
Dhilan007 c378b42191 closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work 2014-04-08 21:08:20 +08:00
shujunqiao 9391906738 modify const char* to std::string in CCConsole. 2014-04-08 18:20:06 +08:00
minggo 3703c6f73a update version 2014-04-08 18:14:46 +08:00
minggo 6208943cb1 Merge pull request #6168 from heliclei/fix-console-upload 
closed #4533:fix console upload hang issue
 2014-04-08 17:55:15 +08:00
minggo e2252cafe3 Merge pull request #6174 from minggo/change-to-private 
change QuadCommand::generateMaterialID() to private
 2014-04-08 17:54:36 +08:00
minggo ccbd77309d change QuadCommand::generateMaterialID() to private 2014-04-08 17:49:18 +08:00
minggo 0c2b654410 Merge pull request #6171 from minggo/iss4683-assert_not_thread_safe 
use assert because CCASSERT is not thread safe
 2014-04-08 17:16:28 +08:00
Huabing.Xu e8596094a4 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-08 16:58:51 +08:00
Huabing.Xu 7f1fb13113 closed #4629: remove unused _renderStack 2014-04-08 16:54:00 +08:00
James Chen e1f2b71429 Merge pull request #6161 from DarraghCoy/check_node_not_running_when_destroyed 
Adding extra CCNode verification in Node's destructor
 2014-04-08 15:49:22 +08:00
James Chen 28ebec46dc Merge pull request #6151 from mgcL/ScriptHandlerMgr-memory-free 
add destroyInstance for ScriptHandlerMgr
 2014-04-08 15:41:18 +08:00
James Chen 5df765ef0c Merge pull request #6169 from dumganhar/iss4710-eventdispatcher-crash 
closed #4710: [win32] Crash in EventDispatcher if game starts up with mouse moving frequently
 2014-04-08 15:31:52 +08:00
James Chen e04b820cfc closed #4711: [win32] Passing empty string to FileUtils::isFileExist may also return true 2014-04-08 15:24:47 +08:00
James Chen 8f451d48a1 issue #4710: Fixed wrong indention. 2014-04-08 15:11:04 +08:00
James Chen 49bba30409 closed #4710: [win32] Crash in EventDispatcher if game starts up with mouse moving frequently 2014-04-08 15:08:34 +08:00
minggo e28093ee1a closed #4683: use assert because CCASSERT is not thread safe 2014-04-08 14:53:57 +08:00
heliclei 4e1284bd45 closed #4533:fix console upload hang issue 2014-04-08 14:52:53 +08:00
James Chen 546db2de4a Unregistered listener when it's removed from _toAddedListeners. 2014-04-08 11:17:38 +08:00
Darragh Coy 9a6b93eae1 Add extra CCNode verification 
Add a check to the CCNode destructor to catch a common cocos2d-x programming mistake - forgetting to call base class onExit() in derived class onExit() implementations. We can check for this invalid API usage by checking if the node is still marked as running on destruction. If the node still thinks it's running then it's likely the cleanup logic performed by Node::onExit() was not done.
 2014-04-07 17:05:42 -07:00
Darragh Coy 79b5dff795 CCEventDispatcher crash fix 
Fix possible crashes which could be caused by the EventDispatcher having listeners associated with nodes are destroyed. Catch the case where a node registers a listener while we are dispatching events and gets destroyed while that event is still being dispatched. Check the list of nodes to be added into the event dispatcher fully when we are cleaning listeners for a target node.

This issue was found using the extra debug verification in this pull request:
https://github.com/cocos2d/cocos2d-x/pull/6011
 2014-04-07 16:19:26 -07:00
Darragh Coy f147ef723a Merge the alternate RefPtr<T> implementation 
Merge in the version at: https://github.com/DarraghCoy/cocos2d-x/blob/add_refptr_class_alt_impl/cocos/base/CCRefPtr.h
This version sacrifices the ability to use forward references in some places in return for added type safety and ensures we can never assign a non cocos2d::Ref derived object to the pointer.
 2014-04-07 16:04:00 -07:00
Huabing.Xu 1a7f46598f closed #4629: fix bug for group command 2014-04-07 22:51:32 +08:00
James Chen 1b85be2b9b Merge pull request #6150 from mgcL/Value-memory-leak 
A potential memory leak in value's default constructor.
 2014-04-07 16:32:01 +08:00
dbaack 6262c9c910 Fixed a bug where an event listener removed from the event dispatcher while it is still in the _toAddedListeners vector would never have _isRegistered set to false on removal. This causes it to fail an assert if it is attempted to be added to the event dispatcher again later. 2014-04-06 21:59:40 -07:00
mgcL d9e0124ff8 delete _scriptHandlerMgr in destruct will cause stack overflow 2014-04-05 21:26:56 +08:00
mgcL a5da6d71b4 add destroyInstance for ScriptHandlerMgr 2014-04-05 21:09:49 +08:00
mgcL a3a3fa0907 fix Value's memory leak 2014-04-05 18:55:55 +08:00
Ricardo Quesada f1a2db9006 Merge pull request #6140 from dumganhar/render-clean 
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node children Test`.
 2014-04-04 13:34:29 -07:00
CocosRobot cd33967dc4 [AUTO]: updating luabinding automatically 2014-04-04 10:45:34 +00:00
Huabing.Xu 29c345bd02 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-04 18:45:21 +08:00
Huabing.Xu 5d70170a4b getNodetoParentTransform getNodeToWorldTransform return Matrix instead of kmMat4 2014-04-04 18:41:29 +08:00
James Chen 541d4dea0c Merge pull request #6105 from andyque/feature3636 
Added create functions with parameters for all ui controls
 2014-04-04 18:34:59 +08:00
andyque 4b6aa2a22c closed #4636. remove Hungary style 2014-04-04 18:26:53 +08:00
Nick Barrios eae1ccb279 CCGLView: Remove frameZoomFactor param from createWithFullScreen overload. 2014-04-04 06:26:00 -04:00
cw c0fe791aae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime 
Conflicts:
	templates/lua-template-runtime/src/main.lua
 2014-04-04 18:17:54 +08:00
Huabing.Xu 6b4451482f remove matrixToKmMat4 function 2014-04-04 18:13:10 +08:00
Huabing.Xu 70561088df remove kmMat4ToMatrix function 2014-04-04 18:04:29 +08:00
Nick Barrios 58224d9b23 CCGLView: Add createWithFullscreen overloaded method that allows passing in Size, to set video mode. 2014-04-04 06:02:29 -04:00
minggo 439b30434e Merge pull request #6097 from newnon/android_crash_fix 
Android crash fix on new devices
 2014-04-04 18:01:59 +08:00
Huabing.Xu 184f10ae0f add conversion from kmMat4 to Matrix 2014-04-04 17:58:37 +08:00
andyque e346ed3559 closed #4636. done 2014-04-04 17:38:58 +08:00
andyque e20b3d8eb8 issue #4636. refactor SliderReader 2014-04-04 17:35:15 +08:00
Huabing.Xu f1b1678900 Director::getMatrix returns Matrix instead of kmMat4 2014-04-04 17:31:21 +08:00
andyque af5fe04480 issue #4636. refactor LoadingBarReader 2014-04-04 17:25:20 +08:00
andyque a4e0c1a6e2 issue #4636. refactor LayoutReader 2014-04-04 17:21:23 +08:00
andyque 3482815e69 issue #4636. refactor ImageViewReader 2014-04-04 17:18:24 +08:00
Huabing.Xu ea6d8e4e42 replace kmMat4 in director 2014-04-04 17:16:57 +08:00
andyque c252aa5a55 issue #4636. refactor CheckBoxReader 2014-04-04 17:12:47 +08:00
andyque 77aee27f05 issue #4636. refactor ButtonReader 2014-04-04 16:51:07 +08:00
andyque 51404500b7 issue #4636. fixed WidgetReader error 2014-04-04 16:24:54 +08:00
andyque ec83b3db04 issue #4636. fix ButtonReader 2014-04-04 15:21:28 +08:00
James Chen 7b4a1308ea Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node 
children Test`.
 2014-04-04 12:48:16 +08:00
CocosRobot c72f256d01 [AUTO]: updating luabinding automatically 2014-04-03 10:12:05 +00:00
James Chen 1ec3f014e8 Merge pull request #6130 from dumganhar/iss4557-set-enabled-listener 
closed #4557: Adds `EventListener::setEnabled/isEnabled`.
 2014-04-03 18:02:44 +08:00
Huabing.Xu f9405e0ea9 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-03 17:47:16 +08:00
CocosRobot 279b371031 [AUTO]: updating luabinding automatically 2014-04-03 09:46:03 +00:00
Huabing.Xu 1b8e45fe19 remove kmGLFreeAll call 2014-04-03 17:40:14 +08:00
Huabing.Xu 14f004b12a remove reference to kmGL in director 2014-04-03 17:32:40 +08:00
Huabing.Xu 67e62ce73d readied director::getMatrix again. remove kmGLgetMatrix 2014-04-03 17:26:06 +08:00
James Chen a2081ea210 issue #4557: Updates comments for EventListener::setPaused. 2014-04-03 17:20:16 +08:00
andyque 9bcfea2279 issue #4636. fix some typo 2014-04-03 17:13:24 +08:00
samuele3hu 550f4dca29 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-03 17:03:09 +08:00
James Chen a3214b7505 issue #4557: Updates comments for EventListener::setEnabled/setPaused. 
Also does whitespace cleanup and untabify codes. Thanks emacs. :)
 2014-04-03 17:02:17 +08:00
samuele3hu b68f6bf65e fix the error about `draw` of GLNode and modify the related test cases 2014-04-03 17:02:14 +08:00
James Chen 7a5dba9eb9 issue #4557: Adds const for `EventListener::isEnabeld`. 2014-04-03 16:46:16 +08:00
James Chen ec56796062 Merge pull request #6125 from 2youyouo2/develop 
Two fixes for armature:
1.fixed set blend func
2.fixed changedisplay does not rebind parent's bone
 2014-04-03 16:23:55 +08:00
James Chen 405b1c6036 Merge pull request #6122 from mgcL/PhysicsShapeEdgeChain-create-failed 
fix PhysicsShapeEdgeChain::init() always return false
 2014-04-03 16:20:36 +08:00
yinkaile 66e37cf481 remove cc prefix 2014-04-03 16:19:49 +08:00
andyque c35c006fbd Merge branch 'develop' into feature3636 2014-04-03 16:02:00 +08:00
andyque 0875b4e51f closed #4636. Done 2014-04-03 15:56:45 +08:00
andyque ed2c38eb98 issue #4636, finish UITextBMFont 2014-04-03 15:45:06 +08:00
James Chen 89048dd6bd closed #4557: Comment fixes in CCEventListener.h. 2014-04-03 15:35:18 +08:00
andyque b59beab61a issue #4636, finish UISlider 2014-04-03 15:33:57 +08:00
James Chen f6859a3ca9 closed #4557: Adds `EventListener::setEnabled/isEnabled`. 2014-04-03 15:32:16 +08:00
Huabing.Xu 960ac300d5 migrate cocostudio to director matrix stack 2014-04-03 14:55:55 +08:00
Huabing.Xu 67971e9f0b migrate sprite spriteBatchNode to director matrix stack 2014-04-03 14:55:36 +08:00
Huabing.Xu 46b4f1b5d8 migrate Grid, Label, RenderTexture to director matrix stack 2014-04-03 14:32:49 +08:00
andyque 48429f5738 issue #4636. finish UILoadingBar 2014-04-03 11:34:06 +08:00
andyque fe33588038 issue #4636. finish UILayout 2014-04-03 11:14:35 +08:00
andyque 1a97ebdcb0 issue #4636. finish UIImageView 2014-04-03 10:42:30 +08:00
yinkaile eda2d0927c Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2014-04-03 10:37:13 +08:00
andyque 52bdb840ee issue #4636. finish UICheckBox 2014-04-03 10:34:20 +08:00
yinkaile 7177866331 fixed set blend func 2014-04-03 10:34:20 +08:00
Huabing.Xu 79f62f4351 comment out director::getMatrix temporarily 2014-04-03 10:33:59 +08:00
andyque 10134ccc65 issue #4636. finish button 2014-04-03 10:31:10 +08:00
minggo b4225e4626 Merge pull request #6124 from koowolf/mid_resume 
fix resume not support in midi file in win32
 2014-04-03 10:22:44 +08:00
andyque 0a6b0a4389 issue #4636. refactor Scale9Sprite 2014-04-03 10:07:47 +08:00
andyque b27fe6ecc2 issue #4636. add parameter create method to UITextBMFont 2014-04-03 10:07:46 +08:00
andyque 0b5c10a0fb issue #4636. add parameter create method to UITextAtlas 2014-04-03 10:07:46 +08:00
andyque a03dc76f7d issue #4636, add parameter create method for UILoadingBar 2014-04-03 10:07:46 +08:00
andyque 92945715eb issue #4636. add parameter create function for UIText 2014-04-03 10:07:46 +08:00
andyque 558abf1a6b issue #4636, add parameter create method to UIImageView 2014-04-03 10:07:46 +08:00
andyque 18c072beff issue #4636, replace const char* to const std::string& in UIButton 2014-04-03 10:07:46 +08:00
andyque ba9a605568 issue #4636, add parameter create method to UICheckBox 2014-04-03 10:07:46 +08:00
andyque 1b0583214b issue #4636, add parameter create method to UIButton 2014-04-03 10:07:46 +08:00
koowolf 293bd5dc02 fix resume not support in midi file in win32 2014-04-03 09:55:31 +08:00
ololomax e03ef10809 set _node to null in createNodeWithSceneFile 
_node was being set to null only in constructor, so when we call method createNodeWithSceneFile with path to existing file and then call it again with path to missing file (not calling destroyInstance method), it returns a pointer to previously created node, what may lead to a crash.
 2014-04-03 03:06:08 +03:00
mgcL 4f7cb75d2b fix PhysicsShapeEdgeChain::init() always return false 2014-04-02 23:52:21 +08:00
Huabing.Xu dd4d45ea90 migrate particleBatchNode to director matrix stack 2014-04-02 22:52:41 +08:00
Huabing.Xu c593938ed2 migrate nodeGrid 2014-04-02 22:50:39 +08:00
Huabing.Xu 02d1816dde migrating ClippingNode 2014-04-02 22:48:22 +08:00
Huabing.Xu 4ea56522e3 call director matrix stack will also call kmGLXXX functions 2014-04-02 22:46:37 +08:00
CocosRobot 9799fbdf27 [AUTO]: updating luabinding automatically 2014-04-02 10:42:38 +00:00
James Chen 16e51a8489 Merge pull request #6110 from dumganhar/iss4639-isfileexist 
closed #4639: FileUtils::isFileExist doesn't consider SearchPaths and ResolutionOrders
 2014-04-02 18:12:29 +08:00
James Chen c8e6f8d3ff Merge pull request #6106 from pandamicro/AnimLoopFix 
Fixed #4637: Add loop parameter to Animation::initWithSpriteFrames
 2014-04-02 18:08:03 +08:00
pandamicro e5bf6c438f Fixed #4638: Add loop parameter to Animation::createWithSpriteFrames 2014-04-02 18:06:17 +08:00
CocosRobot 59db1f300d [AUTO]: updating luabinding automatically 2014-04-02 09:58:03 +00:00
James Chen 4edf923cf8 Merge pull request #6108 from Dhilan007/develop_label 
Label: Better API order for Label class
 2014-04-02 17:47:44 +08:00
James Chen 7f702b3fe4 Merge pull request #6107 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background 
closed #3509: Skip one frame when _deltaTime equal to zero.
 2014-04-02 16:52:43 +08:00
Huabing.Xu 78eea4a735 add loadIdentityMatrix in Director 2014-04-02 16:47:23 +08:00
Huabing.Xu 106a0da87b add matrix stack in director(will replace kmGLfunctions) 2014-04-02 16:36:11 +08:00
James Chen 1178d67dd6 issue #4639: Reverts the definition of FileUtils::isFileExist, remove 
the second parameter(outFullPath).
 2014-04-02 16:33:05 +08:00
James Chen 236695fd08 Merge pull request #6104 from dumganhar/iss4635-constrolswitch 
closed #4635: ControlSwitch's marksprite is shown at a wrong place
 2014-04-02 15:39:33 +08:00
James Chen 5fa839b16b closed #4639: FileUtils::isFileExist doesn't consider SearchPaths and ResolutionOrders 2014-04-02 15:35:09 +08:00
Huabing.Xu 2e315fb215 migrate Vertex2f to Vector2 2014-04-02 15:25:37 +08:00
Huabing.Xu 49de7511f5 migrate Vertex3f to Vector3 2014-04-02 15:06:16 +08:00
Dhilan007 5aafec462f Label:Fine tune the declaration order of API. 2014-04-02 14:57:00 +08:00
Huabing.Xu 4e93943347 minor change 2014-04-02 14:41:05 +08:00
boyu0 31be60fea7 closed #3509: Skip one frame when _deltaTime equal to zero. 2014-04-02 14:05:07 +08:00
Huabing.Xu 4a78008d77 namespace rename 2014-04-02 12:09:51 +08:00
pandamicro 7019b6e1ab Fixed #4637: Add predefined value indication in cpp 2014-04-02 12:03:42 +08:00
pandamicro 9376c7817f Reverse CONSTRUCTOR_ACCESS to protected 2014-04-02 11:57:23 +08:00
pandamicro 05899d5f6a Fixed #4637: Add loop parameter to Animation::initWithSpriteFrames function 2014-04-02 11:48:49 +08:00
James Chen 48839b9d4d closed #4635: ControlSwitch's marksprite is shown at a wrong place 2014-04-02 11:26:39 +08:00
Huabing.Xu 8561569885 iOS can compile now 2014-04-02 11:21:48 +08:00
Huabing.Xu efc3ddfe57 remove base dependence, add ccMacros.h 2014-04-02 11:06:37 +08:00
Huabing.Xu 0e2969f495 init version of math 2014-04-02 10:33:07 +08:00
Ricardo Quesada b36ab33281 performance fixes in QuadCommand 2014-04-01 16:13:41 -07:00
Sergey b153131097 Android crash fix on new devices 2014-04-01 15:14:25 +04:00
dplusic 1aac5c6934 fixed cc.pGetAngle not using absolute value 2014-04-01 17:13:59 +09:00
James Chen 1a5de6cfa7 Merge pull request #6091 from Dhilan007/develop_label 
Label:fixed possible appear OpenGL error 0x500.
 2014-04-01 15:15:01 +08:00
Dhilan007 c63baa388b remove unused local variable. 2014-04-01 15:10:24 +08:00
James Chen 70dd83512c Renames s_isIOS7 to s_isIOS7OrHigher 2014-04-01 15:08:08 +08:00
Dhilan007 540c67f701 Label:fixed possible appear OpenGL error 0x500. 2014-04-01 15:03:17 +08:00
James Chen 47320e7c7c closed #4383: Fixed missing letters if using old LabelTTF and running on 
iphone 64bit simulator(device).
 2014-04-01 14:47:52 +08:00
minggo c3334cb4ac Merge pull request #6089 from Dhilan007/develop_label 
Fixed logical error in Label::enableShadow
 2014-04-01 14:18:48 +08:00
Dhilan007 eadbca8ee7 1.fixed logical error in Label::enableShadow. 
2.Add test case for shadow and outline take effect at the same time.
 2014-04-01 14:15:35 +08:00
minggo 566fa7110d Merge pull request #6087 from Dhilan007/develop_label 
fixed shadow and outline can't take effect at the same time
 2014-04-01 14:03:42 +08:00
James Chen 0bb71ce678 Merge pull request #6082 from zukkun/fix_cpbodysetangvellimit 
fixed incorrect function invocation in PhysicsBody::setAngularVelocityLimit
 2014-04-01 11:49:38 +08:00
Dhilan007 3a556c24aa fixed shadow and outline can't take effect at the same time 2014-04-01 11:37:36 +08:00
CocosRobot 55b87dbad0 [AUTO]: updating luabinding automatically 2014-04-01 03:33:06 +00:00
minggo 7fb5e1f13a Merge pull request #6066 from minggo/quadcommand-optimize 
use xxhash to generate material id
 2014-04-01 11:27:51 +08:00
CocosRobot ce10ddd84b [AUTO]: updating luabinding automatically 2014-04-01 02:09:55 +00:00
James Chen d7ca1999ab Merge pull request #5998 from bmanGH/feature/fix_STRING_TEXTURE_label_sortAllChildren_crash 
closed #4626: Crash if label's type is STRING_TEXTURE and label->sortAllChildren is called.
 2014-04-01 10:02:35 +08:00
koowolf 36aeb88a9d Merge branch 'quadcommand-optimize' of https://github.com/minggo/cocos2d-x into quadcommand-optimize 
Conflicts:
	cocos/2d/cocos2d_wp8.vcxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
 2014-04-01 09:39:03 +08:00
zukkun e41fd1a29b fixed PhysicsBody::setAngularVelocityLimit incorrect function call 2014-04-01 09:34:42 +09:00
koowolf ad653c6cf9 use xxhash in win32 and wp8 2014-03-31 18:38:39 +08:00
James Chen a93470c67d Merge pull request #6077 from Dhilan007/develop_label 
Label:fixed possible blink if label contains shadow.
 2014-03-31 18:33:55 +08:00
Dhilan007 f485d3b6d5 Label:fixed possible blink if label contains shadow. 2014-03-31 18:16:08 +08:00
koowolf 75ec817ac5 use xxhash in win32 and wp8 2014-03-31 17:15:04 +08:00