Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fixed #249 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
1 commit merged into from
Dec 13, 2010
Merged

fixed #249 #26

1 commit merged into from
Dec 13, 2010

Conversation

natural-law
Copy link
Contributor

implement read sound data from zip file in SimpleAudioEngine

dumganhar pushed a commit that referenced this pull request Sep 26, 2013
Merge pull request #26 from cocos2d/master
94839f1 
Update with upstream
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
Merge pull request cocos2d#26 from cocos2d/master
e729139 
Update with upstream
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 30, 2014
Merge pull request cocos2d#26 from cocos2d/master
8994a7e 
Update with upstream
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 30, 2014
Merge pull request cocos2d#26 from cocos2d/master
5d6d381 
Update with upstream
minggo pushed a commit that referenced this pull request May 4, 2014
issue #26: change malloc/calloc to new
f236e4d
minggo pushed a commit that referenced this pull request May 4, 2014
issue #26: because it use some macro that using malloc and free, so w…
8c754ee 
…e can not change it to new
dabingnn pushed a commit to dabingnn/cocos2d-x that referenced this pull request May 16, 2014
Merge pull request cocos2d#26 from dabingnn/mesh3d_work
c617bb7 
Mesh3d work
ricardoquesada added a commit to ricardoquesada/cocos2d-x that referenced this pull request May 18, 2014
@ricardoquesada
Squashed commit of the following:
1ccb834 
commit 7934be3
Merge: c2b1619 fea335f
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 12:19:41 2014 -0700

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

commit c2b1619
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 12:19:19 2014 -0700

    Adds missing resources for Windows Phone 8

commit fea335f
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 11:54:15 2014 -0700

    Updates CHANGELOG

commit b8b93da
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 11:48:59 2014 -0700

    Adds Sprite3d files and tests

commit 059c842
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 11:16:13 2014 -0700

    fixes compiler warnings for windows

commit d3299f4
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 10:53:34 2014 -0700

    fixes for Sprite3D

    Adds copyright header
    removes compilation warnings
    cleans code a bit

commit 1377787
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:46:26 2014 -0700

    Merge pull request cocos2d#34 from dumganhar/pull/6731

    fix compilation error of missing bind Mesh for luabindings.

commit f89725f
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:45:12 2014 -0700

    use const & and changed typo

commit 9a3c2d0
Author: James Chen <[email protected]>
Date:   Sat May 17 11:43:10 2014 +0800

    fix compilation error of missing bind Mesh for luabindings.

commit 59524b3
Merge: ee4ec94 5c5a6b9
Author: James Chen <[email protected]>
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 5c5a6b9
Merge: d4285e3 5f41732
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:23:58 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit d4285e3
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:22:49 2014 -0700

    remove empty lines

commit 5f41732
Merge: e272583 ac8cf25
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:15:44 2014 -0700

    Merge pull request cocos2d#33 from dabingnn/mesh3d_work

    Mesh3d work

commit ac8cf25
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:14:01 2014 -0700

    added mesh3d file to template

commit e272583
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 19:10:45 2014 -0700

    Merge pull request cocos2d#32 from dabingnn/mesh3d_work

    Mesh3d work

commit 5d3a955
Merge: 4feae11 97cae73
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 18:18:13 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 6a1b847
Merge: 4feae11 4ece4b3
Author: Trace0429 <[email protected]>
Date:   Fri May 16 17:15:39 2014 -0700

    Merge pull request cocos2d#31 from Trace0429/mesh3d_work

    windows work now

commit 4ece4b3
Author: Trace0429 <[email protected]>
Date:   Sat May 17 08:12:46 2014 +0800

    windows work now

commit 4feae11
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:32:58 2014 -0700

    Merge pull request cocos2d#30 from dabingnn/mesh3d_work

    Mesh3d work

commit fdf82d3
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:32:00 2014 -0700

    fix compile error after merge (MAC can work)

commit 4bef832
Merge: 510fc0c d19de29
Author: Huabing.Xu <[email protected]>
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 510fc0c
Merge: e098ed7 7fea347
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:11:39 2014 -0700

    Merge pull request cocos2d#29 from dabingnn/mesh3d_work

    Mesh3d work

commit 7fea347
Merge: a8a409a e098ed7
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:08:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit a8a409a
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:05:37 2014 -0700

    bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw

commit e098ed7
Author: yangxiao <[email protected]>
Date:   Fri May 16 16:02:27 2014 -0700

    bind buffer to 0 when finish draw

commit d13f637
Author: yangxiao <[email protected]>
Date:   Fri May 16 14:00:38 2014 -0700

    fix outline width

commit 8a79c98
Merge: e208712 a0cf4ef
Author: yangxiao <[email protected]>
Date:   Fri May 16 13:47:17 2014 -0700

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

commit e208712
Author: yangxiao <[email protected]>
Date:   Fri May 16 13:47:12 2014 -0700

    make some member protected

commit a0cf4ef
Merge: c0b8902 8b723e8
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 13:06:17 2014 -0700

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

commit c0b8902
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 13:04:27 2014 -0700

    linux work now

commit 8b723e8
Author: yangxiao <[email protected]>
Date:   Fri May 16 12:48:34 2014 -0700

    inc drawcall

commit 5d0b630
Merge: 1e7032b e783da9
Author: yangxiao <[email protected]>
Date:   Fri May 16 12:31:44 2014 -0700

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

