joshuastray
|
00dd854578
|
add material system tests for js
|
2015-05-18 10:44:15 +08:00 |
samuele3hu
|
71595898ed
|
Update the Lua binding for Physics3D ,related test cases and the template project
|
2015-05-15 16:25:07 +08:00 |
Bin Zhang
|
815120d95c
|
Update the reference of submodule cocos2d-console.
|
2015-05-15 16:06:11 +08:00 |
yinjimmy
|
06bd26cb63
|
Fixed: app crash when console ui trace nil string on mac platform #11211
|
2015-05-15 15:08:42 +08:00 |
samuele3hu
|
fa63471c0a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
Conflicts:
tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
|
2015-05-15 09:31:53 +08:00 |
samuele3hu
|
8db62c82f8
|
Add Lua bindings for Physics3D and related test cases
|
2015-05-15 09:28:03 +08:00 |
Bin Zhang
|
65ef7cea88
|
Update the reference of submodule cocos2d-console.
|
2015-05-14 18:00:47 +08:00 |
yinjimmy
|
5cfa5ad8b8
|
add simulator
|
2015-05-14 14:11:40 +08:00 |
yinjimmy
|
d78d8b2c1f
|
move menu bar to system menu
|
2015-05-14 13:43:17 +08:00 |
zhangbin
|
e901918115
|
Update the reference of submodule cocos2d-console.
|
2015-05-13 14:07:10 +08:00 |
joshuastray
|
7a4ca3fe6a
|
add new files to project
|
2015-05-12 10:40:51 +08:00 |
jianglong0156
|
80326aa40e
|
add webiew jsb code
|
2015-05-12 10:30:51 +08:00 |
joshuastray
|
234f4db8a0
|
add SpritePolygon binding && js tests
|
2015-05-11 17:04:23 +08:00 |
minggo
|
50dc2a3e49
|
Merge pull request #11758 from super626/physics3d2
add physics3d support using bullet 2.82
|
2015-05-08 16:58:28 +08:00 |
yangxiao
|
2391558c96
|
add physics3d support
|
2015-05-08 15:49:33 +08:00 |
andyque
|
2575130b33
|
improve jenkins workflow
|
2015-05-08 14:44:43 +08:00 |
samuele3hu
|
23e4e0d4e3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
|
2015-05-07 16:21:03 +08:00 |
minggo
|
775236b531
|
Merge pull request #11729 from samuele3hu/v3_7_js
Update the configure of js-tests and js-template on the win32 platform
|
2015-05-07 15:48:35 +08:00 |
samuele3hu
|
2385e68f72
|
Update the ini files for js binding
|
2015-05-07 13:00:57 +08:00 |
samuele3hu
|
243da71082
|
Update the project configure of js-tests and js-template on the win32 platform
|
2015-05-07 11:38:43 +08:00 |
andyque
|
bedd62296f
|
fix binding generator
|
2015-05-07 07:05:23 +08:00 |
samuele3hu
|
f1b5729183
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
|
2015-05-05 16:14:57 +08:00 |
samuele3hu
|
037c17fe5d
|
Remove vs2012 support in v3
|
2015-05-05 16:11:26 +08:00 |
zhangbin
|
0a65ad433a
|
Update the travis script for auto generate lua-binding & js-binding.
|
2015-05-05 11:52:52 +08:00 |
zhangbin
|
23ed3dbe4c
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-05-05 10:53:04 +08:00 |
zhangbin
|
b4f2d94109
|
Update js bindings & js tests.
|
2015-05-05 10:50:19 +08:00 |
minggo
|
e75936b778
|
Merge pull request #11669 from samuele3hu/v3.7
Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public
|
2015-05-05 09:37:56 +08:00 |
minggo
|
254a4b0b0c
|
Merge pull request #11660 from natural-law/v3
Rename the target name of Xcode project in templates.
|
2015-04-30 18:13:41 +08:00 |
samuele3hu
|
f4b57511b0
|
Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public
|
2015-04-30 17:18:12 +08:00 |
zhangbin
|
fc9e5609c8
|
Rename the target name of Xcode project in templates.
|
2015-04-30 15:20:47 +08:00 |
minggo
|
521b311f59
|
change to use v3 branch
|
2015-04-30 13:59:58 +08:00 |
minggo
|
4acd231f89
|
merge v3.6
|
2015-04-30 13:46:08 +08:00 |
andyque
|
46c22fbe21
|
fix xcode preject jenkins return value
|
2015-04-29 13:58:35 +08:00 |
andyque
|
1613237460
|
fix jenkins pull request builder return value
|
2015-04-29 09:53:40 +08:00 |
samuele3hu
|
5819159889
|
Add Lua-bindings for SpritePolygon and related test case
|
2015-04-28 18:19:57 +08:00 |
andyque
|
293fb37fdd
|
fix cmake generate error
|
2015-04-28 11:13:20 +08:00 |
andyque
|
422fde5d2a
|
fix return value
|
2015-04-28 11:08:47 +08:00 |
samuele3hu
|
95381ab975
|
Update the generate-cocosfiles.sh
|
2015-04-27 15:41:26 +08:00 |
samuele3hu
|
99bdfeb468
|
Update the configure about travis
|
2015-04-27 15:38:35 +08:00 |
Danut Chereches
|
5f692962b9
|
fixed 'seperate' typo
issue #8408
|
2015-04-25 00:02:39 +03:00 |
zhangbin
|
61cf0ad28b
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
|
2015-04-23 15:46:19 +08:00 |
minggo
|
8ab03a62d1
|
Merge pull request #11543 from yinjimmy/runtime
Add lua runtime template
|
2015-04-23 10:25:00 +08:00 |
zhangbin
|
dd022dd7b2
|
Update the reference of submodule cocos2d-console.
|
2015-04-21 17:28:53 +08:00 |
zhangbin
|
bbb94985a0
|
Update the reference of submodule cocos2d-console.
|
2015-04-21 17:17:58 +08:00 |
zhangbin
|
fca642e88e
|
Update the reference of submodule cocos2d-console.
|
2015-04-21 16:55:46 +08:00 |
yinjimmy
|
2c0f1c1a50
|
add lua runtime template
|
2015-04-21 01:25:44 +08:00 |
samuele3hu
|
9477e89723
|
Fix the compile error on the win32
|
2015-04-20 11:46:48 +08:00 |
samuele3hu
|
067ad6ad60
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
cocos/scripting/lua-bindings/proj.android/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
|
2015-04-20 10:05:02 +08:00 |
Jimmy Yin
|
185435a388
|
Add missing file for win32
|
2015-04-19 00:09:52 +08:00 |
Jimmy Yin
|
a9542813f4
|
Add missing file for android
|
2015-04-18 23:20:41 +08:00 |
yinjimmy
|
1e32322350
|
revert runtime files
|
2015-04-17 18:26:47 +08:00 |
zhangbin
|
e5672b6e1f
|
Update js bindings.
|
2015-04-17 17:27:47 +08:00 |
yinjimmy
|
5589796029
|
Merge branch 'v3' into lua_runtime
|
2015-04-17 15:27:04 +08:00 |
samuele3hu
|
b72034a3f6
|
Add Lua bindings for WebView and related test case
|
2015-04-17 14:08:47 +08:00 |
Wenhai Lin
|
03ef9b962a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge
|
2015-04-17 11:47:09 +08:00 |
minggo
|
814cb9224b
|
Merge pull request #11462 from andyque/disable-v2-build-trigger
Disable v2 build trigger
|
2015-04-16 18:01:26 +08:00 |
zhangbin
|
1f491cf656
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
Conflicts:
build/cocos2d-wp8.sln
|
2015-04-16 17:04:07 +08:00 |
andyque
|
df1703375c
|
fix wrong indentation
|
2015-04-16 15:51:08 +08:00 |
andyque
|
68f86adab1
|
disable comment job trigger for v2 branch
|
2015-04-16 15:28:09 +08:00 |
andyque
|
fdb03f150d
|
don't trigger for v2 build
|
2015-04-16 15:28:08 +08:00 |
Dale Stammen
|
eb07142427
|
removed WP8 jenkins slave script
|
2015-04-15 07:18:13 -07:00 |
zhangbin
|
2c7bd7ec35
|
Update cocos2dx files.
|
2015-04-15 15:12:04 +08:00 |
zhangbin
|
3641451c47
|
Update the submodule js-bindings & update solution files for js-bindings.
|
2015-04-15 13:58:41 +08:00 |
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 |