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
|
c1bc03b342
|
Gen bindings for v3.7.1
|
2015-07-25 13:28:02 +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
|
e017511c65
|
disable travis notification
|
2015-02-12 18:39:42 +08:00 |
|
minggo
|
6487cebead
|
[ci skip]Don't notify because we don't use travis now.
|
2014-12-25 14:28:27 +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
|
36c4a407ee
|
Adds travis_mac.yml
|
2014-05-12 21:54:24 +08:00 |
|
James Chen
|
e4837e7f94
|
issue #4116: Removes script-bindings codes.
|
2014-02-26 21:34:06 +08:00 |
|
James Chen
|
19ede723f2
|
Adding iOS travis support, not finished.
|
2013-05-21 16:13:47 +08:00 |