commit e783da9
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 12:31:31 2014 -0700

    Merge pull request cocos2d#28 from dabingnn/mesh3d_work

    Mesh3d work

commit 1e7032b
Author: yangxiao <[email protected]>
Date:   Fri May 16 12:30:01 2014 -0700

    optimize code

commit 8f7a19a
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 12:29:37 2014 -0700

    adjust code style

commit 5da20fd
Merge: 659fbd6 553acfb
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 12:06:53 2014 -0700

    Merge pull request cocos2d#27 from dabingnn/mesh3d_work

    Mesh3d work

commit 553acfb
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 12:06:02 2014 -0700

    fix visual error for outline

commit 659fbd6
Merge: 056c3e1 c617bb7
Author: yangxiao <[email protected]>
Date:   Fri May 16 11:54:54 2014 -0700

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

commit 056c3e1
Author: yangxiao <[email protected]>
Date:   Fri May 16 11:54:47 2014 -0700

    fix shader, add multiple sprite to Sprite3DEffectTest

commit c617bb7
Merge: 94d7896 7b19c56
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 11:33:31 2014 -0700

    Merge pull request cocos2d#26 from dabingnn/mesh3d_work

    Mesh3d work

commit 7b19c56
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 11:30:34 2014 -0700

    share the same glprogram in effect3DOutline

commit 377d3bc
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 11:19:56 2014 -0700

    add class static variable for EffectOutline

commit d4913bf
Merge: 213bbb0 6837cea
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 11:07:04 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 213bbb0
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 10:55:28 2014 -0700

    add mesh.h in cocos2d.h

commit 94d7896
Merge: fa69e09 9af9da5
Author: yangxiao <[email protected]>
Date:   Fri May 16 10:41:24 2014 -0700

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

commit fa69e09
Author: yangxiao <[email protected]>
Date:   Fri May 16 10:41:05 2014 -0700

    remove namespace

commit 9af9da5
Merge: ff15926 8a38a38
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 10:30:23 2014 -0700

    Merge pull request cocos2d#25 from dabingnn/mesh3d_work

    Mesh3d work

commit 8a38a38
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 10:27:28 2014 -0700

    remove redundant uniform CC_Texture0

commit db80bf7
Merge: ff15926 511295e
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 10:20:01 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit ff15926
Author: yangxiao <[email protected]>
Date:   Fri May 16 09:11:36 2014 -0700

    warning more than one texture

commit 5debbf8
Author: yangxiao <[email protected]>
Date:   Fri May 16 08:45:03 2014 -0700

    remove redundant line

commit ed357e7
Merge: a1e2306 25dd07e
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:53:10 2014 -0700

    Merge pull request cocos2d#24 from dabingnn/mesh3d_work

    Mesh3d work

commit 25dd07e
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:52:33 2014 -0700

    fix memory leak

commit 945ae34
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:49:04 2014 -0700

    remove unused member variable

commit a1e2306
Merge: bac54fc 712e816
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:37:16 2014 -0700

    Merge pull request cocos2d#23 from dabingnn/mesh3d_work

    Mesh3d work

commit 712e816
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:35:48 2014 -0700

    fix memory leak

commit bac54fc
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 20:01:49 2014 -0700

    Merge pull request cocos2d#22 from dabingnn/mesh3d_work

    Mesh3d work

commit 54538e8
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 20:01:29 2014 -0700

    android work now

commit a6cc0f7
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 19:53:39 2014 -0700

    remove sprite3dEffect include

commit d8482fd
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 19:50:17 2014 -0700

    remove unused Sprite3dEffect

commit c5e2d55
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 19:48:12 2014 -0700

    remove unused outline shader files

commit 09a100c
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 19:43:17 2014 -0700

    fix error on IOS

commit 8ed28c4
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 18:47:37 2014 -0700

    Merge pull request cocos2d#21 from dabingnn/mesh3d_work

    Mesh3d work

commit c0e8ea2
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 18:46:54 2014 -0700

    adjust indent, and line to the end of the file

commit 661ceb7
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <[email protected]>
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 8e764e7
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 18:31:06 2014 -0700

    add testCase for outline

commit c2ced28
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 18:03:34 2014 -0700

    extract base class Effect3D

commit d23ffe3
Author: yangxiao <[email protected]>
Date:   Thu May 15 18:02:45 2014 -0700

    RendeMeshData member rename

commit fb8f255
Merge: 73cb4b4 819db70
Author: yangxiao <[email protected]>
Date:   Thu May 15 17:57:29 2014 -0700

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

commit 819db70
Merge: 2676911 b408f43
Author: Trace0429 <[email protected]>
Date:   Thu May 15 17:54:24 2014 -0700

    Merge pull request cocos2d#20 from Trace0429/mesh3d_work

    Mesh3d work

commit 73cb4b4
Author: yangxiao <[email protected]>
Date:   Thu May 15 17:54:03 2014 -0700

    android meshcommand

commit b408f43
Author: Trace0429 <[email protected]>
Date:   Fri May 16 08:50:38 2014 +0800

    windows work now

commit afbde9c
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 17:38:41 2014 -0700

    raw EffectSprite

commit 2676911
Author: yangxiao <[email protected]>
Date:   Thu May 15 16:37:20 2014 -0700

    remove SpriteEffect from Sprite3D

commit 83dc4cf
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 16:34:36 2014 -0700

    raw effectSpriteTest

