CocosRobot
f65f20e270
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-01 02:57:37 +00:00
CocosRobot
6410eca425
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-31 05:53:58 +00:00
CocosRobot
43c030205b
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-27 03:16:06 +00:00
CocosRobot
342edc5904
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-20 04:49:27 +00:00
CocosRobot
182d4958f8
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-19 12:42:16 +00:00
CocosRobot
2b14d11bb9
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-17 06:18:34 +00:00
CocosRobot
5203d1e7be
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-13 07:20:18 +00:00
CocosRobot
54ac9ef67f
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-11 07:32:59 +00:00
Mazyad Alabduljaleel
983ffd96c7
Now, mac uses ObjC HTTP client
2015-03-10 14:48:57 +04:00
CocosRobot
3f7e2eb1ff
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 09:45:58 +00:00
CocosRobot
f46817eac7
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 02:59:36 +00:00
CocosRobot
d7d85625fa
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 02:23:45 +00:00
CocosRobot
1498c18d1b
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-06 08:12:23 +00:00
CocosRobot
721804a30e
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-04 08:13:38 +00:00
CocosRobot
a5a1bd3994
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-27 10:12:08 +00:00
minggo
503c46a9e8
Merge pull request #10286 from flamefox/v3_fix_dos2unix
...
fix dos2unix not in run path, on new lua project
2015-02-27 16:35:02 +08:00
CocosRobot
9cecd68064
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-26 04:26:17 +00:00
Ray
bfb5c1ca23
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-02-26 10:44:20 +08:00
CocosRobot
0072400fc9
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-26 01:40:45 +00:00
CocosRobot
92806f7919
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-24 01:27:05 +00:00
CocosRobot
2947fd95d6
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-20 01:14:18 +00:00
CocosRobot
83fed82923
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-15 12:00:05 +00:00
CocosRobot
33be077835
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-15 11:50:10 +00:00
flamefox
deb5fd46ff
add dos2unix.exe to templates\cocos2dx_files.json
2015-01-30 11:14:51 +08:00
CocosRobot
ebf6f2728f
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-29 02:57:47 +00:00
CocosRobot
c1e586ebab
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-21 08:07:36 +00:00
CocosRobot
8a78a7e8fd
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-21 05:41:12 +00:00
CocosRobot
e221424a64
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-21 03:06:58 +00:00
CocosRobot
ef9fabbc51
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-21 02:35:37 +00:00
CocosRobot
945be7529d
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-19 01:34:14 +00:00
CocosRobot
f9192835c9
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-16 16:13:41 +00:00
CocosRobot
b2db3c13dd
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 15:39:55 +00:00
CocosRobot
b703c7b169
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 09:30:59 +00:00
CocosRobot
88029d33bd
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 08:45:40 +00:00
CocosRobot
29d85ca8c2
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 08:12:14 +00:00
CocosRobot
5faeb6919a
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 03:39:38 +00:00
CocosRobot
27da58e4b5
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-12 12:13:39 +00:00
CocosRobot
f6de697bde
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-08 06:05:46 +00:00
CocosRobot
6a88a51e24
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-07 02:23:16 +00:00
CocosRobot
85ccfb2209
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 07:14:27 +00:00
CocosRobot
ced43a1c2b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 05:50:50 +00:00
CocosRobot
d4c9205320
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 05:01:17 +00:00
CocosRobot
1f8bb3f808
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 04:51:26 +00:00
CocosRobot
a3e15a3d29
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 01:59:46 +00:00
CocosRobot
cb7a63b413
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-30 10:34:54 +00:00
CocosRobot
e7a7ee750f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-29 05:48:30 +00:00
CocosRobot
b385ce58d0
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-29 02:31:59 +00:00
CocosRobot
0a4785d6fc
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-29 01:45:01 +00:00
CocosRobot
a8fedda82c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-26 01:29:15 +00:00
CocosRobot
542b2b6bd2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-25 06:10:51 +00:00
youyou
f678d1027c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
CocosRobot
95df9ba145
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-24 09:37:39 +00:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
CocosRobot
94d96b5ad1
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-23 04:01:55 +00:00
CocosRobot
7170e85a7a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-19 22:37:52 +00:00
kaile.yin
1db2bf89e0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-05 14:42:25 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
CocosRobot
b7d553f5db
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-04 07:13:03 +00:00
CocosRobot
918372556b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-04 02:08:20 +00:00
kaile.yin
9d49f82eb9
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-12-03 16:00:32 +08:00
CocosRobot
ff8d2624eb
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-28 08:54:16 +00:00
CocosRobot
38c3bc7b4f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-27 19:37:40 +00:00
CocosRobot
0b286aa412
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-25 14:48:14 +00:00
CocosRobot
8c20e7a5c6
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-25 01:35:25 +00:00
CocosRobot
451cbe52d2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-24 09:54:39 +00:00
youyou
d04945d77c
update templates
2014-11-24 11:08:37 +08:00
CocosRobot
2398712b9d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-21 01:57:39 +00:00
CocosRobot
18b0a6cacc
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-16 17:32:13 +00:00
CocosRobot
c227ba9e40
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-14 21:10:45 +00:00
Ricardo Quesada
2e3b2d9f28
Merge pull request #9080 from vovkasm/cmake-refactoring
...
Cmake refactorings and fixes
2014-11-13 15:42:47 -08:00
CocosRobot
4ae4932e8a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-11 22:17:01 +00:00
Vladimir Timofeev
77ab866090
Move BuildHelpers.CMakeLists.txt to Modules/CocosBuildHelpers.cmake, this name is more standard for cmake include files, and in future this file can be installed to use by external applications.
2014-11-11 10:30:48 +03:00
CocosRobot
80ce1537e7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-07 02:34:46 +00:00
CocosRobot
29264db249
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-25 07:47:09 +00:00
CocosRobot
2355be4e92
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-20 10:12:41 +00:00
CocosRobot
aa7478d375
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-19 12:09:52 +00:00
CocosRobot
592c39fd96
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-17 05:47:13 +00:00
CocosRobot
39d3cb20b5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 13:12:34 +00:00
CocosRobot
6f79cbd64c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 10:16:52 +00:00
CocosRobot
f50989fa79
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 09:51:29 +00:00
CocosRobot
ec067b15ac
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 09:25:47 +00:00
CocosRobot
a6f0c1322c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 06:02:13 +00:00
CocosRobot
ac3753092b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 03:56:42 +00:00
minggo
8461165fad
Merge pull request #8722 from samuele3hu/v3_assetsmanager
...
Add AssetsmanagerEx and adjust related project configure and files
2014-10-16 11:55:24 +08:00
samuele3hu
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# 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-10-16 10:59:58 +08:00
CocosRobot
cbdbee1876
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 01:35:18 +00:00
minggo
16ad1977b0
Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode
...
Add clipping rectangle node
2014-10-15 15:09:29 +08:00
samuele3hu
6c79ce50d2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
tests/lua-tests/src/mainMenu.lua
2014-10-15 15:07:30 +08:00
CocosRobot
65aefcd5a3
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-15 05:56:51 +00:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00
SunLightJuly
f2286eaf94
added ClippingRectangleNode
2014-10-15 13:38:14 +08:00
CocosRobot
da3f7ebe23
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-15 02:37:42 +00:00
CocosRobot
c816ea443d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-14 09:10:38 +00:00
minggo
abd2687cf5
Merge pull request #8683 from dualface/update_lua_template_runtime
...
update lua-template
2014-10-14 17:01:19 +08:00
dualface
cee999ebbb
update lua-template-default, lua-template-runtime, fix same proj problems.
2014-10-14 16:55:38 +08:00
minggo
3274b6f9df
Revert "[AUTO][ci skip]: updating cocos2dx_files.json"
2014-10-14 14:41:45 +08:00
CocosRobot
96954d1188
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-14 06:34:13 +00:00
SunLightJuly
a36dbf5362
ClippingRegionNode --> ClippingRectangleNode
2014-10-11 11:49:01 +08:00
CocosRobot
7cb2cd8608
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-11 02:16:23 +00:00
dualface
b49d2351ff
update lua-template-default
2014-10-11 02:55:04 +08:00
CocosRobot
127b8acd14
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-10 14:23:42 +00:00
minggo
4d084496a3
Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP
...
added LuaStack::loadChunksFromZIP()
2014-10-10 22:14:55 +08:00
SunLightJuly
ba064167a8
modified project files and make files
2014-10-10 18:43:40 +08:00
CocosRobot
80a92066c2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-10 08:42:41 +00:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
CocosRobot
0b5122a11b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-09 05:49:41 +00:00
CocosRobot
79e641b3ff
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-09 02:06:14 +00:00
SunLightJuly
1062dec335
modified project files and make files
2014-10-08 18:44:58 +08:00
CocosRobot
75f21f9c10
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-08 01:41:20 +00:00
CocosRobot
d090576b94
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-06 13:11:39 +00:00
CocosRobot
181ef40285
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-30 07:10:16 +00:00
CocosRobot
f834ae8d07
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-30 03:15:35 +00:00
minggo
d1e41c771b
Merge pull request #8162 from super626/light
...
3D Light
2014-09-30 11:13:59 +08:00
yangxiao
d680e58f80
merge cocos resolve conflict
2014-09-30 08:32:37 +08:00
CocosRobot
2f35269bf9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-29 18:08:55 +00:00
CocosRobot
13b165cf75
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-29 10:31:52 +00:00
yangxiao
e8904454e9
add to template
2014-09-28 16:08:05 +08:00
yangxiao
75e5ca30ee
merge cocos
2014-09-28 09:55:31 +08:00
yangxiao
1e5a02df2b
add to template
2014-09-26 23:13:20 +08:00
CocosRobot
87c04a3e5d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-26 07:00:12 +00:00
CocosRobot
1f2fc054fe
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-25 10:05:55 +00:00
CocosRobot
e0d14458a5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-25 05:43:04 +00:00
CocosRobot
02d343fefc
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 09:03:33 +00:00
CocosRobot
78b51b3ffd
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 05:43:25 +00:00
CocosRobot
671739e9a8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 02:57:48 +00:00
CocosRobot
2c1649f773
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-23 01:26:04 +00:00
CocosRobot
93bfc08d67
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-22 01:32:19 +00:00
CocosRobot
34f679a88a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-15 19:27:41 +00:00
CocosRobot
5e936ec8ca
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-15 05:46:24 +00:00
CocosRobot
dcdabb404a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-15 03:11:35 +00:00
CocosRobot
827679099c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-11 08:31:19 +00:00
minggo
bb0b7a9b8a
Merge pull request #7950 from super626/billboard
...
3D BillBoard
2014-09-11 16:29:05 +08:00
yangxiao
5274b4f958
merge cocos resolve conflict
2014-09-11 16:02:07 +08:00
CocosRobot
974e810bb2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-11 07:48:14 +00:00
CocosRobot
11005a6ce9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-11 06:48:54 +00:00
yangxiao
bb6f5a6be5
Merge branch 'newcode' into billboard
2014-09-10 16:27:59 +08:00
CocosRobot
deef5cb3d7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-10 06:07:55 +00:00
CocosRobot
15254a5ddb
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-10 01:50:11 +00:00
yangxiao
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
yangxiao
d183e64c83
add to template
2014-09-04 16:52:45 +08:00
CocosRobot
6bd05770e7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 06:00:43 +00:00
minggo
43e2b39bc0
Merge pull request #7921 from dabingnn/v3_trianglesCommand
...
V3 triangles command
2014-09-04 13:58:50 +08:00
CocosRobot
4b21972d8b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 05:42:22 +00:00
Huabing.Xu
4ae2d6fc90
Merge branch 'v3' into v3_trianglesCommand
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-09-04 11:27:12 +08:00
CocosRobot
071aedaa51
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 02:56:25 +00:00
CocosRobot
1ec9933045
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-03 05:37:45 +00:00
CocosRobot
61a3c80cb9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-03 04:05:23 +00:00
CocosRobot
2dea7c3a18
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-03 03:26:30 +00:00
Huabing.Xu
05d0e04073
[ci skip] update template for triangles command
2014-09-02 15:05:21 +08:00
CocosRobot
d0ac64b2e8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-29 05:43:47 +00:00
CocosRobot
27b8fd02ad
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-28 02:18:38 +00:00
CocosRobot
f1914f3fa1
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-27 05:40:25 +00:00
CocosRobot
8d88109db7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-25 06:57:10 +00:00
CocosRobot
b165137f40
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-25 03:19:31 +00:00
CocosRobot
b55c174bba
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-22 15:56:17 +00:00
CocosRobot
91eba38eda
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-22 15:40:55 +00:00
CocosRobot
9c2cbaf742
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-20 05:37:22 +00:00
andyque
9a3c2dc6a4
Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-20 09:56:16 +08:00
CocosRobot
218cee5e05
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-18 14:55:40 +00:00
CocosRobot
94b45d55ef
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-18 14:43:41 +00:00
CocosRobot
128d06076a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-15 07:41:13 +00:00
yangxiao
2786e63824
Merge branch 'newcode' into obb
2014-08-14 18:58:46 +08:00
CocosRobot
2d4f23d9e8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-14 10:36:05 +00:00
yangxiao
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
CocosRobot
6510d74ff7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-14 01:29:42 +00:00
CocosRobot
93800c5821
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-13 01:27:24 +00:00
gin0606
17aa2833db
Fix xcode warning that cause `getEngine` inline expansion
2014-08-12 18:07:17 +09:00
CocosRobot
f8f15df530
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-11 07:06:46 +00:00
yangxiao
fd314261b7
Merge branch 'newcode' into obb
2014-08-11 13:21:44 +08:00
CocosRobot
076a2f9d1a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-11 01:32:55 +00:00
yangxiao
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00
CocosRobot
1b4cd7e58e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-08 07:58:25 +00:00
minggo
213f2f5a6c
Merge pull request #7702 from super626/v3_merge
...
Camera and Camera test
2014-08-08 15:56:38 +08:00
yangxiao
97edd303b5
remove DrawNode3D
2014-08-08 15:06:45 +08:00
gin0606
6722f8d546
Fix typo
2014-08-08 13:27:09 +09:00
CocosRobot
75bd97b82e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-08 03:51:09 +00:00
yangxiao
813e954f4e
aabb, obb
2014-08-08 00:00:58 +08:00
gin0606
5349aa7efb
Add ccRandom.h
2014-08-07 21:17:36 +09:00
yangxiao
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
CocosRobot
92bb832d18
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-07 02:54:38 +00:00
CocosRobot
075c890ef1
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-06 09:51:57 +00:00
CocosRobot
35a19dd0ea
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-06 07:24:27 +00:00
CocosRobot
eacb8fa120
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 10:23:15 +00:00
CocosRobot
3a3cf0383d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 08:38:41 +00:00
CocosRobot
1772ab78ac
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 02:13:45 +00:00
CocosRobot
0f3fbfa07f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 02:00:57 +00:00
yangxiao
d6d3ea6b18
fix template
2014-08-04 13:12:59 +08:00
yangxiao
4452d9579a
merge cocos2d, fix lua
2014-08-04 12:07:27 +08:00
CocosRobot
ea1d9d4657
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-01 07:58:06 +00:00
huangshiwu
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
CocosRobot
ce8c5ee327
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-01 03:58:50 +00:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
CocosRobot
6dd02ade69
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-30 07:51:17 +00:00
CocosRobot
06d43ed2fd
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-30 01:28:27 +00:00
CocosRobot
a743590ac5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-29 08:09:10 +00:00
CocosRobot
3d7cced94e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-29 06:30:39 +00:00
CocosRobot
ea69a2c72d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-23 16:38:00 +00:00
Sergey
5c62a2fea7
template fix
2014-07-22 15:49:38 +04:00
CocosRobot
19d01ae17b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-22 09:06:42 +00:00
CocosRobot
eee5934b03
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-21 08:48:07 +00:00
CocosRobot
afe3760aa0
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-21 03:54:57 +00:00
CocosRobot
5de1256005
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-17 08:01:08 +00:00
CocosRobot
1544081284
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-17 07:42:19 +00:00
CocosRobot
924b8b23f2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-17 06:28:22 +00:00
CocosRobot
c1bb801dc5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-15 09:06:46 +00:00
CocosRobot
d90effbe09
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-15 05:46:51 +00:00
CocosRobot
4b9ce2e663
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-11 11:11:12 +00:00
CocosRobot
57827e9465
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-11 06:14:32 +00:00
CocosRobot
463a2ab5ac
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-11 01:43:39 +00:00
CocosRobot
e1559c4828
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-10 14:06:29 +00:00
CocosRobot
142ac9a413
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-04 17:07:04 +00:00
CocosRobot
0b0b9ccdf3
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-02 08:21:52 +00:00
CocosRobot
32c88f6189
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-01 10:04:00 +00:00
CocosRobot
5ab6d5557b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-01 07:52:35 +00:00
CocosRobot
6eb0d3cc86
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-30 09:26:15 +00:00
CocosRobot
f06061dfec
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-30 01:42:06 +00:00
CocosRobot
c52fe48484
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-29 08:42:40 +00:00
minggo
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
yangxiao
f38f0b00aa
fix templates
2014-06-27 18:01:39 +08:00
CocosRobot
054f8c5d11
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-27 08:38:35 +00:00
CocosRobot
a3de7c00c8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-26 06:40:58 +00:00
CocosRobot
486bf9ad12
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-25 09:21:01 +00:00
CocosRobot
7f104f4bf7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-24 02:47:56 +00:00
CocosRobot
cb9e5c2d77
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-24 02:31:03 +00:00
CocosRobot
2c04d00425
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-20 16:25:25 +00:00
CocosRobot
ffb96092fd
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-19 13:57:10 +00:00
CocosRobot
54b2a15886
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-19 13:24:14 +00:00
CocosRobot
9aeb1510ed
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-18 05:36:54 +00:00
CocosRobot
a292f7d063
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-17 13:09:25 +00:00
minggo
26cca348cb
Merge pull request #7085 from super626/v3
...
Sprite3D animation
2014-06-17 21:05:58 +08:00
CocosRobot
7f9c86ab44
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-17 05:58:26 +00:00
CocosRobot
0bbce49012
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-17 05:38:36 +00:00
Huabing.Xu
f0fd7897be
update template
2014-06-17 13:25:05 +08:00
CocosRobot
70a4fd173c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-09 03:12:43 +00:00
minggo
24f7c9019a
Merge pull request #7005 from andyque/refactorUITouchEvent
...
refactor UI framework touch handling
2014-06-09 11:11:40 +08:00
CocosRobot
b2ca17e00b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-09 02:53:03 +00:00
andyque
1a933807b5
remove UIInterface.h header file
2014-06-09 10:35:54 +08:00
CocosRobot
b218f8ec13
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-05 03:51:15 +00:00
minggo
366beedbb2
Merge pull request #6955 from samuele3hu/v3_fix
...
Add xxtea encrypt support for lua and update the console submodule
2014-06-05 11:49:40 +08:00
CocosRobot
bd018ea645
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-04 09:18:03 +00:00
andyque
ab8a68f53b
fix template
2014-06-04 15:55:52 +08:00
andyque
d089b251db
fix other platform compile error
2014-06-04 14:56:34 +08:00
samuele3hu
c785d64ba1
Adjust the xxtea directory structure and modify configs files for platforms
2014-06-04 11:50:04 +08:00
samuele3hu
55bb9a7d09
Update setting for different platform
2014-06-03 17:15:28 +08:00
CocosRobot
c441b869ec
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-29 06:08:40 +00:00
CocosRobot
73f3361b0e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-28 05:49:49 +00:00
andyque
769300d25e
rename UILayout
...
Executant.h to UILayoutManager.h
2014-05-28 10:17:34 +08:00
CocosRobot
cc41694077
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-26 05:42:20 +00:00
CocosRobot
a07b2dae75
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-21 07:25:16 +00:00
CocosRobot
5fe36c55c7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-20 11:49:30 +00:00
CocosRobot
06febdf2b9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-20 06:40:22 +00:00
CocosRobot
b637f06ce6
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-20 05:48:12 +00:00
CocosRobot
794ba83495
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-18 22:25:49 +00:00
CocosRobot
cb67b0533c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-18 21:51:37 +00:00
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
CocosRobot
45d923e259
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-17 01:18:27 +00:00
CocosRobot
b36d503812
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-16 21:39:50 +00:00
CocosRobot
c2ace4c56e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-16 08:43:41 +00:00
CocosRobot
b9562e5dbf
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-15 10:30:59 +00:00
CocosRobot
79b679a3b0
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-12 11:05:12 +00:00
CocosRobot
e9cf6060be
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-12 09:59:17 +00:00
CocosRobot
18e8f1bdae
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-12 08:11:46 +00:00
CocosRobot
4ce297458f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-10 03:58:12 +00:00
Ricardo Quesada
63c7c6a05c
Updates template files
2014-05-09 18:41:12 -07:00
Ricardo Quesada
fec1b82c0a
Shader files use STRINGIFY
2014-05-09 16:45:42 -07:00
Ricardo Quesada
808561705a
new files for template
2014-05-09 15:40:48 -07:00
CocosRobot
224b0910c9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-09 05:42:30 +00:00
CocosRobot
7ef529b1c4
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 10:35:12 +00:00
CocosRobot
fb0094e0b7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 07:30:48 +00:00
CocosRobot
9e45b4be3a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 06:00:35 +00:00
CocosRobot
7fb79c2a52
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-07 09:43:30 +00:00
CocosRobot
12ba2b178e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-06 11:20:46 +00:00
CocosRobot
897b3c61ce
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-05 05:40:36 +00:00
CocosRobot
e32647ec88
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-04 17:37:16 +00:00
James Chen
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00