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

1287 Commits

Author SHA1 Message Date
Dale Stammen 4b8cc00853 use correct name for pfx file 2015-10-20 10:48:01 -07:00
Dale Stammen d8e10981db added check to see if app is already visible 2015-10-20 10:38:42 -07:00
Dale Stammen f9d8907697 updated winrt temporary app certificates expiration dates 2015-10-20 07:39:42 -07:00
CocosRobot 518f800c75 [AUTO][ci skip]: updating cocos2dx_files.json 2015-10-20 02:36:00 +00:00
zhangcheng 8d22beeae4 Fix #23433 
Fix javascript project can't be opened directly in visual studio 2015.
 2015-10-20 10:17:50 +08:00
pandamicro be45e0bc50 Merge pull request #14174 from noshbar/v3 
CPPCheck fixes, correct deallocation, array size.
 2015-10-19 10:05:01 +08:00
Dale Stammen fdebb373b1 updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5 2015-10-16 15:36:34 -07:00
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
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
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