commit 39e372e
Merge: 734633e 6d27912
Author: yangxiao <[email protected]>
Date:   Thu May 15 16:14:57 2014 -0700

    use meshcommand

commit 734633e
Author: yangxiao <[email protected]>
Date:   Thu May 15 15:38:30 2014 -0700

    use meshcommand

commit 4ec56af
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 15:31:43 2014 -0700

    comment out effect framework

commit 6d27912
Merge: d6f6f63 61a9011
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 15:11:25 2014 -0700

    Merge pull request cocos2d#19 from dabingnn/mesh3d_work

    Mesh3d work

commit 61a9011
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:55:06 2014 -0700

    fix compile error in testcases

commit 5f2f585
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:52:43 2014 -0700

    fix compile error after merge with v3

commit 1a0de47
Merge: d6f6f63 760ee57
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:48:19 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit d6f6f63
Merge: c6fbd6e 76d2523
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:26:40 2014 -0700

    Merge pull request cocos2d#18 from dabingnn/mesh3d_work

    Mesh3d work

commit 76d2523
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:25:40 2014 -0700

    move 3d shaders to shader cache

commit 9b68032
Merge: 2c9a573 c6fbd6e
Author: yangxiao <[email protected]>
Date:   Thu May 15 13:56:00 2014 -0700

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

commit 2c9a573
Author: yangxiao <[email protected]>
Date:   Thu May 15 13:55:49 2014 -0700

    meshcommand

commit 0631a51
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 13:21:36 2014 -0700

    add mesh rebuild when come to foreground in android

commit 8695016
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 13:13:59 2014 -0700

    android work now

commit c6fbd6e
Merge: cd7b235 0466a38
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 12:21:40 2014 -0700

    Merge pull request cocos2d#17 from dabingnn/mesh3d_work

    Mesh3d work

commit 0466a38
Merge: e349e4e cd7b235
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 12:19:24 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit e349e4e
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 12:18:49 2014 -0700

    commit the changed IOS/MAC project file

commit a7c9a65
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 12:17:57 2014 -0700

    remove MeshPart

commit cd7b235
Merge: e666045 3b7b406
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 11:03:54 2014 -0700

    Merge pull request cocos2d#16 from dabingnn/mesh3d_work

    Mesh3d work

commit 3b7b406
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 10:59:10 2014 -0700

    raw version of single Mesh

commit e666045
Author: yangxiao <[email protected]>
Date:   Thu May 15 10:44:04 2014 -0700

    fix outline

commit 5d4f304
Author: yangxiao <[email protected]>
Date:   Thu May 15 10:09:45 2014 -0700

    without normal no outline effect

commit 3f6bd0f
Author: yangxiao <[email protected]>
Date:   Wed May 14 22:39:03 2014 -0700

    android listenBackToForeground

commit 6bec670
Author: yangxiao <[email protected]>
Date:   Wed May 14 21:58:09 2014 -0700

    add boss1 with normal

commit 35c1b8d
Author: yangxiao <[email protected]>
Date:   Wed May 14 21:54:20 2014 -0700

    change cache

commit 076166f
Author: yangxiao <[email protected]>
Date:   Wed May 14 21:35:59 2014 -0700

    depress no .mtl crash

commit 498c969
Merge: 8a63b49 d4fd946
Author: yangxiao <[email protected]>
Date:   Wed May 14 15:58:50 2014 -0700

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

commit 8a63b49
Merge: b4a8fee f395cc5
Author: yangxiao <[email protected]>
Date:   Wed May 14 15:58:36 2014 -0700

    merge dabingnn

commit d4fd946
Merge: f395cc5 a17f074
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:53:58 2014 -0700

    Merge pull request cocos2d#15 from dabingnn/mesh3d_work

    Mesh3d work

commit a17f074
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:52:58 2014 -0700

    android can work now

commit b4a8fee
Author: yangxiao <[email protected]>
Date:   Wed May 14 15:33:07 2014 -0700

    refactoring render code

commit f395cc5
Merge: f129e02 a2c12df
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:27:21 2014 -0700

    Merge pull request cocos2d#14 from dabingnn/mesh3d_work

    Mesh3d work

commit a2c12df
Merge: 1932e22 f129e02
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:26:19 2014 -0700

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

commit 1932e22
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:25:55 2014 -0700

    android can compile now(can not work)

commit f129e02
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 14:21:09 2014 -0700

    Merge pull request cocos2d#13 from dabingnn/mesh3d_work

    Mesh3d work

commit c0d9097
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 14:15:16 2014 -0700

    include Sprite3DEffect in the cocos2d header

commit ae2aa0d
Author: yangxiao <[email protected]>
Date:   Wed May 14 12:51:09 2014 -0700

    outline sprite

commit e7a542d
Merge: 1c76d4c 48e9f39
Author: yangxiao <[email protected]>
Date:   Wed May 14 10:48:55 2014 -0700

    meshvertexattrib work

commit 1c76d4c
Author: yangxiao <[email protected]>
Date:   Wed May 14 10:40:55 2014 -0700

    use meshvertexattribute

commit 48e9f39
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 09:41:57 2014 -0700

    Merge pull request cocos2d#12 from dabingnn/mesh3d_work

    Mesh3d work

commit e0d87a9
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 09:40:14 2014 -0700

    remove compile error

commit c445e07
Merge: b70bf52 86fb75a
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 09:31:14 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit b70bf52
Merge: da24c48 5a2127d
Author: yangxiao <[email protected]>
Date:   Wed May 14 00:25:47 2014 -0700

    vertex attrib

