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

1676 Commits

Author SHA1 Message Date
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
pandamicro 3ee58091df Merge pull request #12201 from samuele3hu/v3_bug_fix 
issue #10257:Fix the error that Draw object display differently on the different platform.
 2015-06-05 10:47:08 +08:00
CocosRobot 297945cca5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-05 02:13:10 +00:00
samuele3hu 230899ae32 issue #10257:Fix the error that Draw object display differently on the different platform. 2015-06-05 09:39:15 +08:00
Dale Stammen 3f3ace05a7 added ogg support for Windows 10 UWP 2015-06-04 14:42:11 -07: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
Dale Stammen af69c5e0e8 fixed pch.h file for cocos2d-js 2015-06-03 09:54:32 -07:00
Dale Stammen e1a5d71ad6 removed incorrect pch.h 2015-06-03 09:52:25 -07:00
Dale Stammen 3219a3c2f4 update cpp-template files 2015-06-03 09:47:17 -07:00
Dale Stammen 6f2c7574bf updated cpp template files for Windows 8.1 Universal App 2015-06-03 09:25:50 -07:00
Dale Stammen f778b02aa0 updated js template files for Windows 8.1 Universal App 2015-06-03 09:25:19 -07: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
子龙山人 0ab6472ee6 Merge pull request #12107 from MSOpenTech/v3-uwp 
V3: Windows 10.0 Universal App (UWP) support
 2015-06-02 10:00:40 +08:00
andyque a6649e24fe fix resource not copy issue on windows 2015-06-01 18:59:27 +08:00
Dale Stammen e0c65c203a Merge branch 'v3' into v3-uwp 2015-05-29 08:09:05 -07: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
Dale Stammen f88ee25091 added Windows 10 UWP cpp template files 2015-05-28 15:27:29 -07:00
Dale Stammen 434cee5a66 added proj.win10 files 2015-05-28 15:26:28 -07: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
minggo 3add3477dd Merge pull request #12013 from natural-law/v3 
Support build & run Android Studio project in console.
 2015-05-26 09:34:42 +08:00
hugo f2a5418d41 add js runtime ignore template 2015-05-25 22:52:36 +08:00
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
CocosRobot eea661a5c2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-25 08:31:54 +00:00
minggo dae2ca14d3 Merge pull request #12005 from CocosRobot/update_cocosfiles_1432538172 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-25 15:20:46 +08:00
minggo 203203a92d Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2 
upgrade rapidjson to 1.0.2
 2015-05-25 15:18:15 +08:00
