samuele3hu
|
092eed12a2
|
Update cocos2d-console submodule
|
2015-04-14 16:43:03 +08:00 |
samuele3hu
|
b2c3628aee
|
Remove useless classes configuration for Lua binding
|
2015-04-14 15:02:25 +08:00 |
zhangbin
|
ea86978ce2
|
Add js-bindings generator tools.
|
2015-04-14 11:01:07 +08:00 |
minggo
|
bc34554bd9
|
Merge pull request #11407 from samuele3hu/v3_studio2
Synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 18:22:18 +08:00 |
samuele3hu
|
24654a4847
|
synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 16:29:44 +08:00 |
andyque
|
f664efe889
|
fix gen scripting binding
|
2015-04-13 16:17:17 +08:00 |
andyque
|
d45f66cdb9
|
fix the scripts
|
2015-04-13 16:11:09 +08:00 |
andyque
|
205c4efd9f
|
add a wrapper for jenkins pull request build
|
2015-04-13 15:57:41 +08:00 |
minggo
|
07df23ed85
|
Merge pull request #11401 from andyque/fix-pull-requester-build
print more infor about scripting binding
|
2015-04-13 13:39:23 +08:00 |
andyque
|
6783754f3e
|
fix typo
|
2015-04-13 12:00:09 +08:00 |
andyque
|
2176881dbe
|
print more infor about jsb
|
2015-04-13 11:27:54 +08:00 |
minggo
|
a2de59bac3
|
Merge pull request #11397 from andyque/fix-pull-requester-build
fix PR requester builder prompt message position.
|
2015-04-13 11:23:39 +08:00 |
minggo
|
da69dbd133
|
Merge pull request #11388 from xiaofeng11/v3
Reader update
|
2015-04-13 11:20:53 +08:00 |
andyque
|
163cee699d
|
fix PR requester builder promption.
|
2015-04-13 11:20:47 +08:00 |
andyque
|
72691a6aac
|
fix PR builder doesn't work for tizen
|
2015-04-13 11:18:08 +08:00 |
samuele3hu
|
8896190d9b
|
Fix the bindings-generator error and add related Action Timeline test case.
|
2015-04-12 22:20:53 +08:00 |
zhangbin
|
4929b584e2
|
Update the reference of submodule cocos2d-console.
|
2015-04-09 13:39:01 +08:00 |
minggo
|
f1429d21f8
|
Merge pull request #11321 from SunLightJuly/v3_fix
updated submodule
|
2015-04-08 11:46:14 +08:00 |
minggo
|
4bcfcb1d09
|
Merge pull request #11320 from samuele3hu/v3_terrain
#issue 10819:Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 11:45:46 +08:00 |
SunLightJuly
|
5847325e2d
|
updated submodule
|
2015-04-08 11:37:33 +08:00 |
samuele3hu
|
3a2601a1f8
|
Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 10:03:50 +08:00 |
andyque
|
32b2e4c20e
|
android slave only build cpp-tests and lua-tests for PR
|
2015-04-07 11:58:04 +08:00 |
yinjimmy
|
587ee21e4b
|
revert lua runtime
|
2015-04-02 18:27:53 +08:00 |
samuele3hu
|
6c528c4a42
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test
|
2015-03-30 15:51:01 +08:00 |
samuele3hu
|
79c0258449
|
Remove useless configure for bindings-generator of Lua
|
2015-03-30 15:48:47 +08:00 |
minggo
|
d437ce3e59
|
Merge pull request #11208 from samuele3hu/v3_5_comment
Update Sprite3DCubeMap lua test case and the related bindings-generator submodule
|
2015-03-30 10:48:36 +08:00 |
samuele3hu
|
1a9cf6f6a3
|
Update the bindings-generator submodule
|
2015-03-28 15:00:12 +08:00 |
samuele3hu
|
921981833e
|
Update Sprite3DCubeMap test case
|
2015-03-28 14:59:47 +08:00 |
yangxiao
|
a45f0d1a76
|
merge cocos
|
2015-03-27 16:50:40 +08:00 |
yangxiao
|
1d08c514ee
|
do not export getBoneCurves
|
2015-03-27 09:15:45 +08:00 |
zhangbin
|
30819193a4
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-03-25 11:45:41 +08:00 |
zhangbin
|
7aaf122a41
|
Support compile & run test projects with cocos2d-console on wp8.
|
2015-03-25 11:42:55 +08:00 |
andyque
|
29b97ad235
|
use release build in windows slaves
|
2015-03-25 09:51:39 +08:00 |
andyque
|
1b053a6eb2
|
add wp8 build node
|
2015-03-24 14:54:08 +08:00 |
andyque
|
920e30386e
|
do cleanup
|
2015-03-24 11:13:23 +08:00 |
andyque
|
b8bc7ce3f3
|
add daily build
|
2015-03-24 11:10:51 +08:00 |
minggo
|
47b7bcf01f
|
Merge pull request #11072 from andyque/fix-doxygen-release-tool
[ci skip]fix doxygen document generate tool restore doxygen.config file
|
2015-03-23 16:24:48 +08:00 |
zhangbin
|
e457cb47d7
|
Update the reference of submodule cocos2d-console.
|
2015-03-23 16:09:43 +08:00 |
andyque
|
360098c2cf
|
fix doxygen document generate tool restore doxygen.config file unexpectly
|
2015-03-23 14:35:38 +08:00 |
zhangbin
|
5e86152b15
|
Update the reference of submodule cocos2d-console.
|
2015-03-23 12:04:14 +08:00 |
zhangbin
|
eb95bbce02
|
Update the reference of submodule cocos2d-console.
|
2015-03-23 10:10:35 +08:00 |
andyque
|
a535d2f5d4
|
use msbuild in windows slaves
|
2015-03-20 09:37:06 +08:00 |
Vincent Yang
|
6bbb89a098
|
Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules.
|
2015-03-17 11:26:33 +08:00 |
zhangbin
|
1b92859c61
|
Update the reference of submodule cocos2d-console.
|
2015-03-16 16:29:07 +08:00 |
Nite Luo
|
18d716cfd2
|
Use xcode for jenkins build
|
2015-03-14 02:08:52 -07:00 |
Nite Luo
|
860c108f86
|
revert changes in mac build script
|
2015-03-14 01:30:11 -07:00 |
Nite Luo
|
1d96876699
|
Test if reduce log size will fix the build
|
2015-03-14 01:09:42 -07:00 |
Nite Luo
|
99bc7e2a2b
|
Fix multithread compiling
|
2015-03-13 19:53:22 -07:00 |
Huabing.Xu
|
6b00b65824
|
[ci skip]fix make package for lua runtime is removed
|
2015-03-13 15:29:05 +08:00 |
Wenhai Lin
|
0356f9daca
|
Fixed git-archive-all
|
2015-03-13 12:07:33 +08:00 |
minggo
|
44b1f77fa3
|
Merge pull request #10799 from SunLightJuly/v3_remove_simu
V3 remove simulator
|
2015-03-11 15:31:17 +08:00 |
andyque
|
f3763bde3d
|
remove backup 3rd party libs
|
2015-03-11 14:59:34 +08:00 |
andyque
|
e76cc8c99d
|
remove template config.json check
|
2015-03-11 14:00:28 +08:00 |
andyque
|
1c483b27fd
|
update github remote
|
2015-03-11 10:49:39 +08:00 |
andyque
|
98d57551d1
|
remove exceptions code
|
2015-03-11 00:59:21 +08:00 |
andyque
|
0991ce5002
|
update master jenkins scripts
|
2015-03-11 00:08:52 +08:00 |
SunLightJuly
|
6c2eb01213
|
cleanup proj.android
|
2015-03-10 23:33:09 +08:00 |
SunLightJuly
|
b77801a99b
|
cleanup proj.win32
|
2015-03-10 22:56:03 +08:00 |
andyque
|
34619fc125
|
add git --version
|
2015-03-10 19:07:55 +08:00 |
andyque
|
ffa01950ac
|
use subprocess.call
|
2015-03-10 19:00:07 +08:00 |
andyque
|
9457ed5fbd
|
fix subprocess.check_output error
|
2015-03-10 18:47:35 +08:00 |
andyque
|
7f4bfc395f
|
change os.system to subprocess
|
2015-03-10 18:42:26 +08:00 |
SunLightJuly
|
ba55f14fbf
|
removed runtime in libsimulator
|
2015-03-10 18:28:59 +08:00 |
andyque
|
5bd5c62a91
|
change git merge method
|
2015-03-10 18:24:38 +08:00 |
andyque
|
3cd4018cca
|
change scripts
|
2015-03-10 17:47:00 +08:00 |
andyque
|
d09f678579
|
modify remote build environment variable
|
2015-03-10 17:42:09 +08:00 |
andyque
|
7d7ee03c5b
|
fix jenkins scripts
|
2015-03-10 17:03:03 +08:00 |
andyque
|
28ed1d0cae
|
use exceptions to report unwanted behaviors
|
2015-03-10 16:08:57 +08:00 |
andyque
|
a48c8c840c
|
cleanup pull request scripts
|
2015-03-10 15:44:02 +08:00 |
andyque
|
fbc6804b3f
|
improving jenkins pull request scripts
|
2015-03-10 14:40:04 +08:00 |
andyque
|
48482907b8
|
refactoring jenkins scripts
|
2015-03-10 14:08:03 +08:00 |
SunLightJuly
|
81aebdda29
|
cleanup files of simulator
|
2015-03-10 10:54:14 +08:00 |
SunLightJuly
|
ff8c0dac2b
|
removed framework of simulator
|
2015-03-10 10:51:16 +08:00 |
SunLightJuly
|
69cdc3e47c
|
removed win32 project of simulator
|
2015-03-10 02:39:42 +08:00 |
SunLightJuly
|
10a60bb9da
|
removed pbxproj of simulator
|
2015-03-10 02:28:27 +08:00 |
SunLightJuly
|
03f99b38d0
|
removed proj.android of simulator
|
2015-03-10 02:21:32 +08:00 |
samuele3hu
|
d72a0c3985
|
Add more include files in config.gitingore for generating templates/cocos2dx_files.json
|
2015-03-09 17:39:57 +08:00 |
yangxiao
|
8137b01f23
|
merge cocos
|
2015-03-06 18:31:57 +08:00 |
minggo
|
065102ae7c
|
Merge pull request #10753 from natural-law/v3
[ci skip] Update the reference of submodule cocos2d-console.
|
2015-03-06 14:53:31 +08:00 |
zhangbin
|
8c57edbad5
|
Update the reference of submodule cocos2d-console.
|
2015-03-06 14:51:29 +08:00 |
andyque
|
942ceccd99
|
fix android and win32 compile error
|
2015-03-04 14:12:11 +08:00 |
yangxiao
|
b938872621
|
lua binding
|
2015-03-04 12:58:51 +08:00 |
andyque
|
92fb735611
|
fix jenkins compile erorr
|
2015-03-04 12:09:12 +08:00 |
andyque
|
2e2fb122e6
|
fix v3 win32 build issue
|
2015-03-03 18:35:43 +08:00 |
andyque
|
23e49fe2b7
|
modify building slaves name lists in each slave
|
2015-03-03 16:42:48 +08:00 |
andyque
|
7b183a13ad
|
sync jenkins script with v4-develop
|
2015-03-03 16:36:42 +08:00 |
andyque
|
992cc52a02
|
fix new windows jenkins slave compile error
|
2015-03-02 19:43:27 +08:00 |
yinjimmy
|
2042633294
|
update runtime to 2.0
|
2015-02-27 14:49:04 +08:00 |
zhangbin
|
6ada496b57
|
Update the reference of submodule cocos2d-console.
|
2015-02-25 18:03:05 +08:00 |
SunLightJuly
|
2b269aab53
|
update sub-module "cocos2d-console"
|
2015-02-25 10:45:36 +08:00 |
minggo
|
c8eaa4aeba
|
Merge pull request #10447 from super626/particle_merge
add 3d particle (Particle Universe)
|
2015-02-15 19:48:18 +08:00 |
samuele3hu
|
3a7cbe9d67
|
Add Particle3DTest for Lua and update related configure files
|
2015-02-15 15:56:20 +08:00 |
yangxiao
|
9153dd5cc3
|
add particle to lua binding
|
2015-02-13 18:27:32 +08:00 |
minggo
|
f77cafb7ce
|
Merge pull request #10267 from kompjoefriek/indent-consistency
fixed indentation of Python files
|
2015-02-13 15:36:20 +08:00 |
SunLightJuly
|
aaf6ad03c8
|
called initGLContextAttrs() before create glview
|
2015-02-13 13:45:15 +08:00 |
kompjoefriek
|
c6ab07ea02
|
fixed indentation of Python files
- Changed tabs to spaces
- Changed 2 spaces to 4 spaces
|
2015-02-12 21:22:19 +01:00 |
minggo
|
e017511c65
|
disable travis notification
|
2015-02-12 18:39:42 +08:00 |
minggo
|
49489ba3ad
|
update console
|
2015-01-30 20:06:43 +08:00 |
minggo
|
f4266c9ae3
|
update console submodule
|
2015-01-30 14:58:20 +08:00 |
samuele3hu
|
80c2e0c153
|
Add AsyncLoadSprite3D test case and update the related lua binding
|
2015-01-28 21:47:52 +08:00 |