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

34464 Commits

Author SHA1 Message Date
zilongshanren b2b774b66b fix tizen lua template 2016-04-29 17:59:10 +08:00
zilongshanren 915ea19e2e fix tizen cpp template settings 2016-04-29 17:28:38 +08:00
minggo 2f6869b94a Merge pull request #15534 from slackmoehrle/v3.11-release-notes-changes 
started Release Notes changes for v3.11
 2016-04-29 09:49:38 +08:00
slackmoehrle a18ea0036c added step for incrementing dependency version number 2016-04-28 21:46:53 -04:00
slackmoehrle 0c427541c0 updated OpenSSL section 2016-04-28 20:15:41 -04:00
slackmoehrle b1da4b9c80 started Release Notes changes for v3.11 2016-04-28 15:17:55 -04:00
minggo 788dae5a2e Merge pull request #15531 from pandamicro/v3.11 
Fix clipping node memory management issue and update web engine
 2016-04-28 16:15:59 +08:00
pandamicro 27b9510f2c Upgrade web engine to v3.11 beta and fix issues with js-tests 2016-04-28 16:12:29 +08:00
pandamicro d8d6e55756 Fix clipping node memory management issue 2016-04-28 15:14:03 +08:00
minggo e3ffd34bc3 Merge pull request #15528 from CocosRobot/update_lua_bindings_1461808426 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-28 10:08:09 +08:00
minggo 16818295f3 Merge pull request #15527 from CocosRobot/update_cocosfiles_1461808353 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-28 10:07:37 +08:00
CocosRobot 198acb9466 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-28 01:56:50 +00:00
CocosRobot 011523cb56 [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-28 01:52:35 +00:00
zilongshanren 482788c933 Add tizen support (#15518) 
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
 2016-04-28 09:49:55 +08:00
minggo ae2837326b Merge pull request #15516 from minggo/update-release-note 
[ci skip]update changelog and release note
 2016-04-27 15:02:30 +08:00
minggo 79d659e46b update changelog and release note 2016-04-27 15:01:02 +08:00
minggo 82ac46152f Merge pull request #15474 from minggo/update-console 
update cocos2d-console
 2016-04-21 11:35:00 +08:00
minggo e6d845a22e Merge pull request #15471 from ricardoquesada/issue15423_bis 
fix: fix issue 15423 for v3.11
 2016-04-21 09:42:57 +08:00
minggo ba78999ffd update cocos2d-console 2016-04-21 09:39:19 +08:00
Ricardo Quesada 775db978da fix: fix issue 15423 for v3.11 
Github issue #15423
 2016-04-20 08:41:20 -07:00
Ce Zheng 200c9fda59 fix HTTPAsyncConnection bad memory management 
Removed a redundant release on certDataRef that caused crash on
NSURLConnectionLoader thread.
Fixed a memory leak of SecCertificateRef
This fixes #15464
 2016-04-20 14:04:44 +09:00
Ce Zheng d848292860 make android downloader taskQueue thread 
My previous fixes for the android downloader in #14530 are not thread
safe, this commit fixes the problem
 2016-04-20 13:42:00 +09:00
Ce Zheng f3cd1298af improve asset manifest diff performance 
By reducing copies of large manifest files using const references
 2016-04-20 13:17:57 +09:00
minggo 5883c7c388 Merge pull request #15459 from MSOpenTech/v3.11-winrt-certs 
v3.11 updated expiration dates of all winrt test app and template certificates
 2016-04-20 12:00:12 +08:00
Ce Zheng 5858687161 fix AssetManagerEx bug when the last task fails 
This fixes #15463
 2016-04-20 12:53:38 +09:00
Ce Zheng 7f1b02ab92 Merge branch 'fix/ios_downloader_crashes_with_storage_path_containing_spaces' into fix/several_network_bugs 2016-04-20 12:12:31 +09:00
minggo e62467e484 Merge pull request #15455 from MSOpenTech/v3.11-update-config 
v3.11 update config.json version to v3-deps-91
 2016-04-20 10:36:11 +08:00
Dale Stammen 4d7bf1f827 updated expiration dates of all winrt test app and template certificates 2016-04-19 09:07:30 -07:00
Dale Stammen f578042d26 update version to v3-deps-91 2016-04-18 21:20:25 -07:00
Dale Stammen 69bd994760 added missing _USRJSSTATIC preprocessor define (#15438) 2016-04-18 15:10:35 +08:00
minggo 14c57c524f Merge pull request #15429 from minggo/sync-v3 
fix: compile in Windows
 2016-04-15 10:06:47 +08:00
minggo 80e532658c Merge pull request #15430 from minggo/release-note-v311 
[ci skip]Release note v311
 2016-04-15 09:48:36 +08:00
minggo 2f86809804 update release note 2016-04-15 09:46:56 +08:00
Ricardo Quesada 3eb7d62e6e fix: compile in Windows 
Github issue #15372
 2016-04-15 09:33:19 +08:00
minggo 8c7ae26f62 Merge pull request #15427 from MSOpenTech/v3.11-winrt-curl 
V3.11 winrt curl 7.48 update
 2016-04-15 09:28:56 +08:00
Dale Stammen a48752011c Merge branch 'v3.11' of https://github.com/cocos2d/cocos2d-x into v3.11-winrt-curl 2016-04-14 07:32:46 -07:00
minggo 009c7926f6 update changelog (#15424) 2016-04-14 15:09:58 +08:00
zilongshanren e987f13d56 Merge pull request #15422 from CocosRobot/update_cocosfiles_1460599040 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-13 21:02:18 -05:00
CocosRobot d1ced49baa [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-14 01:57:22 +00:00
zilongshanren 637d5f5362 Merge pull request #15421 from zilongshanren/update-3rd-party-libs-311 
upgrade deps to 90
 2016-04-13 20:53:20 -05:00
zilongshanren 2b4f3cf898 upgrade deps to 90 2016-04-14 09:16:51 +08:00
Dale Stammen fe84af5dbd added zlib.dll 2016-04-12 17:18:47 -07:00
Dale Stammen acb38c9f16 ignore VS 2015 .VC.db files 2016-04-12 16:19:03 -07:00
minggo 61a83aca2e Merge pull request #15407 from minggo/sync-to-v3.11 
Sync to v3.11
 2016-04-11 12:53:52 +08:00
minggo 3b5c1eb0f2 update web submodule 2016-04-11 11:55:45 +08:00
James Chen f3e6e8331a Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener. 2016-04-11 11:54:15 +08:00
Juan Luis Boya García 9c4f3ffa8d Make selectedSprite optional in JSB too 2016-04-11 11:53:53 +08:00
minggo d2519b9342 Merge pull request #15406 from pandamicro/v3.11 
Sync necessary changes to v3.11 and update web engine
 2016-04-11 11:36:34 +08:00
Бесшапошников Никита 54e457f1be Fixed ccui scroll widgets constants for JS bindings 2016-04-11 11:29:00 +08:00
Бесшапошников Никита 32b64831da Fixed ccui.ListView Test 2016-04-11 11:28:46 +08:00