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