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

35513 Commits

Author SHA1 Message Date
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
minggo e11a7fdfe5 Merge pull request #15539 from minggo/issue-15329 
use Ref::release() to release Ref instance
 2016-05-03 09:39:14 +08:00
minggo 9f678f2f27 Merge pull request #15541 from cocos2d/fix-doxygen-mistakes 
Fix doxygen format mistakes in enum class Platform
 2016-05-03 09:38:58 +08:00
minggo 65f9c4dae8 Merge pull request #15543 from mogemimi/fix-shadow-warning 
Fix shadow variable warning in GameNode3DReader
 2016-05-03 09:34:43 +08:00
mogemimi 6433172fae Fix shadow variable warning in GameNode3DReader 2016-05-02 10:57:03 +09:00
Zhe Wang a640f007ef Fix doxygen format mistakes in enum class Platform 
An user reported this error in the forum http://forum.cocos.com/t/api-document/36199/2
I noticed that our doxygen was written in wrong format.
 2016-04-30 15:20:24 +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 3d09e529ee use Ref::release() to release Ref instance 2016-04-29 17:11:36 +08:00
minggo 22c8efcb64 Merge pull request #15535 from xpol/improve-getFileData 
Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont().
 2016-04-29 13:53:57 +08:00
minggo 86faae0cee Merge pull request #15533 from MSOpenTech/v3-winrt-templates 
V3: added missing winrt template code for inplace EditBox
 2016-04-29 10:07:12 +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
Xpol Wan f111583214 Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont(). 
* Remove unnecessary memory copy in FileUtils::getFileData()
* Add Data::takeBuffer() to simplify FileUtils::getFileData() and CCFreeTypeFont::loadFont().
 2016-04-29 09:31:09 +08: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
Dale Stammen 8f37130569 added missing winrt template code for inplace EditBox 2016-04-28 08:37:55 -07: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 e6b6d6971d Merge pull request #15529 from ricardoquesada/fix_15221 
fix: removes `friend class Game`
 2016-04-28 10:58:55 +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
Ricardo Quesada c432b23ef6 fix: removes `friend class Game` 
fixes Github issue #15221
 2016-04-27 18:57:41 -07: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
Dawid Drozd 0f19bec99d Fix compile error isnan -> std::isnan #15111 
Issue: https://github.com/cocos2d/cocos2d-x/issues/15111
 2016-04-27 13:15:08 +02: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 2a4799758d Merge pull request #15511 from xpol/signed-unsigned-mismatch 
Fixes signed/unsigned mismatch warnings.
 2016-04-27 11:34:10 +08:00
minggo fc5e537327 Merge pull request #15508 from xpol/remove-use-of-getFileData 
Remove last internal use of deprecated `FileUtils::getFileData()`.
 2016-04-27 09:38:30 +08:00
minggo 51fb49a522 Merge pull request #15512 from minggo/issue-15193 
use fullpath to play background music
 2016-04-27 09:37:45 +08:00
minggo 5fe4bd23ce Merge pull request #15514 from mogemimi/add-missing-dllexport 
Add CC_GUI_DLL to suppress warning C4275
 2016-04-27 09:37:04 +08:00
mogemimi f395cadbac Add CC_GUI_DLL to suppress warning C4275 2016-04-27 04:08:09 +09:00
Xpol Wan 1cc0130bdd Fixes signed/unsigned mismatch warnings. 
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
 2016-04-26 17:53:25 +08:00
minggo b9184ac452 Merge pull request #15509 from minggo/issue-15449 
remove unsupport flags
 2016-04-26 16:03:58 +08:00
minggo bad4ea4dc6 Merge pull request #15510 from xpol/fixes-use-of-deprecated-cc-wcslen 
Fixes warning about deprecated cc_wcslen.
 2016-04-26 16:02:57 +08:00
minggo bb4a54b042 use fullpath to play background music 2016-04-26 15:59:30 +08:00
Xpol Wan bd3c3a7c3d remove default value for size argument. 2016-04-26 14:54:20 +08:00
Xpol Wan 94944082c4 Fixes warning about deprecated cc_wcslen. 2016-04-26 14:21:25 +08:00