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

1275 Commits

Author SHA1 Message Date
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