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
子龙山人
d8810abdd6
Merge pull request #13343 from zilongshanren/fix-template-deprecated-api
...
remove deprecated API in templates
2015-08-13 15:08:14 +08:00
andyque
c3abb48b98
remove deprecated API in templates
2015-08-13 13:42:47 +08:00
子龙山人
a4a1a62886
Merge pull request #13328 from zilongshanren/fix-ios-Appcontroller
...
remove unneeded protocol in AppController.h.
2015-08-13 10:35:00 +08:00
CocosRobot
6c6a792295
[AUTO][ci skip]: updating cocos2dx_files.json
2015-08-12 05:59:36 +00:00
andyque
9a83ed9b28
remove unneeded protocol in AppController.h.
2015-08-12 13:55:36 +08:00
子龙山人
675d5efb39
Merge pull request #13151 from flashjay/patch-2
...
Update AppController.h
2015-08-12 13:43:39 +08: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
zhangbin
9fd88d6587
Optimize the lua & js templates.
...
The changes are used for generating templates of Cocos Framework.
2015-08-05 16:51:33 +08:00
pandamicro
a89a3c0c56
Merge pull request #13184 from pandamicro/v3.7.1
...
[ci skip]Add remote debugger support in JS templates
2015-08-04 11:18:18 +08:00
pandamicro
06bd3b8868
Add remote debugger support in JS templates
2015-08-04 11:16:58 +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
HuaYang Huang
abbf7eabfc
Update AppController.h
2015-08-01 17:49:12 +08:00
WenhaiLin
875d01573a
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-07-31 21:20:42 +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
pandamicro
3fa016a280
Fix win32 project and add winrt support
2015-07-30 23:39:52 +08:00
pandamicro
c0066f9afd
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
2015-07-30 20:25:57 +08: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
pandamicro
f53ba42b3b
Fix test issues and Add audio engine to js templates
2015-07-29 21:22:44 +08:00
子龙山人
96d44e1078
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-29 14:51:17 +08:00
Wenhai Lin
70628c9dec
Fixed link errors on iOS/Mac
2015-07-29 13:59:58 +08: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
zhangbin
4d46a03797
Solve the error : the VS release configuration of lua template cause `cocos run` error.
2015-07-28 14:54:42 +08: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
Vincent Yang
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
CocosRobot
cbf830196b
[AUTO][ci skip]: updating cocos2dx_files.json
2015-07-23 10:12:40 +00:00
pandamicro
f96d26c46a
Merge pull request #12975 from CocosRobot/update_cocosfiles_1437636951
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-07-23 15:39:34 +08:00
pandamicro
bd1f5b4a39
Merge pull request #12911 from natural-law/portrait-support
...
Fixed #12252 : Support new portrait projects from templates.
2015-07-23 15:38:32 +08: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
6029ca3edd
Merge pull request #12949 from yangws/issue_12906
...
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 16:17:14 +08:00
Vincent Yang
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
ZhangMenghe
8689025c5d
Modify background in index of js-template-runtime
2015-07-22 11:44:22 +08:00
ZhangMenghe
b6c566d87e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into setClearColor
2015-07-22 11:40:30 +08:00
ZhangMenghe
94aa382669
Add testCase for setClearColor
2015-07-21 15:18:19 +08:00
Bin Zhang
abd8a563dc
Support new portrait project from js templates.
2015-07-20 09:58:40 +08:00
Bin Zhang
a8b22f6886
Support new portrait project from lua templates.
2015-07-20 09:58:40 +08:00
Bin Zhang
18882f12cb
Support new portrait project from cpp template.
2015-07-20 09:58:40 +08:00
Wenhai Lin
45e0eda81c
Fixed compile error
2015-07-17 11:34:26 +08: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
Bin Zhang
55890f6206
Update the JS templates to keep the directory structure is same with before.
2015-07-14 18:07:17 +08:00
andyque
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
andyque
1ea7926083
fix js template run error on linux.
2015-07-10 10:19:36 +08:00
andyque
451bedbaad
change sign team to none.
2015-07-07 22:02:35 +08:00
andyque
04ade7c16e
remove xcode scheme
2015-07-07 14:57:25 +08:00
andyque
302976b603
add shared scheme to iOS & Mac project.
2015-07-07 14:24:17 +08:00
子龙山人
f28fbdd0c4
Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
...
Add scroll bar feature into ScrollView
2015-07-07 13:56:09 +08:00
Ricardo Quesada
4c88be9520
removes -fno-excpetion and -fexception from cmake
2015-07-06 12:09:50 -07: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
pandamicro
613fde6573
Fix video player and web view in js template
2015-07-02 11:48:13 +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
Bin Zhang
a6a1cbdfbe
Solve the error config of js runtime template.
2015-06-30 16:03:39 +08:00
pandamicro
5b9b130223
Add video player and web view to template
2015-06-29 18:23:01 +08:00
CocosRobot
48f03adc3f
[AUTO][ci skip]: updating cocos2dx_files.json
2015-06-26 04:56:58 +00:00
WenhaiLin
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
Dale Stammen
d438bd6f49
added app name to 150x150 windows tile
2015-06-19 09:23:50 -07:00
CocosRobot
7486c74209
[AUTO][ci skip]: updating cocos2dx_files.json
2015-06-19 09:24:40 +00:00
pandamicro
1bf8292e06
Merge pull request #12442 from natural-law/update-templates
...
Update the VS projects of templates.
2015-06-19 10:38:02 +08:00
CocosRobot
b64c2c13d0
[AUTO][ci skip]: updating cocos2dx_files.json
2015-06-19 01:27:24 +00:00
江龙
61db9ef103
modify cocos2d_specifics , add navmesh head file。 modify template。add navmesh head file and register code
2015-06-18 23:21:53 +08:00
Bin Zhang
a4ecfdb7e2
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 22:00:57 +08:00
Bin Zhang
264a4d104f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into framework
2015-06-17 18:14:33 +08:00
Bin Zhang
01cb135e77
Solve the error in the VS project of templates.
2015-06-17 18:06:09 +08: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
tangziwen
b84531ea04
add librecast to js and lua templates
2015-06-17 13:39:28 +08:00
tangziwen
cc2481403c
fix the sln version
2015-06-17 12:41:18 +08:00
tangziwen
f77f94bf43
add librecast to cpp template
2015-06-17 12:37:22 +08: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
Dale Stammen
eb2bc78970
Merge branch 'v3' into v3-winrt-librecast
2015-06-16 07:13:53 -07:00
Dale Stammen
511fe6a773
added missing lib references
2015-06-15 20:10:38 -07:00
Dale Stammen
74f4d29fa9
added missing librecast
2015-06-15 20:06:54 -07:00
子龙山人
76baa96e97
Merge pull request #12233 from Furkanzmc/cmake_file_windows_fix
...
Fix C++ template CMakeLists.txt file to prevent include related errors on Windows
2015-06-16 10:30:32 +08:00
Dale Stammen
8d8e7d6cb9
Merge branch 'v3' into v3-winrt-librecast
2015-06-15 19:27:40 -07:00
CocosRobot
22ce7e6ee7
[AUTO][ci skip]: updating cocos2dx_files.json
2015-06-16 02:05:57 +00:00
Dale Stammen
0781978788
added librecast. Updated build properties
2015-06-15 18:44:14 -07:00
Dale Stammen
8e4f6afaa1
added missing librecast projects
2015-06-15 14:32:27 -07:00
CocosRobot
f7ec4b2db5
[AUTO][ci skip]: updating cocos2dx_files.json
2015-06-15 05:41:07 +00:00
pandamicro
f9057b3f32
Merge pull request #12284 from pandamicro/v3
...
Fix template android compilation issue on physics3d
2015-06-12 21:10:40 +08:00
pandamicro
f3765a4c5f
Fix physics 3d macro include issue
2015-06-12 15:58:43 +08:00
CocosRobot
c58927e7fc
[AUTO][ci skip]: updating cocos2dx_files.json
2015-06-11 06:12:41 +00:00
pandamicro
70606caa14
Fix template android compilation issue on physics3d
2015-06-10 19:37:52 +08:00
CocosRobot
369b7d9926
[AUTO][ci skip]: updating cocos2dx_files.json
2015-06-10 01:49:13 +00:00
Furkan Üzümcü
6433a69ed1
Update CMakeLists.txt
...
Add WIN32 property to add_executable function to prevent the following error on Windows
`MSVCRTD.lib(crtexe.obj)👎 error: LNK2019: unresolved external symbol _main referenced in function ___tmainCRTStartup`
2015-06-07 20:44:39 +03:00
Furkan Üzümcü
3269df546c
Update CMakeLists.txt
...
Extend the include directories to prevent compilation errors on Windows
2015-06-07 20:34:15 +03:00
Dale Stammen
74a60d18c5
removed old files. Added missing Cocos2dRenderer.h
2015-06-05 06:29:33 -07:00
Dale Stammen
798e10ba9f
updated package GUID
2015-06-05 06:29:02 -07:00
Dale Stammen
47b5085ade
Merge branch 'v3' into v3-winrt-ogg
2015-06-05 05:36:15 -07:00