Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,083 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

2166 Commits

Author SHA1 Message Date
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
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
samuele3hu 6208e9cba5 Add more test cases about 3D 2015-01-28 09:40:20 +08:00
samuele3hu d74fb0e8b5 Update LayoutComponent Test case of UIEditTest 2015-01-22 10:21:38 +08:00
samuele3hu 3dd590cf9d Update bindings-generator submodule 2015-01-21 17:18:54 +08:00
minggo 08d392dd5f Merge pull request #10132 from samuele3hu/v3_4_issue9537 
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
 2015-01-21 13:39:29 +08:00
samuele3hu 205ead5b63 Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h 2015-01-21 11:48:34 +08:00
minggo abc6511ceb Merge pull request #10125 from samuele3hu/v3_4_issue9537 
issue #10107: Binding AnimationInfo to lua
 2015-01-21 11:02:11 +08:00
samuele3hu a3fbe04c10 issue #10107: Update the bindings-generator submodule 2015-01-21 10:07:21 +08:00
samuele3hu 666af29681 issue #10107: Binding AnimationInfo to lua 2015-01-21 10:06:48 +08:00
yusheng.lu 7fde1d0e0d When reading csd/csb and the simulator's resolution is changed, change the root node's size to fit the simulator windows size. It will make sure the layout component feature works. 2015-01-19 18:10:30 +08:00
dualface bc75849ac7 update template/runtime version 2015-01-16 23:22:03 +08:00
dualface 63fba4f86f fix compile win32 2015-01-16 23:19:00 +08:00
zhangbin b1f9fb4b8e Rename the Xcode target of libsimulator. 2015-01-16 14:29:48 +08:00
yinjimmy ccdf723d20 Optimize OutDir and IntDir for libsimulator 2015-01-15 14:39:56 +08:00
yinjimmy f652e1359a 1. Compatible vs2012 for libsimulator 
2. Adjust output directory for simulator
 2015-01-15 11:10:32 +08:00
minggo 825f90564c Merge pull request #9992 from samuele3hu/v3_4_issue9986 
issue #9986:Add lua bindings for Component and related test cases
 2015-01-14 17:05:51 +08:00
samuele3hu 77912270f9 issue #9986:Add lua bindings for Component and related test cases 2015-01-14 16:58:35 +08:00
yinjimmy f2ab171fab Merge branch 'v3' into combine 2015-01-14 16:38:06 +08:00
samuele3hu 951324a230 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820 
Conflicts:
	cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
 2015-01-14 13:58:12 +08:00
samuele3hu 1d5350e648 Update bindings-generator submodule 2015-01-14 13:51:33 +08:00
samuele3hu 1d94ae4302 issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes 2015-01-14 13:51:09 +08:00
yinjimmy 532be9fb20 Fix compile error on windows 2015-01-13 19:22:11 +08:00
yinjimmy dc019defc1 Merge branch 'v3' into combine 2015-01-13 18:32:32 +08:00
zhangbin 9766e9f748 Update the reference of submodule cocos2d-console. 2015-01-13 11:16:54 +08:00
yinjimmy cf331c3abd update lua-template-default 2015-01-12 23:42:37 +08:00
yinjimmy 43c4f563d8 enable debug for iOS / Android platform 2015-01-12 22:59:46 +08:00
yinjimmy e700d47dbd Fix compile error on Windows 2015-01-12 20:55:36 +08:00
yinjimmy 0978a88b7f Merge branch 'v3' into combine 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
	tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
 2015-01-12 17:54:58 +08:00
