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

57 Commits

Author SHA1 Message Date
minggo ba82ce2863 add language property (#16500) 2016-09-02 10:51:02 +08:00
minggo 57bf4a923b fix secure (#16497) 2016-09-02 10:32:36 +08:00
minggo 978f9f99de generate binding codes and cocos_file.json (#16496) 2016-09-01 18:54:49 +08:00
minggo db21e5f349 [ci skip]Travis enable pull request (#16494) 
* refactor travis and build pull request

* delete unneeded file
 2016-09-01 16:25:47 +08:00
minggo b569f87d3f Update .travis.yml 2016-08-30 17:18:18 +08:00
minggo a5f8ae1548 compile 3.13 2016-08-02 16:29:16 +08:00
minggo 2df2e71fc9 compile v3 2016-05-30 17:21:12 +08:00
minggo ef7f38b6a9 compile v3.11 2016-04-11 09:36:44 +08:00
XiaoFeng 4ba7083cb9 update auto-binding bot setting 2016-01-20 17:49:34 +08:00
pandamicro f417f2ac2d Auto generate bindings for v3.10 2015-12-15 10:44:18 +08:00
子龙山人 f206f60c41 Update .travis.yml 2015-09-09 10:10:24 +08:00
pandamicro 78ef019561 Made travis run for v3.8 2015-08-18 10:17:44 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 2015-08-02 22:28:27 +08:00
pandamicro a2a32ef58c Release docs for v3.7.1 2015-07-25 15:16:39 +08:00
pandamicro 14aaf2acc3 Gen bindings for v3.7.1 2015-07-25 12:10:01 +08:00
pandamicro 9b11e32252 Gen bindings for v3.7.1 branch 2015-07-22 10:41:04 +08:00
andyque 4704d38c13 add v3 to travis build 2015-07-03 18:27:42 +08:00
samuele3hu b963b63701 Update the branches info for the related travis scripts to v3.7 2015-06-25 17:07:15 +08:00
minggo e234b1ed9a disable travis building 2015-03-24 09:45:03 +08:00
James Chen 4f7b1deb75 remove travis ci notification by email 2014-12-02 15:26:55 +08:00
James Chen 15a850a24f Disable clang build on linux temporarily since we're using "-stdlib=libc++ " which wasn't installed on travis machine. 2014-11-24 15:01:14 +08:00
James Chen bd82c119b6 Updates travis.yml, adds email notification to @Minggo and @James 2014-05-13 21:26:25 +08:00
James Chen 91d684d077 Updates travis script to add mac host support 2014-05-12 21:55:11 +08:00
James Chen 8e9b84517b Update .travis.yml, Travis ci only builds 'v3' branch 2014-04-28 10:20:42 +08:00
James Chen 124b18f53a Re-add CocosRobot send bindings glue codes to cocos2d-x repo. 2014-03-10 18:13:39 +08:00
James Chen dfdb6c4158 [travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change. 2014-03-06 13:54:24 +08:00
James Chen 7e9a120e25 Fix travis build fails. 2014-02-27 16:23:38 +08:00
James Chen e4837e7f94 issue #4116: Removes script-bindings codes. 2014-02-26 21:34:06 +08:00
James Chen a56b7e4f3f closed #4020: cocos_files.json should be auto-generated by CocosRobot. 2014-02-13 11:33:11 +08:00
James Chen 4b4dc16030 Exports CC and CXX for gcc and clang. 2014-01-09 17:48:08 +08:00
James Chen c0195015c3 updates CC and CCX env variables 2014-01-09 17:26:33 +08:00
James Chen f14bbd59c9 Adding clang build for travis ci. 2014-01-09 17:16:09 +08:00
James Chen 6d6cbc98bb Update travis.yml, only build master and develop branch [ci skip] 2013-11-04 13:46:56 +08:00
James Chen 9b887e64a8 Update .travis.yml 2013-07-10 15:34:29 +08:00
Sam Clegg 58c3faf209 Cleanup travis build scripts. 
before-install.sh and run-script.sh now both given an error if
no PLATFORM was not specified correctly.

Environment variables are now set as part of run-script.sh.  This
makes the travis output simpler and makes it possible to run
run-script.sh outside of travis.

javascript binding generation will not exit early if GH_USER
etc are not set.  This allows the travis scripts to be run in
cloned repos which were otherwise erroring out trying to go
the JS bindings commit.

When generating javascript bindgings, don't username and email
with '--global'.  It should be sufficient to set this only for
the binding repo.
 2013-06-24 22:55:15 -07:00
James Chen af93901b60 Disabling travis-ci build for Native Client port since it doesn't supprt std::thread and std::mutex. 2013-06-24 10:22:21 +08:00
Sam Clegg 40766006bd [NaCl] Fix NaCl build which had been disabled. 
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
 2013-06-20 12:56:12 -07:00
James Chen 76188585b8 [emscripten] Updating .travis.yml, export environment variables for emscripten port. 2013-06-19 21:10:34 +09:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 15f5538835 Adding travis-ci build for emscripten port. 2013-06-10 21:57:26 +08:00
James Chen b60faaf19c Disabling native client build in travis-ci. 
Reason: Native client port doesn't support c++ 11 fully, it seems that it doesn't support lambda, please refer to https://github.com/cocos2d/cocos2d-x/blob/develop/samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.cpp#L982
 2013-06-04 10:05:57 +08:00
James Chen 9339802407 Update .travis.yml, not only build master branch. 2013-05-21 18:06:49 +08:00
James Chen 21f435fdd6 [Travis] Adding Real email info for git. [ci skip] 2013-05-21 18:03:17 +08:00
James Chen 9257c4f4e8 Adding GEN_JSB env for Travis-ci to auto generate jsbinding glue codes. 2013-05-21 13:48:53 +08:00
James Chen 09221b8c26 Update .travis.yml 2013-05-21 13:24:27 +08:00
James Chen d98b13b096 Update .travis.yml 2013-05-21 13:15:03 +08:00
James Chen 868dc8fcd5 Update .travis.yml 2013-05-21 13:11:58 +08:00
James Chen 1797735cb1 Updating .travis.yml. 2013-05-21 12:51:56 +08:00
James Chen f86430aff4 Removing old secures. 2013-05-21 12:49:21 +08:00
James Chen 63e4d9720e Update .travis.yml 2013-05-20 23:38:42 +08:00