CocosRobot
|
64b9c2b51f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-24 06:07:38 +00:00 |
CocosRobot
|
7bb25d8c66
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-21 04:24:34 +00:00 |
CocosRobot
|
7839a23c62
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-21 03:53:16 +00:00 |
CocosRobot
|
217c698ef4
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-20 09:49:05 +00:00 |
CocosRobot
|
e532dcfd13
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-14 03:27:08 +00:00 |
CocosRobot
|
2a3ac56df0
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-13 07:09:49 +00:00 |
CocosRobot
|
6c6a792295
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-12 05:59:36 +00:00 |
CocosRobot
|
a26fdd0ff3
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-09 02:27:11 +00:00 |
CocosRobot
|
a0b0c020f8
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-06 01:38:44 +00: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 |
CocosRobot
|
08a44e818b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-31 01:30:53 +00:00 |
CocosRobot
|
9b969598bf
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-30 16:23:47 +00:00 |
CocosRobot
|
e75f15ebb1
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-30 10:43:43 +00:00 |
CocosRobot
|
12523e2f4e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-30 03:31:32 +00:00 |
CocosRobot
|
07686aa803
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-28 10:32:41 +00:00 |
CocosRobot
|
6e7c3c636f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-28 07:11:50 +00:00 |
CocosRobot
|
f751234b7f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-27 05:38:54 +00:00 |
CocosRobot
|
42c42ccd7e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-26 06:27:09 +00:00 |
CocosRobot
|
3c1a3677ff
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-25 05:34:07 +00:00 |
CocosRobot
|
cbf830196b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-23 10:12:40 +00:00 |
CocosRobot
|
7241f72f47
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-23 07:35:52 +00:00 |
CocosRobot
|
ac9d65f3f7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-22 08:19:17 +00:00 |
pandamicro
|
436564f922
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
docs/RELEASE_NOTES.md
web
|
2015-07-15 14:39:40 +08:00 |
CocosRobot
|
3ba4d7230e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-14 10:15:18 +00:00 |
Neo Kim
|
86cbd59bfd
|
Add UIScrollViewBar.cpp into CMake and Windows project configuration.
|
2015-07-04 09:56:53 +09:00 |
CocosRobot
|
50703b262c
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-03 10:30:38 +00:00 |
pandamicro
|
1b22438792
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
cocos/ui/UICheckBox.cpp
|
2015-07-03 10:23:49 +08:00 |
CocosRobot
|
c3693b8948
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-01 09:22:38 +00:00 |
Neo Kim
|
a64e50688e
|
Add the new files into CMake and Windows project configurations.
|
2015-07-01 12:21:42 +09:00 |
CocosRobot
|
48f03adc3f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-26 04:56:58 +00:00 |
CocosRobot
|
7486c74209
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-19 09:24:40 +00:00 |
CocosRobot
|
b64c2c13d0
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-19 01:27:24 +00:00 |
CocosRobot
|
c7ad47908e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-17 07:11:15 +00:00 |
CocosRobot
|
734382026a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-17 06:42:39 +00:00 |
CocosRobot
|
4ae7489e28
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-17 03:39:08 +00:00 |
CocosRobot
|
0b73b53d3a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-16 20:26:30 +00:00 |
CocosRobot
|
22ce7e6ee7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-16 02:05:57 +00:00 |
CocosRobot
|
f7ec4b2db5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-15 05:41:07 +00:00 |
CocosRobot
|
c58927e7fc
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-11 06:12:41 +00:00 |
CocosRobot
|
369b7d9926
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-10 01:49:13 +00:00 |
CocosRobot
|
297945cca5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-05 02:13:10 +00:00 |
CocosRobot
|
1b8ff0e595
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-04 14:05:38 +00:00 |
CocosRobot
|
c722dd76d6
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-04 10:49:25 +00:00 |
CocosRobot
|
7607b81bfd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-04 01:25:04 +00:00 |
CocosRobot
|
f306edee8b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-02 09:40:03 +00:00 |
CocosRobot
|
a15766adab
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-02 05:47:44 +00:00 |
CocosRobot
|
bae9082fc7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-02 02:03:05 +00:00 |
CocosRobot
|
27ed47cdfd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-29 07:34:09 +00:00 |
子龙山人
|
039c0036be
|
Merge pull request #12072 from iris-wy/v3
Add enhance service API
|
2015-05-29 15:32:06 +08:00 |
CocosRobot
|
635d5a43d2
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-29 06:04:54 +00:00 |