yinjimmy 53cc07a2f6 Add setEventTrackingEnable for event tracking 2015-01-12 15:18:30 +08:00
yinjimmy dea3cf9863 move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
zhangbin 489dc2da16 Update the reference of submodule cocos2d-console. 2015-01-12 10:27:14 +08:00
yinjimmy e309dd69b1 add missing files 2015-01-09 11:33:24 +08:00
yinjimmy d2a3a6a8c0 merge lua-template-default with lua-template-runtime 2015-01-09 04:08:41 +08:00
yinjimmy 650b398419 move files 2015-01-08 21:12:44 +08:00
yinjimmy 82f37fcf72 add libsimulator 2015-01-08 14:10:28 +08:00
yinjimmy dee536def2 support win32 2015-01-08 13:36:59 +08:00
yinjimmy 197ab05a99 cleanup 2015-01-08 08:56:31 +08:00
yinjimmy f1f4e5f3c2 support android 2015-01-07 22:19:46 +08:00
yinjimmy 4fee8a5926 support iOS 2015-01-07 22:18:27 +08:00
yinjimmy 9122e15f2c move simulator 2015-01-07 17:50:15 +08:00
zhangbin d80830c264 Update the reference of submodule cocos2d-console. 2015-01-07 17:48:10 +08:00
minggo fbf565fd59 Merge pull request #9798 from samuele3hu/v3_4_packagesize 
issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
 2015-01-07 11:14:22 +08:00
zhangbin 1837b083f7 Update the reference of submodule cocos2d-console. 2015-01-06 18:13:48 +08:00
samuele3hu 58d946b578 issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit 2015-01-05 17:10:25 +08:00
zhangbin 6adedee781 Update the reference of submodule cocos2d-console. 2014-12-31 14:55:14 +08:00
zhangbin 98e24b1cdc Update the reference of submodule cocos2d-console. 2014-12-30 16:28:23 +08:00
minggo 3c1978fcc3 Merge pull request #9611 from super626/quaternion 
Rotation With Quaternion
 2014-12-30 10:09:08 +08:00
yangxiao de7b70f63e skip Node::set/getRotationQuat 2014-12-25 14:55:43 +08:00
minggo 6487cebead [ci skip]Don't notify because we don't use travis now. 2014-12-25 14:28:27 +08: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
andyque 78e3f92d5c add generate_docs.sh to tools 2014-12-24 16:40:14 +08:00
kaile.yin 9ef5d8213e update submodule 2014-12-22 14:07:00 +08:00
zhangbin f7a6472748 Update the reference of submodule cocos2d-console. 2014-12-16 17:19:06 +08:00
kaile.yin cb509aa69f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-09 13:33:39 +08:00
zhangbin 72f88a9790 Update the reference of submodule cocos2d-console. 2014-12-08 16:43:44 +08:00
kaile.yin 17bd5bf31e update submodule 2014-12-05 20:27:10 +08:00
kaile.yin 1db2bf89e0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-05 14:42:25 +08:00
minggo c217040f61 Merge pull request #9326 from samuele3hu/v3_fi_bindings 
Add support to clang3.4 because of using the ndk-r10c and update bindings-generator submodule
 2014-12-04 15:14:02 +08:00
