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

33038 Commits

Author SHA1 Message Date
Dale Stammen d8e10981db added check to see if app is already visible 2015-10-20 10:38:42 -07:00
Dale Stammen 3f359381dc moved file to correct folder in vcxproj 2015-10-20 10:07:30 -07:00
Dale Stammen f9d8907697 updated winrt temporary app certificates expiration dates 2015-10-20 07:39:42 -07:00
Dimon4eg 6581954b5b Merge pull request #1 from Dimon4eg/v3 
merge
 2015-10-20 12:48:16 +03:00
XiaoFeng 3d626940af Roll back debug commented code 2015-10-20 17:23:31 +08:00
pandamicro 7466c4c71e Merge pull request #14194 from super626/v3 
check light enable or not when switching shader
 2015-10-20 17:09:37 +08:00
pandamicro f40f3bf5a9 Merge pull request #14198 from xiaofeng11/v3_39betaPrepaire 
[ci skip]Update 3.9 beta0 change log & version info
 2015-10-20 17:08:55 +08:00
XiaoFeng 428db9c458 update js binding version info 2015-10-20 17:04:31 +08:00
XiaoFeng 18b7b533ce Update 3.9 beta0 change log & version info 2015-10-20 16:46:31 +08:00
XiaoFeng 7e54a91ee6 Fix CCDownloader-curl will crash in js-test 
Fix broken image link in TextureCacheTest.js
 2015-10-20 16:28:03 +08:00
pandamicro 7443cf915d Merge pull request #14185 from mogemimi/fix-memory-leak 
Fix some memory leaks
 2015-10-20 15:56:39 +08:00
geron-cn be8a158bd7 fix bug: #23532 AnchorPointFrame animation performance diffrent with cocos studio 2015-10-20 15:49:12 +08:00
Liam 7280a963b3 fix light3D reader error 2015-10-20 15:24:34 +08:00
pandamicro 8b5ba448cb Merge pull request #14193 from xiaofeng11/v3_39betaPrepaire 
Update authors for 3.9 beta version
 2015-10-20 15:23:12 +08:00
pandamicro 1144327003 Merge pull request #14186 from xiaofeng11/v3_xf 
Fix simulator run time only check screen direction flag, but won't check if size setting need swap
 2015-10-20 15:22:30 +08:00
yangxiao a4d67867d7 check light enable or not when switching shader 2015-10-20 15:11:39 +08:00
XiaoFeng 41c0add76f Update authors for 3.9 beta version 2015-10-20 14:20:50 +08:00
子龙山人 320de102bb Merge pull request #14191 from CocosRobot/update_lua_bindings_1445308648 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-10-20 10:44:16 +08:00
子龙山人 cc3a1380f9 Merge pull request #14190 from CocosRobot/update_cocosfiles_1445308559 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-10-20 10:43:57 +08:00
CocosRobot 6a0e1b323f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-20 02:42:17 +00:00
CocosRobot 518f800c75 [AUTO][ci skip]: updating cocos2dx_files.json 2015-10-20 02:36:00 +00:00
pandamicro dddf3e62e9 Merge pull request #14189 from chengstory/Fix#23433 
Fix #23433
 2015-10-20 10:34:16 +08: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
XiaoFeng 83a48ee501 Fix simulator run time only check screen direction flag, but won't check if size setting need swap 2015-10-19 19:43:10 +08:00
mogemimi c3194ac34d Fix memory leak in TMXLayer 2015-10-19 19:47:36 +09:00
mogemimi 34831d48ce Fix memory leak in GLViewImpl 2015-10-19 19:46:45 +09:00
pandamicro f4a2a53f6d Merge pull request #14184 from xiaofeng11/v3_xf 
Fix EventListenerCustom registered by UILabel never has been released bug
 2015-10-19 17:13:25 +08:00
XiaoFeng 762e25ad33 Remove unused parameter 2015-10-19 16:06:39 +08:00
XiaoFeng ffb2cfa9e0 Fix EventListenerCustom registered by UILabel never has been released bug 2015-10-19 14:07:50 +08:00
pandamicro 82881bf92f Merge pull request #14109 from loadrunner/label3 
Added line spacing/leading feature to Label
 2015-10-19 10:55:53 +08:00
pandamicro c57adeae4d Merge pull request #14183 from VisualSJ/v3-webIndex 
Update web index
 2015-10-19 10:25:35 +08:00
VisualSj c3eca0089e Update web index 2015-10-19 10:19:12 +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
pandamicro 3bf0d0fe44 Merge pull request #14168 from MSOpenTech/v3-win10-fix 
V3: fixed msbuild by removing incorrect AppxBundle properties from project
 2015-10-19 08:22:24 +08:00
pandamicro 4395886133 Merge pull request #14175 from MSOpenTech/v3-winrt-angle 
V3 winrt angle update to fix issue #9980
 2015-10-19 01:27:03 +08:00
pandamicro e8a22237e6 Merge pull request #14173 from njh0602/somefix 
Simple merge() version
 2015-10-18 22:59:23 +08:00
pandamicro cde67d1261 Merge pull request #14162 from mogemimi/fix-warnings 
Fix warnings on Xcode 7
 2015-10-18 22:56:12 +08:00
pandamicro 784dbc4c88 Merge pull request #14158 from cocos2d/revert-14144-v3 
Revert "Remove screen direction check in simulator"
 2015-10-18 22:49:09 +08:00
pandamicro c365fc5883 Merge pull request #14180 from pandamicro/v3 
Fix issue for web engine upgrade
 2015-10-18 22:48:16 +08:00
pandamicro cfb1ee2b11 Improved logic of jsb_boot.js to sync with the web engine behavior 2015-10-18 22:45:53 +08:00
pandamicro 11890d6c4b Fix issue for web engine upgrade 2015-10-18 00:19:02 +08:00
Dale Stammen feb2fb7a82 updated version to v3-deps-75 2015-10-16 15:47:24 -07:00
Dale Stammen fdebb373b1 updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5 2015-10-16 15:36:34 -07:00
Dale Stammen ce88dbdee4 removed WP8.1 shader code 2015-10-16 14:48:03 -07:00
Dale Stammen 414a34f3f9 removed old WP8.1 shaders for gl_PointSize 2015-10-16 14:47:02 -07:00
남준현 f47f4aa00e Simple merge() version 2015-10-17 04:59:07 +09: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
Dale Stammen e2730a3d92 fixed msbuild by removing incorrect AppxBundle properties from project 2015-10-16 09:25:24 -07:00
fjut 4c3d0c62bb remove duplicate include 
duplicate include: #include "ui/CocosGUI.h"
 2015-10-16 21:41:40 +08:00
Shun Lin 7ef5baa139 Merge pull request #14163 from hugohuang1111/update_console 
update console
 2015-10-16 17:40:50 +08:00