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
iris-wy
0007799794
modify Enhance API
...
modify Enhance API
2015-05-28 10:47:12 +08:00
CocosRobot
509d5f5718
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-27 14:49:12 +00:00
CocosRobot
08c70e9478
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-27 08:02:47 +00:00
CocosRobot
e6a7d6f150
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-26 01:37:23 +00:00
CocosRobot
eea661a5c2
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-25 08:31:54 +00:00
CocosRobot
88c4ed664b
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-25 07:16:13 +00:00
CocosRobot
7879b25cdc
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-22 23:57:26 +00:00
CocosRobot
b9ffada9cc
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-22 09:19:24 +00:00
CocosRobot
3c96bbbd80
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-22 06:47:26 +00:00
CocosRobot
ff6f505a61
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-22 01:57:03 +00:00
CocosRobot
7e392635ce
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-21 20:01:07 +00:00
CocosRobot
5005c77d45
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-21 01:45:44 +00:00
CocosRobot
a5a6515332
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-20 06:44:01 +00:00
CocosRobot
181f225eb7
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-18 08:19:22 +00:00
CocosRobot
fd55bb8e68
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-18 05:35:55 +00:00
iris-wy
68ec7c8ca1
Add enhance service API
...
Add enhance service API
2015-05-15 14:29:22 +08:00
CocosRobot
4240632c68
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-14 10:32:18 +00:00
CocosRobot
5bf26f9f10
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-13 04:07:11 +00:00
CocosRobot
90ce442616
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-13 01:37:33 +00:00
CocosRobot
d170a79919
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-12 05:49:49 +00:00
CocosRobot
507e94b77f
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-12 05:15:34 +00:00
CocosRobot
299e355152
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-08 09:02:36 +00:00
CocosRobot
a3b8f6bcb1
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-08 06:13:28 +00:00
minggo
bf93289718
Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012
...
Remove vs2012 support in v3
2015-05-08 14:11:13 +08:00
CocosRobot
745fe13ecb
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-08 02:46:01 +00: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
CocosRobot
c570f60606
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-06 01:43:46 +00:00
CocosRobot
91b608697a
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-06 00:59:51 +00: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
CocosRobot
b3042d771d
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-05 03:28:05 +00:00
CocosRobot
038ac5ab2a
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-30 09:23:48 +00:00
CocosRobot
1759fa96fe
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-30 06:50:33 +00:00
minggo
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
CocosRobot
8507d7e5a4
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-30 01:44:07 +00:00
CocosRobot
bea6fe3ce5
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-28 13:35:07 +00:00
CocosRobot
ef82d9fa3a
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-27 07:46:12 +00:00
CocosRobot
dbdb29464b
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-24 03:13:32 +00:00
zhangbin
61cf0ad28b
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
2015-04-23 15:46:19 +08:00
CocosRobot
941c8d9f14
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-23 02:27:24 +00:00
minggo
8ab03a62d1
Merge pull request #11543 from yinjimmy/runtime
...
Add lua runtime template
2015-04-23 10:25:00 +08:00
CocosRobot
d7e32f270c
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-22 02:53:00 +00:00
CocosRobot
e218110107
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-21 09:02:58 +00:00
CocosRobot
ebd76defe6
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-20 07:53:34 +00:00
CocosRobot
9b09fb1f6a
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-20 05:37:44 +00:00
CocosRobot
fb9cdc28e3
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-20 02:38:23 +00:00
yinjimmy
1e32322350
revert runtime files
2015-04-17 18:26:47 +08:00
zhangbin
b8b49a387e
Update the js template.
2015-04-17 14:59:12 +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
CocosRobot
870eb7519b
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-16 06:34:18 +00:00
zhangbin
2c7bd7ec35
Update cocos2dx files.
2015-04-15 15:12:04 +08:00
CocosRobot
b7065407fc
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-14 09:52:18 +00:00
CocosRobot
a8079d593a
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-13 10:15:05 +00:00
CocosRobot
3b0573392d
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-08 13:30:05 +00:00
CocosRobot
deb44cc0e8
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-08 06:36:26 +00:00
CocosRobot
567af9d0d8
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-08 03:48:57 +00:00
CocosRobot
cfb11f2acf
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-08 01:56:07 +00:00
CocosRobot
738d03d2db
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-07 01:34:23 +00:00
CocosRobot
f65f20e270
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-01 02:57:37 +00:00
CocosRobot
6410eca425
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-31 05:53:58 +00:00
CocosRobot
43c030205b
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-27 03:16:06 +00:00
CocosRobot
342edc5904
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-20 04:49:27 +00:00
CocosRobot
182d4958f8
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-19 12:42:16 +00:00
CocosRobot
2b14d11bb9
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-17 06:18:34 +00:00
CocosRobot
5203d1e7be
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-13 07:20:18 +00:00
CocosRobot
54ac9ef67f
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-11 07:32:59 +00:00
Mazyad Alabduljaleel
983ffd96c7
Now, mac uses ObjC HTTP client
2015-03-10 14:48:57 +04:00
CocosRobot
3f7e2eb1ff
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 09:45:58 +00:00
CocosRobot
f46817eac7
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 02:59:36 +00:00
CocosRobot
d7d85625fa
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 02:23:45 +00:00
CocosRobot
1498c18d1b
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-06 08:12:23 +00:00
CocosRobot
721804a30e
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-04 08:13:38 +00:00
CocosRobot
a5a1bd3994
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-27 10:12:08 +00:00
minggo
503c46a9e8
Merge pull request #10286 from flamefox/v3_fix_dos2unix
...
fix dos2unix not in run path, on new lua project
2015-02-27 16:35:02 +08:00
CocosRobot
9cecd68064
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-26 04:26:17 +00:00
Ray
bfb5c1ca23
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-02-26 10:44:20 +08:00
CocosRobot
0072400fc9
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-26 01:40:45 +00:00
CocosRobot
92806f7919
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-24 01:27:05 +00:00
CocosRobot
2947fd95d6
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-20 01:14:18 +00:00
CocosRobot
83fed82923
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-15 12:00:05 +00:00
CocosRobot
33be077835
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-15 11:50:10 +00:00
flamefox
deb5fd46ff
add dos2unix.exe to templates\cocos2dx_files.json
2015-01-30 11:14:51 +08:00
CocosRobot
ebf6f2728f
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-29 02:57:47 +00:00
CocosRobot
c1e586ebab
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-21 08:07:36 +00:00
CocosRobot
8a78a7e8fd
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-21 05:41:12 +00:00
CocosRobot
e221424a64
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-21 03:06:58 +00:00
CocosRobot
ef9fabbc51
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-21 02:35:37 +00:00
CocosRobot
945be7529d
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-19 01:34:14 +00:00
CocosRobot
f9192835c9
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-16 16:13:41 +00:00
CocosRobot
b2db3c13dd
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 15:39:55 +00:00
CocosRobot
b703c7b169
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 09:30:59 +00:00
CocosRobot
88029d33bd
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 08:45:40 +00:00
CocosRobot
29d85ca8c2
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 08:12:14 +00:00
CocosRobot
5faeb6919a
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-14 03:39:38 +00:00
CocosRobot
27da58e4b5
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-12 12:13:39 +00:00
CocosRobot
f6de697bde
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-08 06:05:46 +00:00
CocosRobot
6a88a51e24
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-07 02:23:16 +00:00
CocosRobot
85ccfb2209
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 07:14:27 +00:00
CocosRobot
ced43a1c2b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 05:50:50 +00:00
CocosRobot
d4c9205320
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 05:01:17 +00:00
CocosRobot
1f8bb3f808
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 04:51:26 +00:00
CocosRobot
a3e15a3d29
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 01:59:46 +00:00
CocosRobot
cb7a63b413
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-30 10:34:54 +00:00
CocosRobot
e7a7ee750f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-29 05:48:30 +00:00
CocosRobot
b385ce58d0
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-29 02:31:59 +00:00
CocosRobot
0a4785d6fc
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-29 01:45:01 +00:00
CocosRobot
a8fedda82c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-26 01:29:15 +00:00
CocosRobot
542b2b6bd2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-25 06:10:51 +00: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
CocosRobot
95df9ba145
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-24 09:37:39 +00:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
CocosRobot
94d96b5ad1
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-23 04:01:55 +00:00
CocosRobot
7170e85a7a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-19 22:37:52 +00:00
kaile.yin
1db2bf89e0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-05 14:42:25 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
CocosRobot
b7d553f5db
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-04 07:13:03 +00:00
CocosRobot
918372556b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-04 02:08:20 +00: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
CocosRobot
ff8d2624eb
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-28 08:54:16 +00:00
CocosRobot
38c3bc7b4f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-27 19:37:40 +00:00
CocosRobot
0b286aa412
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-25 14:48:14 +00:00
CocosRobot
8c20e7a5c6
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-25 01:35:25 +00:00
CocosRobot
451cbe52d2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-24 09:54:39 +00:00
youyou
d04945d77c
update templates
2014-11-24 11:08:37 +08:00
CocosRobot
2398712b9d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-21 01:57:39 +00:00
CocosRobot
18b0a6cacc
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-16 17:32:13 +00:00
CocosRobot
c227ba9e40
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-14 21:10:45 +00:00
Ricardo Quesada
2e3b2d9f28
Merge pull request #9080 from vovkasm/cmake-refactoring
...
Cmake refactorings and fixes
2014-11-13 15:42:47 -08:00
CocosRobot
4ae4932e8a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-11 22:17:01 +00:00
Vladimir Timofeev
77ab866090
Move BuildHelpers.CMakeLists.txt to Modules/CocosBuildHelpers.cmake, this name is more standard for cmake include files, and in future this file can be installed to use by external applications.
2014-11-11 10:30:48 +03:00
CocosRobot
80ce1537e7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-11-07 02:34:46 +00:00
CocosRobot
29264db249
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-25 07:47:09 +00:00
CocosRobot
2355be4e92
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-20 10:12:41 +00:00
CocosRobot
aa7478d375
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-19 12:09:52 +00:00
CocosRobot
592c39fd96
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-17 05:47:13 +00:00
CocosRobot
39d3cb20b5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 13:12:34 +00:00
CocosRobot
6f79cbd64c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 10:16:52 +00:00
CocosRobot
f50989fa79
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 09:51:29 +00:00
CocosRobot
ec067b15ac
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 09:25:47 +00:00
CocosRobot
a6f0c1322c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 06:02:13 +00:00
CocosRobot
ac3753092b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 03:56:42 +00:00
minggo
8461165fad
Merge pull request #8722 from samuele3hu/v3_assetsmanager
...
Add AssetsmanagerEx and adjust related project configure and files
2014-10-16 11:55:24 +08:00
samuele3hu
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-16 10:59:58 +08:00
CocosRobot
cbdbee1876
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-16 01:35:18 +00:00
minggo
16ad1977b0
Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode
...
Add clipping rectangle node
2014-10-15 15:09:29 +08:00
samuele3hu
6c79ce50d2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
tests/lua-tests/src/mainMenu.lua
2014-10-15 15:07:30 +08:00
CocosRobot
65aefcd5a3
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-15 05:56:51 +00: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
SunLightJuly
f2286eaf94
added ClippingRectangleNode
2014-10-15 13:38:14 +08:00
CocosRobot
da3f7ebe23
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-15 02:37:42 +00:00
CocosRobot
c816ea443d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-14 09:10:38 +00:00
minggo
abd2687cf5
Merge pull request #8683 from dualface/update_lua_template_runtime
...
update lua-template
2014-10-14 17:01:19 +08:00
dualface
cee999ebbb
update lua-template-default, lua-template-runtime, fix same proj problems.
2014-10-14 16:55:38 +08:00
minggo
3274b6f9df
Revert "[AUTO][ci skip]: updating cocos2dx_files.json"
2014-10-14 14:41:45 +08:00
CocosRobot
96954d1188
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-14 06:34:13 +00:00
SunLightJuly
a36dbf5362
ClippingRegionNode --> ClippingRectangleNode
2014-10-11 11:49:01 +08:00
CocosRobot
7cb2cd8608
[AUTO][ci skip]: updating cocos2dx_files.json
2014-10-11 02:16:23 +00:00
dualface
b49d2351ff
update lua-template-default
2014-10-11 02:55:04 +08:00