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

35679 Commits

Author SHA1 Message Date
minggo f4a7ba836c Merge pull request #15599 from Naruto/feature/fix_build_error_using_fileutils-apple 
fix build failed using FileUtilsApple on Application code.
 2016-05-10 12:07:16 +08:00
CocosRobot 530d890c6c [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-10 02:41:22 +00:00
minggo c32c2d050b Merge pull request #15600 from minggo/updtea-release-note 
[ci skip]update release note
 2016-05-10 10:38:41 +08:00
minggo aa94836190 update release note 2016-05-10 10:36:14 +08:00
Naruto TAKAHASHI 79b9a191d0 declare explicitly FileUtilsApple destructor 2016-05-09 21:50:52 +09:00
minggo d086965683 Merge pull request #15598 from minggo/android-package-name 
[ci skip]set correct package name
 2016-05-09 18:17:28 +08:00
minggo 2a712a0c3b set correct package name 2016-05-09 18:14:53 +08:00
Huabing.Xu e8acf38212 fix animate 3d bug 2016-05-09 15:21:19 +08:00
minggo 81f37ab4ae Merge pull request #15591 from mogemimi/prevent-shadow-warnings 
Prevent variable shadowing warnings
 2016-05-09 14:59:23 +08:00
TAKEDA Yutaka d17fdfe3cc CCSprite::createNode bug fix. 2016-05-09 15:42:39 +09:00
mogemimi bbbb7e498d Prevent variable shadowing warnings 2016-05-08 12:32:36 +09:00
minggo 5d7cbe622a Merge pull request #15589 from pandamicro/v3.11 
Add cc.game.end to close game window
 2016-05-07 22:11:46 +08:00
halx99 fc9880ab49 Add captureNode for cocos2d::utils (#15558) 
* Add captureNode for cocos2d::utils

Add captureNode for cocos2d::utils and fix CC_DLL syntax.

* Add test case for utils::captureNode

Add test case for utils::captureNode.

* Store captured image to disk with RGB.

* Trigger jenkins check
 2016-05-07 22:10:53 +08:00
minggo c4b2f6ff35 Merge pull request #15584 from VisualSJ/v3.11_bugs 
loader test bug
 2016-05-07 22:07:49 +08:00
minggo a3d737f2ad Merge pull request #15585 from zilongshanren/fix-videoplayer-issue 
fix tizen videoplayer issue of tizen
 2016-05-07 22:07:19 +08:00
pandamicro 1980311204 Fix OpenGL test issue on web 2016-05-07 17:31:58 +08:00
Naoyuki Totani 04ebba425f add missing lua const values 2016-05-07 16:23:23 +09:00
pandamicro d0fc3ec4c4 Add cc.game.end to close game window 2016-05-07 14:37:36 +08:00
pandamicro 25b9f787fc update web engine ref 2016-05-06 22:10:38 +08:00
zilongshanren e4d91f5577 fix tizen videoplayer issue 2016-05-06 18:43:26 +08:00
minggo 76d8f81771 Merge pull request #15582 from minggo/issue-isnan 
update bindings-generator to fix compiling issues on ubuntu 16.04
 2016-05-06 17:55:49 +08:00
ViusualSJ cb8cde63b1 loader test bug 2016-05-06 17:19:33 +08:00
minggo f34acca188 Merge pull request #15575 from stevetranby/capturescreen-drain-autorelease 
Prevent memory leak: force drain on autoreleased `data`.
 2016-05-06 16:57:29 +08:00
minggo dfd488a8f9 Merge pull request #15581 from minggo/issue-15571 
revert correct search path
 2016-05-06 16:48:32 +08:00
minggo ba83b6f740 Merge pull request #15580 from minggo/remove-invalid-search-path 
not add invalid search paths
 2016-05-06 16:24:04 +08:00
minggo 086df25fdc update bindings-generator to fix compiling issues on ubuntu 16.04 2016-05-06 16:19:48 +08:00
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