zhangbin 79a7ca6516 Update the reference of submodule cocos2d-console. 2014-12-03 16:40:42 +08: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
zhangbin 16df08679c Update the reference of submodule cocos2d-console. 2014-12-03 11:54:59 +08:00
samuele3hu ef16a460e6 Update bindings-generator submodule 2014-12-01 11:16:40 +08:00
samuele3hu 9900ccba4d Add support to clang3.4 because of using the ndk-r10c 2014-12-01 11:15:56 +08:00
Dhilan007 6603d7183a Update the reference of submodule cocos2d-console 2014-11-28 13:41:52 +08:00
Ricardo Quesada 2362ea372c new console version 2014-11-27 11:34:43 -08:00
Ricardo Quesada ab8838f0c0 New cocos2d-console version 2014-11-27 10:48:19 -08:00
zhangbin fade3dc61f Update the reference of submodule cocos2d-console. 2014-11-27 20:37:18 +08:00
samuele3hu 6cf092b855 Add cocos2dx_csloader.ini to generate the related lua bindings 2014-11-27 10:22:39 +08:00
samuele3hu 222f2cbd51 Decrease the package size of lua_empty_test 2014-11-26 21:54:18 +08:00
samuele3hu aa4277ed72 Update the bindings-generator submodule 2014-11-26 18:20:22 +08:00
youyou 07457a34b5 update lua ini files 2014-11-26 15:56:51 +08:00
andyque b70ddc7a14 add exception guard to db operation 2014-11-26 09:52:27 +08:00
samuele3hu a62fa8de58 Skip binding nodeWithFlatBuffers of CSLoader for lua 2014-11-24 23:36:44 +08:00
Ricardo Quesada 59461439ad Updates console 2014-11-20 17:55:59 -08:00
James Chen d6ee9525bd Merge pull request #9139 from nilium/v3-plugin-libjars-unignore 
Unignore libs dir and fix Travis script to descend into included directories. (follows #9108)
 2014-11-21 09:35:01 +08:00
Ricardo Quesada 04510c39fa Uses new version of cocos2d-console 2014-11-19 12:25:50 -08:00
zhangbin 5aff5640b5 Solve the error when building android for sample projects of engine. 
1. Update the project config.
2. Update the submodule cocos2d-console.
 2014-11-18 18:39:53 +08:00
Noel Cower 41027463c9 Descend into included directories to check for file inclusion. 
Only applies to directories that are marked as unignored, since the
travis script has the odd problem of not descending into those
directories and, as a result, not recording the files in them.

I'm assuming the failure to descend into included directories is
unintended.
 2014-11-17 08:45:30 -08:00
Noel Cower 590975d08d Also un-ignore libs dir under plugins. 
The configure script isn't smart enough to check if there are
un-ignored files in a directory, so this fixes that.
 2014-11-17 08:26:23 -08:00
zhangbin 365e09e5db Merge branch 'v3' into support-wp8 2014-11-17 16:01:12 +08:00
zhangbin 534570075b Update the reference of submodule cocos2d-console. 2014-11-17 15:57:49 +08:00
Noel Cower fbdf0201c6 Permit plugin-x plugins to ship third-party libraries. 
Ignoring the libs directory's .jar files is strange. I'm not sure
whoever put the total block over libs/ knew that this is the standard
Android library directory and not just for NDK-compiled assets.

More granular ignores over libs/ contents would be better in the
future, but this fixes the odd sdk/ directory hack plugins currently
use and lets the Android build system auto-link libraries that're
shipped with plugins instead of forcing Cocos developers to manually
sift through a plugin's Android dependencies and include them by hand.
 2014-11-13 09:20:09 -08:00
yangxiao 4d74e7f19f skip getMeshArrayByName 2014-10-29 10:38:13 +08:00
samuele3hu 042969ce35 Remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini 2014-10-20 16:14:24 +08:00
minggo 8218804c52 Merge pull request #8820 from Dhilan007/v3-audioengine-lua 
[LUA]Add New AudioEngine on window
 2014-10-18 15:11:29 +08:00
samuele3hu 3348f8300e Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case 2014-10-18 00:13:22 +08:00
Dhilan007 81a8e80496 [LUA]Add New AudioEngine on window 2014-10-17 17:53:33 +08:00
samuele3hu 936510411b Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache 2014-10-17 15:04:16 +08:00
samuele3hu 4593b55e1a Update bindings-generator submodule 2014-10-17 14:32:24 +08:00
samuele3hu dd2ad66e41 Update bindings-generator submodule 2014-10-17 14:23:58 +08:00
samuele3hu 7198ae509c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 20:35:43 +08:00
samuele3hu 079df20541 Update lua bindings for Spine and related test case 2014-10-16 20:23:58 +08:00
Huabing.Xu 644aa19b2d Merge branch 'v3' into v3_updateSpine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:48:16 +08:00
samuele3hu 8b5f6ae52a Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:04:09 +08:00
samuele3hu b4c91f0712 Update the related cocosstudio lua test cases 2014-10-16 15:51:01 +08:00
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
Huabing.Xu c12f88d63c lua compiles ok－need to make it works later 2014-10-15 17:33:58 +08:00
samuele3hu a0c8ffb943 Modify Xcode project’s configure 2014-10-15 14:32:11 +08: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
minggo 0787124710 Merge pull request #8697 from andyque/fixJenkinsSql 
add back
 2014-10-15 01:53:34 +08:00
andyque 49b974ae42 add back 2014-10-15 01:45:44 +08:00
minggo 73ea855a79 Merge pull request #8696 from andyque/fixJenkinsSql 
fix sql syntax error
 2014-10-15 01:45:02 +08:00
andyque 05c204622e add backslash 2014-10-15 01:37:13 +08:00
andyque bd37d62026 fix sql syntax error 2014-10-15 01:04:00 +08:00
samuele3hu 4a67963420 Update CSLoader lua-bindings and adjust project config 2014-10-14 23:37:00 +08:00
minggo 19d408748c Merge pull request #8687 from andyque/fixJenkinSqlTableName 
fix jenkins sql table name
 2014-10-14 20:09:30 +08:00
andyque 9e538fce48 fix jenkins sql table name 2014-10-14 17:31:53 +08:00
zhangbin 131c60fd20 Update the reference of submodule cocos2d-console. 2014-10-14 16:29:49 +08:00
andyque 8a6b78c510 fix lua bindings 2014-10-14 11:24:45 +08:00
pipu b732ce378e Merge branch 'v3_pipu_protocol_buffers' into merge_test 
Conflicts:
	cocos/ui/UIScale9Sprite.cpp
 2014-10-11 11:08:46 +08:00
minggo d5658a69d5 Merge pull request #8621 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-10-10 16:31:01 +08:00
zhangbin 72ebd715b3 Update the reference of submodule cocos2d-console. 2014-10-10 16:28:03 +08:00
pipu d699b5809b Modifying libprotocolbuf.a as protocolbuffer.a 2014-10-10 12:52:42 +08:00
samuele3hu f97a7ae52d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-10-10 09:52:29 +08:00
samuele3hu 115d81574c Add CameraTest、OBBTest and related lua bindings 2014-10-10 09:49:25 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
zhangbin bce62aef82 Update the reference of submodule cocos2d-console. 2014-10-08 15:53:01 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
samuele3hu 6ea43a60b0 Update cocos2dx.ini to skip Node::setAdditionalTransform 2014-09-29 10:19:32 +08:00
samuele3hu f00187d3bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-09-29 09:48:35 +08:00
samuele3hu 99e1c6640e Add BillBoardTest and update related bindings files 2014-09-29 09:43:22 +08:00
samuele3hu 6b2acf88fc Modify CameraTest and update related lua-bindings files 2014-09-28 16:47:06 +08:00
samuele3hu e50eaf684f Add CameraTest and update related lua-bindings files 2014-09-28 14:31:58 +08:00
yangxiao 75e5ca30ee merge cocos 2014-09-28 09:55:31 +08:00
samuele3hu 2ac96ed06e Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement 2014-09-26 16:39:54 +08:00
samuele3hu 691074eb7c Add Camra3DTest and update sprite3DTest 2014-09-26 16:00:57 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
yangxiao d69b6558c4 lua 2014-09-26 15:07:23 +08:00
Hong Liang 1c71234921 export lua function "cc.Device::getDPI()" 2014-09-26 11:52:52 +08:00
samuele3hu 2cc48d1f81 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 10:40:31 +08:00
andyque a158b79fb6 add more prompt to debug 2014-09-24 12:57:47 +08:00
andyque d066d02be5 add downloading prompt 2014-09-24 12:53:30 +08:00
andyque f8a05c9e1e recheck download.py 2014-09-24 12:42:53 +08:00
andyque 0267712531 uncomment 3rd part bins check 2014-09-23 10:55:34 +08:00
samuele3hu f0608a6d70 Update lua bindings for Mesh and add a Sprite3DHitTest 2014-09-22 15:29:38 +08:00
zhangbin 3b007e0845 Update the reference of submodule cocos2d-console. 2014-09-19 17:03:34 +08:00
zhangbin f73d015343 Update the reference of submodule cocos2d-console. 2014-09-17 18:03:49 +08:00
Dhilan007 9942206c53 move AudioEngine in cocos2d:experimental namespace 2014-09-16 10:22:25 +08:00
samuele3hu c56c0dfd4f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test 2014-09-15 18:04:08 +08:00
samuele3hu 225c3db005 Update cocos2dx_3d.ini 2014-09-15 17:59:57 +08:00
minggo 7bb391ce55 Merge pull request #8033 from Dhilan007/v3-audio903 
Lua bindings of AudioEngine.
 2014-09-15 13:43:27 +08:00
Dhilan007 56aa9c04ef fix lua bindings 2014-09-15 10:07:14 +08:00
minggo 788f3c5c38 Merge pull request #8025 from andyque/fixEditBoxLuaBinding 
fix Editbox lua binding
 2014-09-15 09:36:36 +08:00
Dhilan007 cf2a60898f Lua bindings of AudioEngine. 2014-09-14 22:54:04 +08:00
andyque 02d2282b83 add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox 2014-09-12 17:07:06 +08:00
minggo 55783b66c2 Merge pull request #8012 from huangshiwu/v3_drawnode_prbk 
V3 drawnode prbk
 2014-09-12 15:17:49 +08:00
huangshiwu d9634057ab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk 2014-09-11 16:41:54 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
huangshiwu fb1d47900c Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
minggo a5855baac4 Merge pull request #7976 from samuele3hu/v3_check_mat 
Added Math SSE implementation on x86 and update bindings-generator submodule
 2014-09-11 14:47:39 +08:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
samuele3hu 51879a7e39 Update lua bindings ini config files 2014-09-10 14:18:21 +08:00
zhangbin c20caa7c35 Update the reference of submodule cocos2d-console. 2014-09-10 13:59:48 +08:00
samuele3hu daeb51e548 Update cocos2d.ini 2014-09-09 23:02:06 +08:00
samuele3hu 3a433b2cd6 Update bindings-generator submodule 2014-09-09 16:26:06 +08:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
samuele3hu 8c2ab3a4e7 Add manual lua bindings for GLView::getAllTouches 2014-09-04 22:12:59 +08:00
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
yangxiao d114e11a0b android, linux and lua 2014-09-04 16:45:42 +08:00
minggo 99f3b371ed Merge pull request #7744 from lite3/customguireader 
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
 2014-09-04 10:53:00 +08:00
andyque 2deeee2109 remove extension luabindings 2014-09-02 01:11:50 -07:00
lite3 74d8bf6f27 fix 2014-09-02 10:51:17 +08:00
minggo 88a80495df Merge pull request #7923 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-09-02 09:41:41 +08:00
zhangbin 3e1053aa2a Update the reference of submodule cocos2d-console. 2014-09-02 09:31:23 +08:00
samuele3hu b58ccc5961 Update bindings-generators submodule 2014-09-01 14:08:02 +08:00
lite3 1846482527 skip GUIReader::registerTypeAndCallBack for lua bindings 2014-08-30 00:46:38 +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
minggo 0701fe1dfb Merge pull request #7853 from super626/v3 
Better reskin model support
 2014-08-22 19:18:47 +08:00
yangxiao 70661b0ff4 lua bind 2014-08-22 14:25:00 +08:00
andyque 13003fe0a6 add deprecated options for ui, add Scale9Sprite bindings 2014-08-22 11:56:13 +08:00
zhangbin 97a4258cd6 Update the reference of submodule cocos2d-console. 2014-08-21 14:10:36 +08:00
zhangbin 8034b5429e Update the reference of submodule cocos2d-console. 2014-08-20 13:45:01 +08:00
zhangbin 8f30a7eeff Update the reference of submodule cocos2d-console. 2014-08-20 11:41:58 +08:00
zhangbin dab6e5fb70 Update the reference of submodule cocos2d-console. 2014-08-19 15:21:43 +08:00
samuele3hu e3149ce41a Split lua bindings for 3D from cocos2d 2014-08-18 15:00:40 +08:00
yangxiao 2786e63824 Merge branch 'newcode' into obb 2014-08-14 18:58:46 +08:00
yangxiao ab783d2702 merge cocos2d 2014-08-14 17:12:39 +08:00
zhangbin 77c7ed9896 Update the reference of submodule cocos2d-console. 2014-08-14 15:13:43 +08:00
zhangbin c8ad850d68 Update the reference of submodule cocos2d-console. 2014-08-13 10:06:22 +08:00
zhangbin 88382994b9 Modify the gen-prebuilt tools for the lua-bindings modules. 2014-08-12 09:37:51 +08:00
zhangbin e493c0b3c8 Merge branch 'v3' into gen-prebuilt-script 2014-08-11 15:09:06 +08:00
yangxiao fd314261b7 Merge branch 'newcode' into obb 2014-08-11 13:21:44 +08:00
yangxiao 754a78bd26 can not export aabb obb ray 2014-08-09 00:03:11 +08:00
heliclei 4fd2d2082a [ci skip][jenkins]Add script to track android built libs size 2014-08-08 17:28:44 +08:00
yangxiao c71df09072 not export getCameras 2014-08-08 16:30:17 +08:00
yangxiao ceb6549ec8 merge cocos2d 2014-08-08 16:25:52 +08:00
minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge 
Camera and Camera test
 2014-08-08 15:56:38 +08:00
yangxiao1 61eaa082a2 fix windows 2014-08-08 15:33:30 +08:00
zhangbin c897fa4c50 Modify the gen-prebuilt tools for the lua-bindings modules. 2014-08-08 15:21:24 +08:00
yangxiao 97edd303b5 remove DrawNode3D 2014-08-08 15:06:45 +08:00
yangxiao 1eeb4fa105 not export getCameras 2014-08-08 13:31:05 +08:00
zhangbin 5e85990f0e Merge branch 'v3' into gen-prebuilt-script 2014-08-08 11:45:26 +08:00
minggo ace0e3d989 Merge pull request #7709 from darkdukey/fixJenkins 
[ci skip]Fix Jenins pull request build script
 2014-08-08 09:43:07 +08:00
Nite Luo 5b626822e6 Fix Jenins pull request build script 2014-08-07 11:22:41 -07:00
yangxiao 9471b572f7 add to cocos2d.h 2014-08-08 00:05:02 +08:00
heliclei 70841cf240 [jenkins][ci skip]fix ci skip mal-function 2014-08-07 18:24:11 +08:00
heliclei 3276c10b31 [jenkins]Tracking lib size for pull request build 2014-08-07 18:03:41 +08:00
heliclei b19dacd400 [jenkins]Tracking lib size for pull request build 2014-08-07 17:50:56 +08:00
yangxiao 579ae882e3 add to cocos2d.h 2014-08-07 15:33:23 +08:00
minggo 9eff58b0a5 Merge pull request #7690 from heliclei/jenkins-job-trigger 
use github access token to retrive commits
 2014-08-07 09:54:48 +08:00
minggo 2cab8657b2 Merge pull request #7689 from heliclei/ci-dailybuild 
[ci skip][jenkins]Avoid connect to database repeatly
 2014-08-07 09:54:22 +08:00
heliclei a04d3e1b2b [ci skip][jenkins]Avoid connect to database repeatly 2014-08-06 18:18:59 +08:00
minggo d5db4c2b84 Merge pull request #7687 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-06 17:50:22 +08:00
zhangbin 1ced935ea2 Update the reference of submodule cocos2d-console. 2014-08-06 17:44:00 +08:00
minggo 7a833d66d1 Merge pull request #7676 from samuele3hu/v3_module 
Split luabindings into serval modules and adjust project settings of test cases
 2014-08-06 17:09:12 +08:00
minggo 7b3e1b7a73 rename file name 2014-08-06 15:01:18 +08:00
heliclei a06873bff7 [ci skip][jenkins]add script to check pull request status, if not set, rebuild it automatically 2014-08-06 10:29:26 +08:00
samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
	tools/tolua/cocos2dx.ini
 2014-08-06 00:37:19 +08:00
Wu-Hao ac8e5d3d57 Create missing tools?.txt 2014-08-05 18:08:50 +08:00
heliclei 5bd0e14b17 refine code 2014-08-05 18:01:09 +08:00
heliclei da3e7d80db [jenkins][ci skip]use github access token to retrive commits 2014-08-05 16:22:01 +08:00
yangxiao 11a13ce9e2 Merge branch 'newcode' into v3 2014-08-04 15:41:21 +08:00
minggo 60df3ddf31 Merge pull request #7636 from samuele3hu/v3_console 
Update cocos2d-console submodule
 2014-08-04 15:38:19 +08:00
zhangbin c0b1ce9ce6 Store the version of engine into the prebuilt engine. 2014-08-04 14:34:24 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
samuele3hu 6f4cafcc1b Add module register functions and adjust iOS and Mac test cases 2014-08-04 09:39:42 +08:00
zhangbin f53473d7ba Consider the lua-bindings when generating prebuilt engine. 2014-08-01 16:30:45 +08:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
samuele3hu 6bb21c0f4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	tools/tolua/cocos2dx.ini
 2014-07-31 17:52:22 +08:00