commit da24c48
Author: yangxiao <[email protected]>
Date:   Tue May 13 23:49:09 2014 -0700

    mesh vertex attribute

commit 5a2127d
Merge: d98adb7 5148f76
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 19:06:38 2014 -0700

    Merge pull request #11 from dabingnn/mesh3d_work

    Mesh3d work

commit 5148f76
Merge: 02deb39 d98adb7
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 19:05:40 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 02deb39
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 19:04:15 2014 -0700

    fix texcoord y flipped

commit d98adb7
Merge: 300eb4e 946283b
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 18:35:08 2014 -0700

    Merge pull request #10 from dabingnn/mesh3d_work

    Mesh3d work

commit 946283b
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 18:22:16 2014 -0700

    added blendFunc

commit 300eb4e
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 16:03:01 2014 -0700

    Merge pull request #9 from dabingnn/mesh3d_work

    Mesh3d work

commit ccc0baf
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 16:01:59 2014 -0700

    fix compile error after merge

commit 5bfc30b
Merge: da7d6a0 0171e27
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 15:56:46 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit da7d6a0
Merge: 0caad32 f413b4e
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 14:19:24 2014 -0700

    Merge pull request #8 from dabingnn/mesh3d_work

    Mesh3d work

commit f413b4e
Merge: f47cfc6 0caad32
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 14:17:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit f47cfc6
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 14:15:06 2014 -0700

    add new interface for createSprite3D

commit 0caad32
Author: yangxiao <[email protected]>
Date:   Tue May 13 13:58:35 2014 -0700

    default GLProgram to object

commit 901ccef
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 13:13:24 2014 -0700

    remove compile warning

commit a6f9cdf
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 13:01:20 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 68bdd0b
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 12:59:59 2014 -0700

    rename init->initWithFile in Sprite3D

commit 3eef54c
Merge: f719f45 1c8773c
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 12:58:23 2014 -0700

    Merge pull request #7 from super626/mesh3d_tmp

    Mesh3d

commit 1c8773c
Merge: 23e8786 f719f45
Author: yangxiao <[email protected]>
Date:   Tue May 13 12:56:06 2014 -0700

    Merge branch 'mesh3d_tmp' into mesh3d

commit f719f45
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:59:46 2014 -0700

    Merge pull request #6 from dabingnn/mesh3d_work

    Mesh3d work

commit 1b76467
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:53:17 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 87adf9d
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:52:41 2014 -0700

    adjust line indent and header file define

commit 23e8786
Author: yangxiao <[email protected]>
Date:   Tue May 13 11:44:22 2014 -0700

    using vbo

commit 6bd3f28
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:42:10 2014 -0700

    Merge pull request #5 from dabingnn/mesh3d_work

    Mesh3d work

commit a239a7e
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:39:06 2014 -0700

    add CCSprite3d include into cocos2d.h

commit 8d580c2
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:33:18 2014 -0700

    remove cocos2d.h include in Sprite3DTest.h

commit 56fc0f4
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:28:47 2014 -0700

    Merge pull request #4 from dabingnn/mesh3d

    Mesh3d

commit 8bb75e3
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:26:40 2014 -0700

    fix compile error after rename

commit 230a731
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:07:30 2014 -0700

    rename FileXXX to CCFileXXX

commit ab16a26
Author: yangxiao <[email protected]>
Date:   Tue May 13 10:52:36 2014 -0700

    rename _model to _mesh

commit 92ac7f7
Merge: 6b911b5 df147d1
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 22:23:59 2014 -0700

    Merge pull request #3 from dabingnn/mesh3d

    Mesh3d

commit df147d1
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 22:21:22 2014 -0700

    fix retain/release in sprite3D

commit 0b38939
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 20:04:16 2014 -0700

    remove compile warnings

commit 090f81b
Author: yangxiao <[email protected]>
Date:   Mon May 12 19:16:25 2014 -0700

    using glprogramstate work ok

commit 0b4f36a
Author: yangxiao <[email protected]>
Date:   Mon May 12 18:38:52 2014 -0700

    add obj

commit e8917d7
Author: yangxiao <[email protected]>
Date:   Mon May 12 18:33:23 2014 -0700

    use glprogramstate

commit 6b911b5
Author: yangxiao <[email protected]>
Date:   Mon May 12 13:01:56 2014 -0700

    sprite3d

commit 2a490c3
Merge: 23a5232 01b015d
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 10:52:17 2014 -0700

    Merge pull request #1 from dabingnn/newcode

    Newcode

commit 01b015d
Merge: 23a5232 5d24b3d
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 10:50:14 2014 -0700

    Merge branch 'v3' into newcode

commit 23a5232
Author: yangxiao <[email protected]>
Date:   Mon May 12 09:44:41 2014 -0700

    3d mesh initial code
ricardoquesada added a commit to ricardoquesada/cocos2d-x that referenced this pull request May 18, 2014
@ricardoquesada
Squashed commit of the following:
6461e26 
commit 64722e4
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 14:03:53 2014 -0700

    More WP8 fixes

commit 7934be3
Merge: c2b1619 fea335f
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 12:19:41 2014 -0700

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

commit c2b1619
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 12:19:19 2014 -0700

    Adds missing resources for Windows Phone 8

commit fea335f
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 11:54:15 2014 -0700

    Updates CHANGELOG

commit b8b93da
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 11:48:59 2014 -0700

    Adds Sprite3d files and tests

