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

1197 Commits

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