CocosRobot 88c4ed664b [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-25 07:16:13 +00:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
samuele3hu 0492323ec8 Update the Lua template 2015-05-24 23:14:23 +08:00
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 2015-05-24 22:46:05 +08:00
子龙山人 49c0b44252 Merge pull request #11988 from andyque/add-vs2015-to-simulator 
fix simulator vs2015 support
 2015-05-23 09:48:32 +08:00
CocosRobot 7879b25cdc [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-22 23:57:26 +00:00
hugo 9a9fa7957f [A] add generate libs and binary template 2015-05-22 19:47:16 +08:00
andyque 73902a4063 fix simulator vs2015 support 2015-05-22 17:47:48 +08:00
CocosRobot b9ffada9cc [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-22 09:19:24 +00:00
Bin Zhang 3d0c716ee9 Add script in build.gradle for sign the release apk. 2015-05-22 15:52:41 +08: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
Bin Zhang 94e2e1cb00 Modify the configuration for android studio support in console. 2015-05-21 18:27:30 +08:00
Bin Zhang 41792caa6b Add files & configuration for android studio support in console. 2015-05-21 16:34:03 +08:00
Bin Zhang 78d4089215 Add the project.properties for the ndk-build of proj.android-studio. 2015-05-21 15:43:01 +08:00
Bin Zhang 37dddf9b15 Add execute permission for the gradlew in proj.android-studio. 2015-05-21 15:31:18 +08:00
andyque 03e8f16a8a add vs2015 support 2015-05-21 13:55:01 +08:00
CocosRobot 5005c77d45 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-21 01:45:44 +00:00
Dale Stammen ee8a85fb9b set version to 1.0.0.0 update GUID 2015-05-20 08:10:24 -07:00
Dale Stammen 209e7c62f4 added libbullet to Windows 8.1 Universal App projects 2015-05-20 08:01:01 -07:00
WenhaiLin a569d877ba [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
CocosRobot a5a6515332 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-20 06:44:01 +00:00
minggo 79f70c49ce Merge pull request #11905 from WenhaiLin/v3-37 
Remove unnecessary files.
 2015-05-20 13:39:36 +08:00
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +08:00
Bin Zhang 4ccf18f414 Remove the cocos2d-html5 when creating js project by cocos new. 2015-05-19 14:55:04 +08:00
CocosRobot 181f225eb7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-18 08:19:22 +00:00
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00
WenhaiLin 54b6260dfd Rename module 2015-05-18 15:17:05 +08:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00
WenhaiLin 68188f7424 Add native code for AS project. 2015-05-18 13:41:58 +08:00
CocosRobot fd55bb8e68 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-18 05:35:55 +00:00
WenhaiLin 7caa6bb2fc Update Copyright. 2015-05-18 09:59:50 +08:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00
samuele3hu 71595898ed Update the Lua binding for Physics3D ,related test cases and the template project 2015-05-15 16:25:07 +08:00
yinjimmy 06bd26cb63 Fixed: app crash when console ui trace nil string on mac platform #11211 2015-05-15 15:08:42 +08: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
yinjimmy d78d8b2c1f move menu bar to system menu 2015-05-14 13:43:17 +08:00
joshuastray 59c0a64d38 add libbullet to js template 2015-05-14 10:01:22 +08:00
minggo 50aa8dba47 Merge pull request #11806 from MSOpenTech/v3-winrt-ad-fix 
V3: updates to app.xaml code to correctly support touches on Microsoft Ads
 2015-05-13 13:39:29 +08:00
CocosRobot 5bf26f9f10 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-13 04:07:11 +00:00
Dale Stammen 40c19b31c8 updates to app.xaml code to correctly support touches on Microsoft AdControls for WP8.1 2015-05-12 19:39:40 -07:00
minggo 0ef01edcc7 Merge pull request #11803 from CocosRobot/update_cocosfiles_1431481051 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-13 09:38:45 +08:00
CocosRobot 90ce442616 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-13 01:37:33 +00:00
minggo 5e87bd307b Merge pull request #11798 from WenhaiLin/v3-support-vs2015 
Add support for visual studio 2015.
 2015-05-13 09:37:12 +08:00
minggo b51f78aa42 Merge pull request #11797 from super626/physics3d2 
fix wrong indent and add const
 2015-05-13 09:36:51 +08:00
Dale Stammen f1fe802442 updated winrt keyboard support to support physical keyboard 2015-05-12 09:20:10 -07:00
songchengjiang 4756647016 add libbullet for template project 2015-05-12 16:34:10 +08:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +08: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
samuele3hu 243da71082 Update the project configure of js-tests and js-template on the win32 platform 2015-05-07 11:38:43 +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
minggo 254a4b0b0c Merge pull request #11660 from natural-law/v3 
Rename the target name of Xcode project in templates.
 2015-04-30 18:13:41 +08:00
CocosRobot 038ac5ab2a [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-30 09:23:48 +00:00
zhangbin fc9e5609c8 Rename the target name of Xcode project in templates. 2015-04-30 15:20:47 +08: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
minggo 79a6f2f510 Merge pull request #11652 from MSOpenTech/v3.6-winrt-fix 
V3.6 Windows Phone 8.1 fix for issues 11606 and 11607
 2015-04-30 09:41:52 +08:00
Dale Stammen dfee3ae3cb added CC_WINDOWS_PHONE_8_1 to preprocessor defines 2015-04-29 10:23:22 -07: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
zhangbin dcca32bd82 Update the CMakeLists & the remote url of submodule js-bindings. 2015-04-23 14:23:19 +08:00
minggo cf177bbbee Merge pull request #11559 from MSOpenTech/v3-winrt-fix 
V3 winrt fix to update Angle and correctly handle App termination
 2015-04-23 13:50:37 +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
Dale Stammen 102726784e update windows 8.1 univeral app cpp-template files 2015-04-22 19:13:57 -07:00
Dale Stammen 662f8374ae removed CC_PLATFORM_WINRT code. It is now allowed to exit a WinRT app 2015-04-22 17:58:10 -07:00
CocosRobot d7e32f270c [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-22 02:53:00 +00:00
yinjimmy 94fe5ac206 set CC_CODE_IDE_DEBUG_SUPPORT=0 for lua-template-default 2015-04-22 10:12:40 +08:00
Jimmy Yin 8c4cd7ea42 Modify default console and upload port for lua runtime 2015-04-21 23:07:19 +08:00
Dale Stammen 0c47df5df2 fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments 2015-04-21 06:21:32 -07:00
minggo 80bc3bf021 Merge pull request #11523 from MSOpenTech/v3-winrt-backbutton 
V3 Windows Phone 8.1 back button support
 2015-04-21 17:10:01 +08:00
CocosRobot e218110107 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-21 09:02:58 +00:00
Dale Stammen 83b68ef693 added comment on how back button event is handled 2015-04-20 18:36:58 -07:00
Dale Stammen 4169ebf5c8 Windows Phone 8.1 back button and terminate app support 2015-04-20 10:43:34 -07:00
yinjimmy 2c0f1c1a50 add lua runtime template 2015-04-21 01:25:44 +08:00
Dale Stammen e00b0dfbd9 Merge branch 'v3' into v3-winrt-backbutton 2015-04-20 08:17:16 -07:00
zhangbin 6ee624796a Merge branch 'v3-jsb' of github.com:natural-law/cocos2d-x into v3-jsb 2015-04-20 18:09:57 +08:00
zhangbin a1b5fa5a8e Solve the error in js template. 2015-04-20 18:09:39 +08: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
WenhaiLin dc768dbd8c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge 2015-04-20 10:06:48 +08:00
Dale Stammen a97d5c5370 added support for hardware back button on Windows Phone 8.1 2015-04-19 16:31:30 -07:00
Dale Stammen 178c241cdd added back buttom function 2015-04-19 11:36:14 -07:00
yinjimmy 7a228cd79f Merge branch 'v3' into lua_runtime 2015-04-17 18:28:42 +08:00
yinjimmy 1e32322350 revert runtime files 2015-04-17 18:26:47 +08:00
samuele3hu b300701ec4 Remove the reference of quick module 2015-04-17 15:52:45 +08:00
yinjimmy 5589796029 Merge branch 'v3' into lua_runtime 2015-04-17 15:27:04 +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
zhangbin f66f70f9b3 Solve the warning when creating js project. 2015-04-16 16:51:58 +08:00
zhangbin 6f7506ea9a Remove wp8 support of js template. 2015-04-16 16:38:31 +08:00
CocosRobot 870eb7519b [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-16 06:34:18 +00:00
Dale Stammen 731d7faf07 remove wp8 from cpp templates 2015-04-15 10:01:41 -07:00
Dale Stammen b700798287 removed WP8 project files 2015-04-15 07:13:54 -07:00
zhangbin c69f923f49 Add js template. 2015-04-15 17:49:33 +08: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
minggo 5b834eb90e Merge pull request #11343 from MSOpenTech/v3-wp8-fix 
V3 wp8 fixes
 2015-04-09 10:08:27 +08:00
Dale Stammen 272bb35246 Merge branch 'v3' into v3-wp8-fix 2015-04-08 07:29:45 -07:00
CocosRobot 3b0573392d [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-08 13:30:05 +00:00
minggo e080c17a0f Merge pull request #11333 from WenhaiLin/v3-cpptem 
Disable the CDT builder of cpp-template-defualt
 2015-04-08 17:50:13 +08:00
Wenhai Lin b87b46a3d2 Disable the CDT builder of cpp-template-defualt 2015-04-08 16:29:10 +08: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
minggo 50fa15c0cd Merge pull request #11301 from samuele3hu/v3_lua_jit 
Add luajit support for iOS 64bit devices and related test cases
 2015-04-07 18:17:09 +08:00
CocosRobot 738d03d2db [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-07 01:34:23 +00:00
samuele3hu a64e90d469 Update the related project setting for Luajit and related test cases 2015-04-06 22:41:34 +08:00
Dale Stammen d8b6a0aaf9 removed unused method 2015-04-02 09:11:19 -07:00
Dale Stammen 344b44bdcb fire foreground and background events 2015-04-02 09:08:16 -07:00
yinjimmy 587ee21e4b revert lua runtime 2015-04-02 18:27:53 +08: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
Dale Stammen e2a5eb2f9f updated to Angle ddbf057c52 2015-03-16 08:18:26 -07:00
SunLightJuly f321f725b0 fixed Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(): return false only, because runtime have been removed 2015-03-13 16:12:08 +08:00
CocosRobot 5203d1e7be [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-13 07:20:18 +00:00
SunLightJuly 8c196847cb add security framework to Mac template project of Lua 2015-03-12 19:18:06 +08:00
CocosRobot 54ac9ef67f [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-11 07:32:59 +00:00
minggo 44b1f77fa3 Merge pull request #10799 from SunLightJuly/v3_remove_simu 
V3 remove simulator
 2015-03-11 15:31:17 +08:00
SunLightJuly 608ed24180 Synchronization with V3 2015-03-11 00:02:50 +08:00
SunLightJuly 6c2eb01213 cleanup proj.android 2015-03-10 23:33:09 +08:00
SunLightJuly b77801a99b cleanup proj.win32 2015-03-10 22:56:03 +08:00
Mazyad Alabduljaleel 52524ae453 add security framework to Mac template project 2015-03-10 14:57:21 +04:00
Mazyad Alabduljaleel 983ffd96c7 Now, mac uses ObjC HTTP client 2015-03-10 14:48:57 +04:00
SunLightJuly ba55f14fbf removed runtime in libsimulator 2015-03-10 18:28:59 +08:00
SunLightJuly aac4d6f846 removed CodeIDESupport.h 2015-03-10 11:12:42 +08:00
SunLightJuly ff8c0dac2b removed framework of simulator 2015-03-10 10:51:16 +08:00
minggo 90db974c67 Merge pull request #10784 from vovkasm/fix-templates 
Fix templates after change default resource search path on win32
 2015-03-10 10:47:41 +08:00
Vladimir Timofeev 0dc7da3e6d Fix lua-template-default win32 project 
Modify project to copy resource files to folder where exe file located.
This commit should fix lua-template-default after https://github.com/cocos2d/cocos2d-x/pull/10431 was commited.
 2015-03-10 00:19:23 +03:00
Vladimir Timofeev 8e9ce48bab Fix cpp-template-default win32 project. 
Modify project to copy resource files to folder where exe files located.
This should fix cpp template to follow https://github.com/cocos2d/cocos2d-x/pull/10431 change.
The change was "Fix win32 resource search path to be relative to the executable."
 2015-03-09 23:44:14 +03:00
SunLightJuly 18914a764e removed template of runtime 2015-03-10 01:00:23 +08:00
Dale Stammen 35222a8193 Merge branch 'v3' into v3-wp8-fix 2015-03-09 09:20:25 -07:00
Dale Stammen a828f73ccb updated expiration date of project certificates 2015-03-09 08:31:06 -07:00
CocosRobot 3f7e2eb1ff [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-09 09:45:58 +00:00
minggo b8b1c9d018 Merge pull request #9708 from minggo/use-console 
use cocos console in build_native.py and android-build.py
 2015-03-09 16:41:56 +08: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
samuele3hu 1844fdd806 Fix the error that Android.mk for lua template re-assign the value of LOCAL_C_INCLUDES 2015-03-06 15:41:48 +08:00
CocosRobot 721804a30e [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-04 08:13:38 +00:00
Dale Stammen 44b951a51a Merge branch 'v3' into v3-wp8-fix 2015-03-02 16:42:05 -08:00
minggo 1608e26a43 Merge pull request #10642 from CocosRobot/update_cocosfiles_1425031927 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-28 09:36:32 +08:00
Dale Stammen f68a966485 disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 11:07:51 -08:00
Dale Stammen 2eb919bb7a disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 10:36:48 -08:00
minggo 0365b5dd4c Merge pull request #10645 from yinjimmy/orig-v3 
update runtime to 2.0
 2015-02-27 18:31:07 +08: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
yinjimmy 2042633294 update runtime to 2.0 2015-02-27 14:49:04 +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
SunLightJuly 4dd4e7d703 call function "register_all_packages()" in default template of cpp 2015-02-25 00:25:40 +08:00
SunLightJuly ec22923aa9 modifed AppDelegate.cpp: add function "register_all_packages()" to support packages manager 2015-02-24 20:50:58 +08: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
minggo 058668711b fix conflict 2015-02-13 16:44:14 +08:00
kompjoefriek c0c55f885e Removed trailing spaces 2015-02-12 22:38:07 +01:00
kompjoefriek c6ab07ea02 fixed indentation of Python files 
- Changed tabs to spaces
- Changed 2 spaces to 4 spaces
 2015-02-12 21:22:19 +01: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
Jacky da76cfdc79 add multiple touches toggle to iOS. 2015-01-23 15:09:46 +08:00
CocosRobot c1e586ebab [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 08:07:36 +00:00
minggo 571e313ff5 Merge pull request #10146 from htlxyz/fixed_show_dialog_on_android_without_runtime 
fixed run lua samples 360 will popup access wifi note!
 2015-01-21 15:34:13 +08:00
htl 12010ce3da fixed run lua samples 360 will popup access wifi note! 2015-01-21 15:30:05 +08: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
htl 52b03039fa fixed show open wifi dialog on android without runtime 2015-01-20 19:15:44 +08:00
Dale Stammen 56d8e62409 added support for device orienation change. Fixed gravity for winrt landscape flipped 2015-01-19 09:38:49 -08: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
dualface bc75849ac7 update template/runtime version 2015-01-16 23:22:03 +08:00
zhangbin b1f9fb4b8e Rename the Xcode target of libsimulator. 2015-01-16 14:29:48 +08:00
yinjimmy 6e8188d4ff Fix lang file path for vs project 2015-01-15 14:04:15 +08:00
yinjimmy 9f60e82cc7 Fix compile error with lua-tempate-default / lua-template-runtime 2015-01-15 13:34:23 +08:00
yinjimmy f652e1359a 1. Compatible vs2012 for libsimulator 
2. Adjust output directory for simulator
 2015-01-15 11:10:32 +08:00
CocosRobot b2db3c13dd [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 15:39:55 +00:00
yinjimmy 49869847cc add default `-workdir` for vs project 2015-01-14 18:45:18 +08: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
yinjimmy f2ab171fab Merge branch 'v3' into combine 2015-01-14 16:38:06 +08:00
yinjimmy a80e26f680 cleanup 2015-01-14 16:27:29 +08:00
CocosRobot 29d85ca8c2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 08:12:14 +00:00
yinjimmy bd3c250a6d add proj.linux support 2015-01-14 14:44:48 +08:00
CocosRobot 5faeb6919a [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 03:39:38 +00:00
yinjimmy bdf4393be0 Fix runtime output directory for Windows release mode 2015-01-14 10:18:00 +08:00
yinjimmy 49b265d147 cleanup 2015-01-13 19:44:46 +08:00
yinjimmy 54443a7a9b add missing runtime/config.json 2015-01-13 18:41:05 +08:00
yinjimmy dc019defc1 Merge branch 'v3' into combine 2015-01-13 18:32:32 +08:00
yinjimmy c3a536bcf0 add lua-template-runtime 2015-01-13 18:28:33 +08:00
Dale Stammen f53a493ac7 fixed automatic adding of resources 2015-01-12 11:56:58 -08:00
Dale Stammen f466f4e986 added missing arial font that is required by WP8 2015-01-12 11:32:51 -08:00
yinjimmy cf331c3abd update lua-template-default 2015-01-12 23:42:37 +08:00
CocosRobot 27da58e4b5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-12 12:13:39 +00:00
yinjimmy d1205ceeea remove lua-template-runtime folder 2015-01-12 17:55:41 +08:00
yinjimmy 0978a88b7f Merge branch 'v3' into combine 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
	tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
 2015-01-12 17:54:58 +08:00
yinjimmy d1821fb1ef update template for iOS 2015-01-12 12:46:43 +08:00
WenhaiLin 2c728fa341 Fixed can't run new CPP project on android by Eclipse 2015-01-09 15:01:08 +08:00
yinjimmy f98ff24e97 Support `isLandscape` field in config.json 2015-01-09 14:39:45 +08:00
yinjimmy db80ab0028 update lua default template 2015-01-09 13:21:19 +08:00
yinjimmy 2f3270fa0b Fix: can not load Lua project with command `cocos run -p mac -m release` 2015-01-09 12:32:54 +08:00
yinjimmy 349f5d1a87 add config.json 2015-01-09 11:43:41 +08:00
dualface 9030e32adc Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support 2015-01-09 11:30:35 +08:00
dualface c041787f01 update proj.android for template 2015-01-09 04:14:31 +08:00
yinjimmy d2a3a6a8c0 merge lua-template-default with lua-template-runtime 2015-01-09 04:08:41 +08:00
dualface 7046f508da update proj.win32 for templates 2015-01-09 03:10:54 +08:00
CocosRobot f6de697bde [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-08 06:05:46 +00:00
dualface 8066343c69 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support 2015-01-07 17:39:30 +08:00
CocosRobot 6a88a51e24 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-07 02:23:16 +00:00
dualface 156e9eb4f2 update templates 2015-01-06 08:31:43 +08:00
dualface efada94e18 update proj.ios_mac 2015-01-05 17:56:34 +08:00
yinjimmy d4681c1150 update google analytics tid 2015-01-05 12:15:52 +08:00
yinjimmy fb5bd01ac1 fix: compile error on win32 with release model 2014-12-31 20:00:51 +08:00
dualface df82dfc873 update config.json 2014-12-31 18:49:02 +08:00
dualface 3077e294b7 update runtime version 2014-12-31 18:39:51 +08:00
dualface b0199dfa61 fix lua_debugger.c 2014-12-31 17:46:48 +08:00
minggo 2495d698c0 Merge pull request #9745 from huangshiwu/iosnetwork_template 
iOS runtime template add security.framework
 2014-12-31 15:20:20 +08:00
minggo 50914665e6 Merge pull request #9742 from huangshiwu/iosnetwork_template 
ios template add security.framework
 2014-12-31 15:15:08 +08:00
huangshiwu 7702c102a2 iOS runtime template add security.framework 2014-12-31 15:15:01 +08:00
CocosRobot 85ccfb2209 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 07:14:27 +00:00
huangshiwu ac2ff38624 ios template add security.framework 2014-12-31 14:46:34 +08:00
andyque 5d9274acf5 fix conflicts 2014-12-31 14:22:18 +08: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
minggo a1e8dec384 use cocos console in build_native.py and android-build.py 2014-12-30 16:24:16 +08:00
yinjimmy 2652a67040 cleanup 2014-12-30 16:02:05 +08:00
yinjimmy d986c974d7 compatible code 2014-12-30 16:01:47 +08:00
yinjimmy 4c57a29455 fix: init config on all platform & stop runtime when exit 2014-12-30 15:59:52 +08:00
CocosRobot e7a7ee750f [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 05:48:30 +00:00
dualface 82c40ca5e8 add Cocos Studio support 2014-12-29 13:41:21 +08:00
dualface 653b15b4b8 add UIWidget support, fix typo 2014-12-29 13:37:20 +08:00
dualface 40acc98f14 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates 2014-12-29 10:58:42 +08:00
dualface 0acdd4f4a3 cleanup lua-template-runtime 2014-12-29 10:55:05 +08:00
CocosRobot b385ce58d0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 02:31:59 +00:00
minggo 87a9039065 Merge pull request #9660 from yinjimmy/newLuaRuntime 
add new lua runtime
 2014-12-29 10:04:02 +08:00
minggo 212684fcd4 Merge pull request #9665 from andyque/fixLibpngWarning 
Fix libpng warning
 2014-12-29 10:00:43 +08:00
CocosRobot 0a4785d6fc [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 01:45:01 +00:00
yinjimmy e75d283455 1. do not setFrameSize when resetDesignResolution 
2. read config.json when ConfigParser init
 2014-12-29 09:16:07 +08:00
dualface a4d17998d3 update lua-template-runtime 2014-12-29 05:55:56 +08:00
dualface 2ba25a473f update lua-default-template 2014-12-29 05:51:49 +08:00
andyque 9c974eebd0 fix libpng warning 2014-12-27 20:47:59 +08:00
yinjimmy 4280ffcf58 add new lua runtime 2014-12-27 02:21:55 +08: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
Igor Mozharovsky d0c223c3e0 Rewrite using already existing director's variable 2014-12-24 19:21:32 +02: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
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00
CocosRobot 7170e85a7a [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-19 22:37:52 +00:00
honghui 3c3b190be8 update runtime version 2014-12-12 15:47:12 +08:00
honghui ab162a01f4 runtime's setSearchPaths failed 2014-12-11 22:16:39 +08:00
minggo 73ece5ad09 Merge pull request #9385 from samuele3hu/v3_cocostudio 
Remove useless copy about luasocket on the android platform
 2014-12-09 18:28:08 +08:00
youyou 5bcc1c29d9 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	tests/lua-tests/src/CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest.lua
 2014-12-05 20:13:27 +08:00
honghui 61e13bf2a1 update runtime version to 1.6 2014-12-05 16:09:43 +08:00
samuele3hu 3e0852eb7a Remove useless copy about luasocket on the android platform 2014-12-05 15:28:45 +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
minggo 3faeee66e3 Merge pull request #9358 from cocoscodeide/v3 
merge runtime to v3
 2014-12-04 14:00:17 +08:00
honghui 2aa05bff39 revert file commit by mistake 2014-12-04 13:53:55 +08: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
honghui 118569c972 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-30 15:37:30 +08:00
honghui 047c36a270 update runtime template 2014-11-29 16:05:18 +08:00
Huabing.Xu 522a77e1a8 Merge pull request #9311 from andyque/fixLinuxTemplate 
fix linux cpp and lua template
 2014-11-29 09:20:22 +08:00
andyque 79918d789e fix cocos2d root 2014-11-28 08:24:48 -08:00
andyque bdd46f7e55 fix linux cpp and lua template 2014-11-28 08:20:02 -08:00
CocosRobot ff8d2624eb [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-28 08:54:16 +00:00
honghui 9fefad5f35 debugging lua code in package support 2014-11-28 15:40:12 +08:00
minggo f3e53d7700 Merge pull request #9299 from CocosRobot/update_cocosfiles_1417117059 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-28 09:36:53 +08:00
CocosRobot 38c3bc7b4f [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-27 19:37:40 +00:00
Dhilan007 3025e937f6 Fixed compiling and linking error of new lua projects when using NDK r10 above. 2014-11-27 21:56:06 +08:00
Filipe Lemos b722df671b Fix CPU check on android template 2014-11-26 11:02:22 +00:00
honghui 52780dff28 fix some memory leak 2014-11-26 14:58:23 +08:00
Dale Stammen 6ad3a23ed3 added support for lost directx device 2014-11-25 08:25:34 -08:00
Dale Stammen 8da06fb9cc Merge branch 'v3' into v3-win8.1-appstate 2014-11-25 08:07:29 -08: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
honghui 0e73301fc4 remove "using namespace" from header files 2014-11-24 17:13:24 +08:00
honghui 84a8c75ad5 Split Runtime.cpp to individual class files 2014-11-24 11:14:35 +08:00
youyou d04945d77c update templates 2014-11-24 11:08:37 +08:00
honghui 3477e0fa19 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-24 10:43:34 +08:00
Dale Stammen a607d41454 implemented lostDevice support when app loses the directx device 2014-11-21 16:24:51 -08:00
Dale Stammen 2a86c77066 added foreground, background, lostdevice support 2014-11-21 10:31:57 -08:00
CocosRobot 2398712b9d [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-21 01:57:39 +00:00
honghui 941c8281cd revert commit a7f8199e65 2014-11-20 21:20:54 +08:00
honghui a97386f8d7 can't build IPA using developer certificate in Mac OS X 10.10 2014-11-20 21:20:54 +08:00
Dale Stammen 5d2857b3c4 updated angle to commit 4a980d2612 2014-11-19 15:55:18 -08:00
zhangbin 365e09e5db Merge branch 'v3' into support-wp8 2014-11-17 16:01:12 +08: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
zhangbin 4ef7c9f948 Modify the cpp template & tests to support compiling wp8-xaml & win8.1-universal project by console. 2014-11-14 16:48:14 +08:00
Ricardo Quesada 2e3b2d9f28 Merge pull request #9080 from vovkasm/cmake-refactoring 
Cmake refactorings and fixes
 2014-11-13 15:42:47 -08:00
minggo 5f1ca44f0c Merge pull request #9071 from mikandi/feature/android-build-native-with-spaces 
Android build_native.py with spaces in path
 2014-11-13 18:37:37 +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
Christopher O'Connell 5d26bc045c Fixed failure in call to make when the android app folder contains spaces in the path. 2014-11-10 00:38:32 -07:00
CocosRobot 80ce1537e7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-07 02:34:46 +00:00
honghui 8af00cdb06 runtime demo is ugly when screen orientation is portrait 2014-11-06 11:30:01 +08:00
minggo 5ee8f0a134 Merge pull request #8976 from hongliang-goudou/runtime_addSearchPath_argc 
overrided addSearchPath() by Runtime.cpp should support second argument
 2014-11-01 11:35:05 +08:00
hongliang adb221babe init arg1 as false for safety 2014-10-31 15:23:46 +08:00
minggo e87e0290fd Merge pull request #8958 from MSOpenTech/wp8-shader-fix 
WP8 Shader fix for cocos2d-x issue 8933
 2014-10-31 09:43:31 +08:00
hongliang 0d006ce6d1 overrided addSearchPath() by Runtime.cpp should support second argument as CCFileUtils.cpp does. 2014-10-30 17:07:37 +08:00
samuele3hu c9daa8244e Add include directories to fix compile error on the window and remove useless `PreBuildEvent` 2014-10-29 16:09:35 +08:00
Dale Stammen af14b40ba0 must call DisplayInformation::GetForCurrentView() from main UI thread 2014-10-27 13:40:19 -07:00
Dale Stammen 510c8caed7 added DPI support for universal app 2014-10-27 11:12:54 -07:00
CocosRobot 29264db249 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-25 07:47:09 +00:00
minggo b99f0bf321 Merge pull request #8926 from MSOpenTech/wp8.1-universal 
WP8.1 universal app
 2014-10-25 15:45:50 +08:00
Dhilan007 788c793147 Fix CPP template on Window 2014-10-24 23:18:35 +08:00
Dale Stammen 3b8537b7e4 updated template files 2014-10-24 06:08:38 -07:00
Dale Stammen f42afaa6bb updated project files with new pch files 2014-10-23 19:40:57 -07:00
Dale Stammen c38a37837a added cpp template for windows 8.1 universal apps 2014-10-23 07:40:42 -07:00
Dale Stammen f359c7285e remove PhoneDirect3DXamlAppComponent namespace refactor 2014-10-23 07:21:48 -07:00
Dale Stammen 4596417a0b remove PhoneDirect3DXamlAppComponent namespace. Updated edit text code 2014-10-23 07:19:05 -07:00
Dale Stammen b7fd0dd722 remove PhoneDirect3DXamlAppComponent namesapce refactor 2014-10-23 07:17:58 -07:00
honghui e394a0cc30 update runtime version to 1.5 2014-10-21 18:48:14 +08: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
minggo 8318b16922 Merge pull request #8827 from cocoscodeide/v3 
don't show runtime on top by default
 2014-10-18 15:12:17 +08:00
minggo 8218804c52 Merge pull request #8820 from Dhilan007/v3-audioengine-lua 
[LUA]Add New AudioEngine on window
 2014-10-18 15:11:29 +08:00
huanghsiwu f549aa3747 fix wp8 template crash bug by modefy font resource's properties 2014-10-18 11:20:12 +08:00
honghui f2647e56e4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-18 09:45:25 +08:00
minggo b4ffad06eb Merge pull request #8822 from huangshiwu/v3_fixtemplate 
change ios and mac template's resource struct
 2014-10-17 23:00:42 +08:00
huangshiwu 4802821efd change ios and mac template's resource struct 2014-10-17 18:22:25 +08:00
huangshiwu 60429247ea edit lua-template-runtime's ios info.plist to change launch image's display orientation 2014-10-17 18:17:49 +08:00
Dhilan007 a65b5d7541 Fix CPP template project crash 2014-10-17 18:17:49 +08:00
honghui 788c58ec90 don't show runtime on top by default 2014-10-17 18:00:26 +08:00
Dhilan007 81a8e80496 [LUA]Add New AudioEngine on window 2014-10-17 17:53:33 +08:00
minggo 8b0f61dfb0 Merge pull request #8817 from huangshiwu/v3_luaruntimelaunchimage 
edit lua-template-runtime's ios info.plist to change launch image's disp...
 2014-10-17 17:52:29 +08:00
honghui f6b5ebb53b delete unused code 2014-10-17 17:36:45 +08:00
huangshiwu 9f4689b3ce edit lua-template-runtime's ios info.plist to change launch image's display orientation 2014-10-17 17:29:35 +08:00
Dhilan007 4bede5067e Fix CPP template project crash 2014-10-17 17:02:22 +08:00
honghui 8c0af59f9a open lua debugger only when IDE connected 2014-10-17 14:55:20 +08:00
honghui 8a38d192bb win32 runtime need more dll files 2014-10-17 14:55:20 +08:00
CocosRobot 592c39fd96 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-17 05:47:13 +00:00
minggo aa303e975f Merge pull request #8776 from huangshiwu/v3_iphone6hires 
add launch images to templates to support iPhone6 and iPhone6+'s native ...
 2014-10-17 12:03:56 +08:00
huangshiwu d05aa84699 add launch images to templates to support iphone6 and iphone6+'s native resolution mode 2014-10-17 11:40:22 +08:00
ledenis 33d01965be Changed deprecated LabelTTF::create() to Label::createWithTTF() in the HelloWorld 2014-10-16 16:58:24 +02:00
minggo b4867bf6e5 Merge pull request #8715 from iSevenDays/v3 
CMakes support for Mac Os X & iOS
 2014-10-16 21:16:02 +08:00
CocosRobot 39d3cb20b5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 13:12:34 +00:00