commit 059c842
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 11:16:13 2014 -0700

    fixes compiler warnings for windows

commit d3299f4
Author: Ricardo Quesada <[email protected]>
Date:   Sun May 18 10:53:34 2014 -0700

    fixes for Sprite3D

    Adds copyright header
    removes compilation warnings
    cleans code a bit

commit 1377787
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:46:26 2014 -0700

    Merge pull request cocos2d#34 from dumganhar/pull/6731

    fix compilation error of missing bind Mesh for luabindings.

commit f89725f
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:45:12 2014 -0700

    use const & and changed typo

commit 9a3c2d0
Author: James Chen <[email protected]>
Date:   Sat May 17 11:43:10 2014 +0800

    fix compilation error of missing bind Mesh for luabindings.

commit 59524b3
Merge: ee4ec94 5c5a6b9
Author: James Chen <[email protected]>
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 5c5a6b9
Merge: d4285e3 5f41732
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:23:58 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit d4285e3
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:22:49 2014 -0700

    remove empty lines

commit 5f41732
Merge: e272583 ac8cf25
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:15:44 2014 -0700

    Merge pull request cocos2d#33 from dabingnn/mesh3d_work

    Mesh3d work

commit ac8cf25
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 20:14:01 2014 -0700

    added mesh3d file to template

commit e272583
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 19:10:45 2014 -0700

    Merge pull request cocos2d#32 from dabingnn/mesh3d_work

    Mesh3d work

commit 5d3a955
Merge: 4feae11 97cae73
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 18:18:13 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 6a1b847
Merge: 4feae11 4ece4b3
Author: Trace0429 <[email protected]>
Date:   Fri May 16 17:15:39 2014 -0700

    Merge pull request cocos2d#31 from Trace0429/mesh3d_work

    windows work now

commit 4ece4b3
Author: Trace0429 <[email protected]>
Date:   Sat May 17 08:12:46 2014 +0800

    windows work now

commit 4feae11
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:32:58 2014 -0700

    Merge pull request cocos2d#30 from dabingnn/mesh3d_work

    Mesh3d work

commit fdf82d3
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:32:00 2014 -0700

    fix compile error after merge (MAC can work)

commit 4bef832
Merge: 510fc0c d19de29
Author: Huabing.Xu <[email protected]>
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 510fc0c
Merge: e098ed7 7fea347
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:11:39 2014 -0700

    Merge pull request cocos2d#29 from dabingnn/mesh3d_work

    Mesh3d work

commit 7fea347
Merge: a8a409a e098ed7
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:08:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit a8a409a
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 16:05:37 2014 -0700

    bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw

commit e098ed7
Author: yangxiao <[email protected]>
Date:   Fri May 16 16:02:27 2014 -0700

    bind buffer to 0 when finish draw

commit d13f637
Author: yangxiao <[email protected]>
Date:   Fri May 16 14:00:38 2014 -0700

    fix outline width

commit 8a79c98
Merge: e208712 a0cf4ef
Author: yangxiao <[email protected]>
Date:   Fri May 16 13:47:17 2014 -0700

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

commit e208712
Author: yangxiao <[email protected]>
Date:   Fri May 16 13:47:12 2014 -0700

    make some member protected

commit a0cf4ef
Merge: c0b8902 8b723e8
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 13:06:17 2014 -0700

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

commit c0b8902
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 13:04:27 2014 -0700

    linux work now

commit 8b723e8
Author: yangxiao <[email protected]>
Date:   Fri May 16 12:48:34 2014 -0700

    inc drawcall

commit 5d0b630
Merge: 1e7032b e783da9
Author: yangxiao <[email protected]>
Date:   Fri May 16 12:31:44 2014 -0700

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

commit e783da9
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 12:31:31 2014 -0700

    Merge pull request cocos2d#28 from dabingnn/mesh3d_work

    Mesh3d work

commit 1e7032b
Author: yangxiao <[email protected]>
Date:   Fri May 16 12:30:01 2014 -0700

    optimize code

commit 8f7a19a
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 12:29:37 2014 -0700

    adjust code style

commit 5da20fd
Merge: 659fbd6 553acfb
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 12:06:53 2014 -0700

    Merge pull request cocos2d#27 from dabingnn/mesh3d_work

    Mesh3d work

commit 553acfb
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 12:06:02 2014 -0700

    fix visual error for outline

commit 659fbd6
Merge: 056c3e1 c617bb7
Author: yangxiao <[email protected]>
Date:   Fri May 16 11:54:54 2014 -0700

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

commit 056c3e1
Author: yangxiao <[email protected]>
Date:   Fri May 16 11:54:47 2014 -0700

    fix shader, add multiple sprite to Sprite3DEffectTest

commit c617bb7
Merge: 94d7896 7b19c56
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 11:33:31 2014 -0700

    Merge pull request cocos2d#26 from dabingnn/mesh3d_work

    Mesh3d work

commit 7b19c56
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 11:30:34 2014 -0700

    share the same glprogram in effect3DOutline

commit 377d3bc
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 11:19:56 2014 -0700

    add class static variable for EffectOutline

commit d4913bf
Merge: 213bbb0 6837cea
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 11:07:04 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 213bbb0
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 10:55:28 2014 -0700

    add mesh.h in cocos2d.h

commit 94d7896
Merge: fa69e09 9af9da5
Author: yangxiao <[email protected]>
Date:   Fri May 16 10:41:24 2014 -0700

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

