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

35453 Commits

Author SHA1 Message Date
minggo 997011601e revert correct search path 2016-05-06 15:58:43 +08:00
minggo 44958d7361 not add invalid search paths 2016-05-06 15:54:08 +08:00
minggo f1557211fc Merge pull request #15578 from mogemimi/fix-warning-c4800 
Suppress warning C4800 on MSVC
 2016-05-06 14:06:27 +08:00
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
minggo 8068c51d94 remove studio related test cases and resources (#15574) 
* remove studio related test cases and resources

* remove unneeded files
 2016-05-06 13:38:19 +08:00
mogemimi 694259bf80 Suppress warning C4800 on MSVC 2016-05-06 12:30:16 +09:00
TheCodez 4de7ef1515 Fix setPhysicsBody method 2016-05-06 09:29:57 +08:00
Steve Tranby 7c1e60f0b7 Prevent memory leak: force drain on autoreleased `data`. 2016-05-05 08:00:28 -06: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
minggo 9218329968 Merge pull request #15569 from minggo/issue-15522 
Fix compile error isnan -> std::isnan
 2016-05-05 11:36:24 +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
minggo e2c38ed87f make std::isnan work for winrt 2016-05-05 10:29:31 +08:00
zilongshanren 8c046fea92 fix jsb 3.11 related issues 2016-05-05 10:20:00 +08:00
minggo 03b38bcee2 Merge branch 'fix_isnan' of https://github.com/gelldur/cocos2d-x into issue-15522 2016-05-05 10:17:17 +08:00
minggo 859bba0026 Merge pull request #15567 from mogemimi/fix-minor-typos 
Fix typos in documentation and comments
 2016-05-05 10:02:08 +08:00
mogemimi 2df9afbe71 Fix typos in documentation and comments 2016-05-05 08:05:20 +09: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
minggo 32fc654b84 Merge pull request #15561 from minggo/merge-to-v3 
Merge v3.11 back to v3
 2016-05-04 16:50:09 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +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
halx99 9ff61f915c Add findChild for cocos2d::utils (#15548) 
* Add searchNode for cocos2d::utils

Add searchNode for cocos2d::utils

* fix compile error on win32_bak

* convert line terminates to unix sytle.

* Rename searchNode to findChild, and etc.

* fix compile error.
 2016-05-04 09:46:00 +08:00
minggo b67ecd8c16 Merge pull request #15553 from cocos2d/fix-lua-framework 
fix display.wrapScene()
 2016-05-04 09:43:50 +08:00
minggo 0eb25af347 Merge pull request #15555 from mogemimi/remove-c-str-calls 
Reduce unnecessary c_str() calls
 2016-05-04 09:43:01 +08:00
minggo 4766e0dd9b Merge pull request #15545 from minggo/isse-15540 
avoid remove event listener multiple times
 2016-05-04 09:39:38 +08:00
minggo 6260c67941 Merge pull request #15549 from minggo/issue_15525 
use std::atof() instead
 2016-05-04 09:38:42 +08:00
minggo fea33babc5 Merge pull request #15556 from CocosRobot/update_cocosfiles_1462325039 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-05-04 09:37:56 +08:00
CocosRobot 2184600565 [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-04 01:24:01 +00:00
Adrien de Sentenac 1a76c9ea3b Add OBB (zip) support (#15515) 
* Add OBB support.
OBB must be a zip file with audio and video files stored uncompressed.

* Use introspection to be able to build with Android API level 10.
Using the new audio engine to play sounds from the OBB will only work with API level 12 (Android 3.1) or above.
 2016-05-04 09:21:35 +08:00
mogemimi 8429b34010 Reduce unnecessary c_str() calls 2016-05-04 04:18:25 +09: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 1bf56d5a78 use std::atof() instead 2016-05-03 15:50:06 +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
minggo d41207e99a avoid remove event listener multiple times 2016-05-03 10:56:03 +08:00