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

34441 Commits

Author SHA1 Message Date
zilongshanren aa51ce463a Merge pull request #15579 from CocosRobot/update_lua_bindings_1462513306 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-05-06 13:49:11 +08:00
CocosRobot d72fadf6cc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-06 05:44:31 +00:00
minggo 38631ab655 Merge pull request #15576 from minggo/sync-15066 
Fix setPhysicsBody method
 2016-05-06 13:38:53 +08:00
TheCodez 4de7ef1515 Fix setPhysicsBody method 2016-05-06 09:29:57 +08:00
minggo 8d8a3206e6 Merge pull request #15570 from CocosRobot/update_lua_bindings_1462417508 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-05-05 11:38:02 +08:00
CocosRobot 0445e7c562 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-05 03:07:58 +00:00
minggo 44063b8e85 Merge pull request #15568 from zilongshanren/fix-jsb-related-issues 
fix jsb 3.11 related issues
 2016-05-05 11:01:44 +08:00
minggo 7886cdbe4a Merge pull request #15563 from pandamicro/v3.11 
Fix SocketIO fail to connect issue on Android
 2016-05-05 10:32:43 +08:00
zilongshanren 8c046fea92 fix jsb 3.11 related issues 2016-05-05 10:20:00 +08:00
pandamicro d2ae78aed0 Update web engine ref 2016-05-04 18:29:52 +08:00
pandamicro fcfaafa4a5 Fix SocketIO fail to connect issue on Android 2016-05-04 17:43:36 +08:00
pandamicro 2baf3bc7ac Merge pull request #15560 from pandamicro/v3.11 
Fix http arraybuffer test can not load issue
 2016-05-04 15:52:14 +08:00
pandamicro d373ae4026 Update web ref 2016-05-04 15:48:55 +08:00
pandamicro 1886ac1349 Fix http arraybuffer test can not load issue 2016-05-04 15:48:16 +08:00
minggo 978bfb2d42 Merge pull request #15559 from minggo/release-note 
[ci skip]update changelog and release note
 2016-05-04 11:55:54 +08:00
minggo b74ed7de20 update release note 2016-05-04 11:54:38 +08:00
minggo 7dcd2fe7cd update changelog 2016-05-04 11:54:30 +08:00
minggo b67ecd8c16 Merge pull request #15553 from cocos2d/fix-lua-framework 
fix display.wrapScene()
 2016-05-04 09:43:50 +08:00
dualface 2901f0aea6 fix display.wrapScene() 2016-05-03 21:37:15 +08:00
pandamicro cdb148d29a Merge pull request #15550 from pandamicro/v3.11 
Fix assets manager issue for not updating download count variables in updateAsset
 2016-05-03 19:28:25 +08:00
pandamicro 6d1517747f Fix assets manager issue for not updating download count variables in updateAsset 2016-05-03 18:01:15 +08:00
pandamicro 3d6bddd2c7 Merge pull request #15465 from cezheng/fix/several_network_bugs 
[BugFixes]Several serious bug fixes related to network/asset_manager
 2016-05-03 17:37:32 +08:00
minggo 2709bba973 Merge pull request #15547 from zilongshanren/fix-tizen-template-issue 
Fix tizen template issue
 2016-05-03 14:29:06 +08:00
minggo f2e5eb332a Merge pull request #15546 from minggo/issue_15526 
fix memory leak
 2016-05-03 14:02:38 +08:00
minggo fba4bead70 fix memory leak 2016-05-03 11:24:22 +08:00
zilongshanren c8d570c310 fix tizen template api-version issue 2016-05-03 11:22:34 +08:00
zilongshanren 675fe8e811 fix template project running 2016-05-03 11:02:22 +08:00
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