commit fa69e09
Author: yangxiao <[email protected]>
Date:   Fri May 16 10:41:05 2014 -0700

    remove namespace

commit 9af9da5
Merge: ff15926 8a38a38
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 10:30:23 2014 -0700

    Merge pull request cocos2d#25 from dabingnn/mesh3d_work

    Mesh3d work

commit 8a38a38
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 10:27:28 2014 -0700

    remove redundant uniform CC_Texture0

commit db80bf7
Merge: ff15926 511295e
Author: Huabing.Xu <[email protected]>
Date:   Fri May 16 10:20:01 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit ff15926
Author: yangxiao <[email protected]>
Date:   Fri May 16 09:11:36 2014 -0700

    warning more than one texture

commit 5debbf8
Author: yangxiao <[email protected]>
Date:   Fri May 16 08:45:03 2014 -0700

    remove redundant line

commit ed357e7
Merge: a1e2306 25dd07e
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:53:10 2014 -0700

    Merge pull request cocos2d#24 from dabingnn/mesh3d_work

    Mesh3d work

commit 25dd07e
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:52:33 2014 -0700

    fix memory leak

commit 945ae34
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:49:04 2014 -0700

    remove unused member variable

commit a1e2306
Merge: bac54fc 712e816
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:37:16 2014 -0700

    Merge pull request cocos2d#23 from dabingnn/mesh3d_work

    Mesh3d work

commit 712e816
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 22:35:48 2014 -0700

    fix memory leak

commit bac54fc
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 20:01:49 2014 -0700

    Merge pull request cocos2d#22 from dabingnn/mesh3d_work

    Mesh3d work

commit 54538e8
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 20:01:29 2014 -0700

    android work now

commit a6cc0f7
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 19:53:39 2014 -0700

    remove sprite3dEffect include

commit d8482fd
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 19:50:17 2014 -0700

    remove unused Sprite3dEffect

commit c5e2d55
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 19:48:12 2014 -0700

    remove unused outline shader files

commit 09a100c
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 19:43:17 2014 -0700

    fix error on IOS

commit 8ed28c4
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 18:47:37 2014 -0700

    Merge pull request cocos2d#21 from dabingnn/mesh3d_work

    Mesh3d work

commit c0e8ea2
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 18:46:54 2014 -0700

    adjust indent, and line to the end of the file

commit 661ceb7
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <[email protected]>
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 8e764e7
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 18:31:06 2014 -0700

    add testCase for outline

commit c2ced28
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 18:03:34 2014 -0700

    extract base class Effect3D

commit d23ffe3
Author: yangxiao <[email protected]>
Date:   Thu May 15 18:02:45 2014 -0700

    RendeMeshData member rename

commit fb8f255
Merge: 73cb4b4 819db70
Author: yangxiao <[email protected]>
Date:   Thu May 15 17:57:29 2014 -0700

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

commit 819db70
Merge: 2676911 b408f43
Author: Trace0429 <[email protected]>
Date:   Thu May 15 17:54:24 2014 -0700

    Merge pull request cocos2d#20 from Trace0429/mesh3d_work

    Mesh3d work

commit 73cb4b4
Author: yangxiao <[email protected]>
Date:   Thu May 15 17:54:03 2014 -0700

    android meshcommand

commit b408f43
Author: Trace0429 <[email protected]>
Date:   Fri May 16 08:50:38 2014 +0800

    windows work now

commit afbde9c
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 17:38:41 2014 -0700

    raw EffectSprite

commit 2676911
Author: yangxiao <[email protected]>
Date:   Thu May 15 16:37:20 2014 -0700

    remove SpriteEffect from Sprite3D

commit 83dc4cf
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 16:34:36 2014 -0700

    raw effectSpriteTest

commit 39e372e
Merge: 734633e 6d27912
Author: yangxiao <[email protected]>
Date:   Thu May 15 16:14:57 2014 -0700

    use meshcommand

commit 734633e
Author: yangxiao <[email protected]>
Date:   Thu May 15 15:38:30 2014 -0700

    use meshcommand

commit 4ec56af
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 15:31:43 2014 -0700

    comment out effect framework

commit 6d27912
Merge: d6f6f63 61a9011
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 15:11:25 2014 -0700

    Merge pull request cocos2d#19 from dabingnn/mesh3d_work

    Mesh3d work

commit 61a9011
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:55:06 2014 -0700

    fix compile error in testcases

commit 5f2f585
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:52:43 2014 -0700

    fix compile error after merge with v3

commit 1a0de47
Merge: d6f6f63 760ee57
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:48:19 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit d6f6f63
Merge: c6fbd6e 76d2523
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:26:40 2014 -0700

    Merge pull request cocos2d#18 from dabingnn/mesh3d_work

    Mesh3d work

commit 76d2523
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 14:25:40 2014 -0700

    move 3d shaders to shader cache

commit 9b68032
Merge: 2c9a573 c6fbd6e
Author: yangxiao <[email protected]>
Date:   Thu May 15 13:56:00 2014 -0700

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

commit 2c9a573
Author: yangxiao <[email protected]>
Date:   Thu May 15 13:55:49 2014 -0700

    meshcommand

commit 0631a51
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 13:21:36 2014 -0700

    add mesh rebuild when come to foreground in android

commit 8695016
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 13:13:59 2014 -0700

    android work now

