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

1432 Commits

Author SHA1 Message Date
Dirk de la Hunt 88bcaad518 General fixes: 
- changed some delete operations to be deletions of arrays where applicable
 - changed some "free" operations to "delete" where memory was allocated with "new"

CCPUScriptCompiler.cpp:
 - added checks to see if temp1 and temp2 are non-null before dereferencing them

FileServer.cpp:
 - changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
   is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
 2015-10-16 21:43:09 +02:00
CocosRobot 8bc74ad72e [AUTO][ci skip]: updating cocos2dx_files.json 2015-10-16 05:37:43 +00:00
pandamicro e02ba57144 Merge pull request #14137 from pandamicro/androidbug 
Fix Android activity destroyed after reopen the app
 2015-10-14 11:46:27 +08:00
XiaochenFTX ec2aa7e8f2 Fix Android activity destroyed after reopen the app 2015-10-14 11:45:27 +08:00
Jim Range 4e73670f38 Fixed issues with the iOS icons and splash screens that could cause app validation failure with Apple and improper orientation / missing splash screens. 2015-10-13 11:11:27 -05:00
CocosRobot fda99182da [AUTO][ci skip]: updating cocos2dx_files.json 2015-10-10 03:44:43 +00:00
CocosRobot 0fc077d196 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-29 09:08:15 +00:00
CocosRobot ebee5e9a26 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-29 07:39:05 +00:00
CocosRobot 4185715c06 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-27 15:10:43 +00:00
pandamicro b45beed52a Merge pull request #13980 from yangws/v3 
Fix js-template-default compile error.
 2015-09-21 19:33:02 +08:00
Vincent Yang fa6e6f8074 Fix js-template-default compile error. 2015-09-21 19:28:16 +08:00
CocosRobot 2aa835536f [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-21 10:37:59 +00:00
pandamicro cf342a830a Merge pull request #13947 from CocosRobot/update_cocosfiles_1442593566 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-19 00:33:23 +08:00
pandamicro 07edc1f81d Merge pull request #13948 from pandamicro/v3 
[ci skip] Update web reference
 2015-09-19 00:27:46 +08:00
CocosRobot 50052856f2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 16:26:08 +00:00
CocosRobot 5af1eaebe0 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 13:58:52 +00:00
CocosRobot 29a4e861ed [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 13:55:26 +00:00
Mikhail Shulepov 8a48dcee50 AppController: synthesize window #13285 2015-09-18 15:28:07 +03:00
pandamicro 6a975fe641 Merge pull request #13599 from perminovVS/winrt-mouse-support 
WinRT support mouse
 2015-09-18 17:26:15 +08:00
CocosRobot 5be2cf3e5e [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 08:15:36 +00:00
pandamicro fa1e2ce3c4 Update web reference 
Set js templates mac target to 10.8
 2015-09-18 15:58:00 +08:00
CocosRobot 6957b73939 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 06:08:31 +00:00
CocosRobot f9119bf3c1 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 04:01:07 +00:00
Vladimir Perminov 583e780e29 Correct all templates 2015-09-17 22:09:41 +03:00
pandamicro 78c07c1c54 Set js templates Mac target platform from null to 10.7 2015-09-17 23:10:23 +08:00
CocosRobot 0ccb92a10c [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-16 14:26:42 +00:00
CocosRobot 0f3e43344b [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-16 06:03:19 +00:00
子龙山人 c532db4f11 Merge pull request #13793 from CocosRobot/update_cocosfiles_1442199430 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-14 11:36:01 +08:00
pandamicro 737dc5ba8d Fix build_native for js default template 2015-09-14 11:18:32 +08:00
CocosRobot f8eb3a9b1a [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-14 02:57:12 +00:00
zhangbin 4996fe5c1b Solve the error in templates. 
When creating project from template, the app name of android-studio project is not changed.
 2015-09-09 16:08:15 +08:00
CocosRobot c2e18e9737 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-09 02:49:42 +00:00
CocosRobot df4da8ffa0 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-09 02:28:31 +00:00
pandamicro 4fb34ba190 Merge pull request #13703 from cocos2d/v3.8 
Sync v3.8 to v3
 2015-09-07 14:56:37 +08:00
CocosRobot f427ae2f06 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-06 02:05:42 +00:00
WenhaiLin be60f7f65c [ci skip]js-template-default:Fixed the path of link resources. 2015-09-02 13:48:57 +08:00
Vladimir Perminov bf40c1acd1 WinRT support mouse event 
Mouse event implemented similar Desktop version.
Left button send mouse event and touch.
Support other mouse button and scroll wheel.
 2015-08-27 21:34:25 +03:00
Vladimir Perminov b5c289c622 WinRT support Show/Hide mouse cursor 2015-08-27 21:19:59 +03:00
CocosRobot 64b9c2b51f [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-24 06:07:38 +00:00
CocosRobot 7bb25d8c66 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-21 04:24:34 +00:00
CocosRobot 7839a23c62 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-21 03:53:16 +00:00
Dale Stammen c47de9d04f make new render surface current after device lost 2015-08-20 13:26:03 -07:00
CocosRobot 217c698ef4 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-20 09:49:05 +00:00
pandamicro 87aa2c6969 Merge pull request #13462 from MSOpenTech/v3-winrt-fix 
V3.8: fixed typo in WindowsPhone 8.1 cpp template file names
 2015-08-19 13:39:16 +08:00
pandamicro 31bc04a301 Merge pull request #13455 from MSOpenTech/v3-win10 
Windows 10 UWP and WP8.1 app certification fixes
 2015-08-19 13:36:29 +08:00
pandamicro 6d0422bcc3 Merge pull request #13448 from VisualSJ/v3.8-webIndex 
[ci skip] Set the transparency will affect the labelTTF
 2015-08-19 11:41:58 +08:00
Dale Stammen fef0a1bb81 fixed typo in WindowsPhone file names 2015-08-18 20:33:53 -07:00
Dale Stammen 8493365be7 updates to pass Windows App Certification tests 2015-08-18 11:06:47 -07:00
WenhaiLin 5cdfdf8497 [ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0 2015-08-18 22:37:00 +08:00
VisualSj 4d9a61569a Set the transparency will affect the labelTTF 2015-08-18 18:30:03 +08:00
Dale Stammen 97ecec1d64 updated Win10 UWP app asset files 2015-08-17 18:35:42 -07:00
pandamicro 2d1fcecfa5 Add default viewport meta to js templates 2015-08-17 18:56:10 +08:00
zhangbin 38edfea28a Solve the error effect of lua portrait project created from template. 2015-08-14 17:20:21 +08:00
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
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