minggo
|
11f9eaa4a0
|
fix template compiling error
|
2014-09-12 15:02:18 +08: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
|
cf9094207a
|
merge cocos
|
2014-09-09 16:00:55 +08:00 |
huangshiwu
|
7372604f7f
|
fix wp8 compile error and modify default resource path
|
2014-09-05 11:21:08 +08: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 |
samuele3hu
|
d681bdce92
|
Fix the crash of project which was created by the lua-template-runtime
|
2014-09-03 14:54:58 +08:00 |
CocosRobot
|
1ec9933045
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 05:37:45 +00:00 |
minggo
|
66943eec98
|
Merge pull request #7932 from minggo/remove-unneeded-files
remove unneeded files
|
2014-09-03 13:36:31 +08:00 |
CocosRobot
|
61a3c80cb9
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 04:05:23 +00:00 |
minggo
|
b37ef4e1c3
|
remove unneeded files
|
2014-09-03 11:52:19 +08: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 |
zhangbin
|
e24a903c88
|
Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1.
|
2014-08-28 16:13:11 +08: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 |
samuele3hu
|
471820568f
|
Update android.mk of cocos and lua-templates
|
2014-08-27 10:28:04 +08:00 |
samuele3hu
|
33fd605a16
|
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
|
2014-08-27 10:18:44 +08:00 |
CocosRobot
|
8d88109db7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-25 06:57:10 +00:00 |
minggo
|
37aeb5b114
|
Merge pull request #7872 from samuele3hu/v3_3_new_module
Integrate all modules into cocos2d and related luacocos2d and adjust the related test cases
|
2014-08-25 14:55:46 +08:00 |
samuele3hu
|
74624f5ba1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
|
2014-08-25 11:52:52 +08:00 |
samuele3hu
|
893e0b0a08
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-25 11:45:29 +08:00 |
CocosRobot
|
b165137f40
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-25 03:19:31 +00:00 |
minggo
|
ba4825a5fa
|
Merge pull request #7869 from huangshiwu/v3_glviewattrs
OpenGL context attributions setting revise -modify lua template
|
2014-08-25 11:18:15 +08:00 |
minggo
|
e5ac6e204b
|
Merge pull request #7864 from minggo/module-devide
Module devide
|
2014-08-25 11:01:19 +08:00 |
huangshiwu
|
9eda72f54a
|
OpenGL context attributions setting revise -modify lua template
|
2014-08-25 10:57:58 +08:00 |
minggo
|
dcea3b6134
|
Merge pull request #7843 from huangshiwu/v3_glviewattrs
V3 glviewattrs
|
2014-08-25 09:46:19 +08:00 |
minggo
|
e7050486d3
|
fix conflict
|
2014-08-24 18:56:51 +08:00 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07: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 |
huangshiwu
|
07af58c0c2
|
OpenGL context attributions setting revise -2
|
2014-08-22 16:22:16 +08:00 |
samuele3hu
|
a3e4402c5f
|
Adjust cpp-template-default template
|
2014-08-22 13:50:28 +08:00 |
teivaz
|
312f57d7a6
|
- [WP8] Now replacing application display name with project name
|
2014-08-21 18:49:52 +03: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 |
teivaz
|
ebb0876d29
|
* [WP8] Fixed resource search path in template
|
2014-08-19 21:44:46 +03:00 |