commit c6fbd6e
Merge: cd7b235 0466a38
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 12:21:40 2014 -0700

    Merge pull request cocos2d#17 from dabingnn/mesh3d_work

    Mesh3d work

commit 0466a38
Merge: e349e4e cd7b235
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 12:19:24 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit e349e4e
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 12:18:49 2014 -0700

    commit the changed IOS/MAC project file

commit a7c9a65
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 12:17:57 2014 -0700

    remove MeshPart

commit cd7b235
Merge: e666045 3b7b406
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 11:03:54 2014 -0700

    Merge pull request cocos2d#16 from dabingnn/mesh3d_work

    Mesh3d work

commit 3b7b406
Author: Huabing.Xu <[email protected]>
Date:   Thu May 15 10:59:10 2014 -0700

    raw version of single Mesh

commit e666045
Author: yangxiao <[email protected]>
Date:   Thu May 15 10:44:04 2014 -0700

    fix outline

commit 5d4f304
Author: yangxiao <[email protected]>
Date:   Thu May 15 10:09:45 2014 -0700

    without normal no outline effect

commit 3f6bd0f
Author: yangxiao <[email protected]>
Date:   Wed May 14 22:39:03 2014 -0700

    android listenBackToForeground

commit 6bec670
Author: yangxiao <[email protected]>
Date:   Wed May 14 21:58:09 2014 -0700

    add boss1 with normal

commit 35c1b8d
Author: yangxiao <[email protected]>
Date:   Wed May 14 21:54:20 2014 -0700

    change cache

commit 076166f
Author: yangxiao <[email protected]>
Date:   Wed May 14 21:35:59 2014 -0700

    depress no .mtl crash

commit 498c969
Merge: 8a63b49 d4fd946
Author: yangxiao <[email protected]>
Date:   Wed May 14 15:58:50 2014 -0700

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

commit 8a63b49
Merge: b4a8fee f395cc5
Author: yangxiao <[email protected]>
Date:   Wed May 14 15:58:36 2014 -0700

    merge dabingnn

commit d4fd946
Merge: f395cc5 a17f074
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:53:58 2014 -0700

    Merge pull request cocos2d#15 from dabingnn/mesh3d_work

    Mesh3d work

commit a17f074
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:52:58 2014 -0700

    android can work now

commit b4a8fee
Author: yangxiao <[email protected]>
Date:   Wed May 14 15:33:07 2014 -0700

    refactoring render code

commit f395cc5
Merge: f129e02 a2c12df
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:27:21 2014 -0700

    Merge pull request cocos2d#14 from dabingnn/mesh3d_work

    Mesh3d work

commit a2c12df
Merge: 1932e22 f129e02
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:26:19 2014 -0700

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

commit 1932e22
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 15:25:55 2014 -0700

    android can compile now(can not work)

commit f129e02
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 14:21:09 2014 -0700

    Merge pull request cocos2d#13 from dabingnn/mesh3d_work

    Mesh3d work

commit c0d9097
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 14:15:16 2014 -0700

    include Sprite3DEffect in the cocos2d header

commit ae2aa0d
Author: yangxiao <[email protected]>
Date:   Wed May 14 12:51:09 2014 -0700

    outline sprite

commit e7a542d
Merge: 1c76d4c 48e9f39
Author: yangxiao <[email protected]>
Date:   Wed May 14 10:48:55 2014 -0700

    meshvertexattrib work

commit 1c76d4c
Author: yangxiao <[email protected]>
Date:   Wed May 14 10:40:55 2014 -0700

    use meshvertexattribute

commit 48e9f39
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 09:41:57 2014 -0700

    Merge pull request cocos2d#12 from dabingnn/mesh3d_work

    Mesh3d work

commit e0d87a9
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 09:40:14 2014 -0700

    remove compile error

commit c445e07
Merge: b70bf52 86fb75a
Author: Huabing.Xu <[email protected]>
Date:   Wed May 14 09:31:14 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit b70bf52
Merge: da24c48 5a2127d
Author: yangxiao <[email protected]>
Date:   Wed May 14 00:25:47 2014 -0700

    vertex attrib

commit da24c48
Author: yangxiao <[email protected]>
Date:   Tue May 13 23:49:09 2014 -0700

    mesh vertex attribute

commit 5a2127d
Merge: d98adb7 5148f76
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 19:06:38 2014 -0700

    Merge pull request #11 from dabingnn/mesh3d_work

    Mesh3d work

commit 5148f76
Merge: 02deb39 d98adb7
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 19:05:40 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 02deb39
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 19:04:15 2014 -0700

    fix texcoord y flipped

commit d98adb7
Merge: 300eb4e 946283b
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 18:35:08 2014 -0700

    Merge pull request #10 from dabingnn/mesh3d_work

    Mesh3d work

commit 946283b
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 18:22:16 2014 -0700

    added blendFunc

commit 300eb4e
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 16:03:01 2014 -0700

    Merge pull request #9 from dabingnn/mesh3d_work

    Mesh3d work

commit ccc0baf
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 16:01:59 2014 -0700

    fix compile error after merge

commit 5bfc30b
Merge: da7d6a0 0171e27
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 15:56:46 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit da7d6a0
Merge: 0caad32 f413b4e
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 14:19:24 2014 -0700

    Merge pull request #8 from dabingnn/mesh3d_work

    Mesh3d work

commit f413b4e
Merge: f47cfc6 0caad32
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 14:17:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit f47cfc6
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 14:15:06 2014 -0700

    add new interface for createSprite3D

