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

33473 Commits

Author SHA1 Message Date
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
남준현 f49d467465 Add virtual keyword. 2015-10-17 04:46:37 +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
dimon4eg d317cd75e1 Improved code a bit 2015-10-16 11:28:34 +03:00
hugo 2bf7f8ae3f update console 2015-10-16 16:10:08 +08:00
mogemimi 73c0ce1a9a Replace String::createWithFormat() with StringUtils::format() 2015-10-16 15:02:14 +09:00
mogemimi 8af6531c94 Replace deprecated CCApplication with Application 2015-10-16 15:02:06 +09:00
mogemimi 4600c41f9b Add override keywords 2015-10-16 15:01:10 +09:00
子龙山人 6661f702ce Merge pull request #14161 from CocosRobot/update_cocosfiles_1444973862 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-10-16 13:46:50 +08:00
CocosRobot 8bc74ad72e [AUTO][ci skip]: updating cocos2dx_files.json 2015-10-16 05:37:43 +00:00
pandamicro efeb6a44fb Merge pull request #14143 from MSOpenTech/v3-win10-curl 
V3 win10 curl
 2015-10-16 13:35:48 +08:00
pandamicro 585fcf4d7d Merge pull request #14156 from njh0602/somefix 
Fix comment. (/cocos/math/Vec2.cpp)
 2015-10-16 11:41:25 +08:00
pandamicro 1b2338df8e Merge pull request #14152 from chengstory/Fix#22934 
Fix#22934
 2015-10-16 11:38:22 +08:00
pandamicro 8915fc6cb9 Revert "Remove screen direction check in simulator to avoid render error" 2015-10-16 11:36:20 +08:00
fjut 04c44fbe15 Merge pull request #1 from cocos2d/v3 
合并原作者代码
 2015-10-16 09:31:54 +08:00
남준현 5118a31faf // cross pro'c'uct of 2 vector. A->B X C->D 
// cross pro'd'uct of 2 vector. A->B X C->D
 2015-10-16 03:24:54 +09:00
Sebastien Flory bd83fc1474 PMA Handling issue 
Hi,

I compared to cocos2D-x v2.x and it seems that there is an issue with the _hasPremultipliedAlpha flag not beeing set correctly for mipmaps and compressed textures.
I guess it's a mistake due to the reorganization of the code between the old CCTexture2D and the new one.
In our tests, this fixes the issue.

Best,

Sebastien
 2015-10-15 15:48:21 +02:00
dimon4eg ee3c000b43 Fix crash in web view on android 2015-10-15 16:43:53 +03:00
zhangcheng 3edbf0f4a3 Fix#22934 
Node, Skeleton needs to show at the middle of the simulator.
 2015-10-15 19:35:06 +08:00
pandamicro e789ab97be Merge pull request #14139 from super626/v3 
fix obb performance test
 2015-10-15 16:00:51 +08:00
pandamicro c87a1ee5aa Merge pull request #14146 from super626/terrain 
Fix terrain render bug
 2015-10-15 15:58:24 +08:00
pandamicro 639382d0b1 Merge pull request #14144 from xiaofeng11/v3 
Remove screen direction check in simulator to avoid render error
 2015-10-15 15:57:40 +08:00
yangxiao 907189ed14 correct wrong presion, which leads to failed on some devices 2015-10-15 11:59:38 +08:00
XiaoFeng ca8977b6f8 Remove screen direction check in simulator to avoid render error 2015-10-15 10:11:26 +08:00
Dale Stammen 0e28ec68b8 updated version to v3-deps-74 2015-10-14 18:03:57 -07:00
Dale Stammen 3e3e47de10 added Win10 UWP curl support 2015-10-14 16:47:52 -07:00
Dale Stammen 7e252d2c3b added BundleArtifacts 2015-10-14 16:47:39 -07:00
pandamicro 07c2ec49db Merge pull request #14140 from xiaofeng11/v3 
Bug fix
 2015-10-14 21:12:06 +08:00
pandamicro 59a9f0c953 Merge pull request #14141 from mogemimi/fix-minor-typo 
Fix minor typos
 2015-10-14 14:29:58 +08:00