commit 0caad32
Author: yangxiao <[email protected]>
Date:   Tue May 13 13:58:35 2014 -0700

    default GLProgram to object

commit 901ccef
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 13:13:24 2014 -0700

    remove compile warning

commit a6f9cdf
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 13:01:20 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 68bdd0b
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 12:59:59 2014 -0700

    rename init->initWithFile in Sprite3D

commit 3eef54c
Merge: f719f45 1c8773c
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 12:58:23 2014 -0700

    Merge pull request #7 from super626/mesh3d_tmp

    Mesh3d

commit 1c8773c
Merge: 23e8786 f719f45
Author: yangxiao <[email protected]>
Date:   Tue May 13 12:56:06 2014 -0700

    Merge branch 'mesh3d_tmp' into mesh3d

commit f719f45
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:59:46 2014 -0700

    Merge pull request #6 from dabingnn/mesh3d_work

    Mesh3d work

commit 1b76467
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:53:17 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 87adf9d
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:52:41 2014 -0700

    adjust line indent and header file define

commit 23e8786
Author: yangxiao <[email protected]>
Date:   Tue May 13 11:44:22 2014 -0700

    using vbo

commit 6bd3f28
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:42:10 2014 -0700

    Merge pull request #5 from dabingnn/mesh3d_work

    Mesh3d work

commit a239a7e
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:39:06 2014 -0700

    add CCSprite3d include into cocos2d.h

commit 8d580c2
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:33:18 2014 -0700

    remove cocos2d.h include in Sprite3DTest.h

commit 56fc0f4
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:28:47 2014 -0700

    Merge pull request #4 from dabingnn/mesh3d

    Mesh3d

commit 8bb75e3
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:26:40 2014 -0700

    fix compile error after rename

commit 230a731
Author: Huabing.Xu <[email protected]>
Date:   Tue May 13 11:07:30 2014 -0700

    rename FileXXX to CCFileXXX

commit ab16a26
Author: yangxiao <[email protected]>
Date:   Tue May 13 10:52:36 2014 -0700

    rename _model to _mesh

commit 92ac7f7
Merge: 6b911b5 df147d1
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 22:23:59 2014 -0700

    Merge pull request #3 from dabingnn/mesh3d

    Mesh3d

commit df147d1
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 22:21:22 2014 -0700

    fix retain/release in sprite3D

commit 0b38939
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 20:04:16 2014 -0700

    remove compile warnings

commit 090f81b
Author: yangxiao <[email protected]>
Date:   Mon May 12 19:16:25 2014 -0700

    using glprogramstate work ok

commit 0b4f36a
Author: yangxiao <[email protected]>
Date:   Mon May 12 18:38:52 2014 -0700

    add obj

commit e8917d7
Author: yangxiao <[email protected]>
Date:   Mon May 12 18:33:23 2014 -0700

    use glprogramstate

commit 6b911b5
Author: yangxiao <[email protected]>
Date:   Mon May 12 13:01:56 2014 -0700

    sprite3d

commit 2a490c3
Merge: 23a5232 01b015d
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 10:52:17 2014 -0700

    Merge pull request #1 from dabingnn/newcode

    Newcode

commit 01b015d
Merge: 23a5232 5d24b3d
Author: Huabing.Xu <[email protected]>
Date:   Mon May 12 10:50:14 2014 -0700

    Merge branch 'v3' into newcode

commit 23a5232
Author: yangxiao <[email protected]>
Date:   Mon May 12 09:44:41 2014 -0700

    3d mesh initial code
pandamicro added a commit to pandamicro/cocos2d-x that referenced this pull request May 20, 2014
@pandamicro
Merge pull request cocos2d#26 from cocos2d/v3
a8ed50f 
Sync Cocos2d-x v3
minggo pushed a commit that referenced this pull request May 23, 2014
@cocoscodeide
Merge pull request #26 from cocos2d/v3
5e198aa 
update cocos2d-x
asmodehn pushed a commit to asmodehn/cocos2d-x that referenced this pull request Jun 5, 2014
@alecthomas
Merge pull request cocos2d#26 from hovatterz/pkg-config
851b198 
Add pkg-config source file
natural-law referenced this pull request in natural-law/cocos2d-x Dec 7, 2014
Merge pull request #26 from huangshiwu/ludum-dare
2c04322 
scene arrangement and improve
pandamicro pushed a commit to pandamicro/cocos2d-x that referenced this pull request Apr 14, 2015
Merge pull request cocos2d#26 from quick-x-team/fix-lua-framework
ec774c8 
fix lua framework
pandamicro pushed a commit to pandamicro/cocos2d-x that referenced this pull request Apr 23, 2015
@SunLightJuly
Merge pull request cocos2d#26 from andyque/update-deps-to-43
1e2440c 
update external deps to 43
zilongshanren added a commit that referenced this pull request Sep 1, 2015
@zilongshanren
Merge pull request #26 from wohaaitinciu/v3-remote
ca2ee10 
revert to the original state when user cancel input
@bolso80 bolso80 mentioned this pull request Nov 15, 2016
Closed
@newnon newnon mentioned this pull request Jul 27, 2017
Open
@zoxin zoxin mentioned this pull request Aug 4, 2017
Merged
@Dimon4eg Dimon4eg mentioned this pull request May 15, 2018
Closed
@JianingHe JianingHe mentioned this pull request May 1, 2019
Open
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@natural-law