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

35448 Commits

Author SHA1 Message Date
minggo f49f69dac8 Merge pull request #14525 from elvman/key_none 
Add enum value for no key
 2016-04-20 11:21:43 +08: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 095f404738 Merge pull request #14735 from linguofeng/patch-2 
CCFileUtils-apple.mm Grammatical errors
 2016-04-20 11:00:38 +08: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
minggo 9ef6035951 Merge pull request #15460 from mogemimi/add-missing-float-suffix 
Add missing float suffix to avoid warning C4305
 2016-04-20 10:35:56 +08:00
minggo e16d016c46 Merge pull request #15452 from 1scaR1/fix_osx_sandbox 
Implement createDirectory for apple platform.
 2016-04-20 10:26:45 +08:00
minggo 5d3b654a74 Merge pull request #14990 from j-jorge/wic-macro-test 
Uniformize image support macro usage.
 2016-04-20 09:57:57 +08:00
Ricardo Quesada 4bb35f2219 fix: fix crash in win for rich text 
use `std::locale()` when invoking `std::isXXX` function
to avoid crash

github issue #15423
 2016-04-19 13:53:27 -07:00
mogemimi 85646b8d80 Fix warning C4305 while compiling AppDelegate with MSVC 2016-04-20 04:01:06 +09:00
mogemimi f9f751834a Add missing float suffix to avoid warning C4305 2016-04-20 03:54:47 +09:00
Dale Stammen 4d7bf1f827 updated expiration dates of all winrt test app and template certificates 2016-04-19 09:07:30 -07:00
Julien Jorge a3f28a18df Uniformize image support macro usage. 
All images format implementation but WIC test the value of a CC_USE_<FORMAT>
preprocessor macro to verify if the implementation must be available or not.
WIC support is checked against the definition of the macro only,
independently of its value, thus making the implementation available even
if CC_USE_WIC = 0.

This commit makes the tests of the CC_USE_WIC macro identical to the tests
of the other similar image format macros.
 2016-04-19 14:15:43 +02:00
minggo 29df93c5e4 Merge pull request #15458 from WenhaiLin/v3-0419 
Fixed crash and actions may not have been executed.
 2016-04-19 18:25:00 +08:00
minggo 09e476af9a Merge pull request #15450 from mogemimi/fix-deprecation-warning 
Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning
 2016-04-19 16:51:52 +08:00
Wenhai Lin a8847ccf5e Fixed crash and actions may not have been executed. 2016-04-19 16:11:54 +08:00
Бесшапошников Никита a3717b6907 Add error logging of incorrect directory creating. 2016-04-19 10:17:31 +03:00
mogemimi 87be03fe9b Fix compilation error with Platform Toolset v120 for WinRT 2016-04-19 16:13:12 +09:00
minggo 776ee8ac5a Merge pull request #14843 from cezheng/fix/ios_downloader_crashes_with_storage_path_containing_spaces 
fix iOS downloader crash when storage path contains spaces
 2016-04-19 13:46:02 +08:00
Dale Stammen f578042d26 update version to v3-deps-91 2016-04-18 21:20:25 -07:00
minggo 33a0f65b58 Merge pull request #14868 from takaken1994/feature/improve-perfomance-manifest 
Improve perfomance of manifest
 2016-04-19 11:47:53 +08:00
minggo 03ad0f01c9 Merge pull request #15001 from mogemimi/refactor-httprequest 
Refactor HttpRequest and HttpResponse
 2016-04-19 11:23:59 +08:00
minggo 5c567c54b4 Merge pull request #15198 from perminovVS/v3-dev-wrong-log-detect-image-type 
Wrong log message if use tga image
 2016-04-19 11:00:55 +08:00
minggo f24eb55378 Merge pull request #15454 from tomi-payne/v3 
Update CCSprite3D.cpp
 2016-04-19 10:55:38 +08:00
minggo f3d8d043a1 Merge pull request #15447 from xpol/use-decltype-to-avoid-side-effect-warnings 
Use decltype and std::remove_pointer to avoid side effect warnings.
 2016-04-19 10:53:15 +08:00
minggo 660002c239 Merge pull request #15446 from xpol/fixes-integer-cast-warings 
Fixes some integer cast warnings.
 2016-04-19 10:27:37 +08:00
minggo df9a9292a2 Merge pull request #15453 from mogemimi/add-missing-dllexport 
Add missing dllexport to avoid warning C4275
 2016-04-19 10:26:58 +08:00
minggo b182adae5b Merge pull request #15448 from xpol/remove-internal-use-of-getFileData 
Fixes deprecated warnings
 2016-04-19 10:24:49 +08:00
minggo 5f6f35fb91 Merge pull request #15451 from xpol/fixes-format-warnings 
Fixes format warnings.
 2016-04-19 10:21:10 +08:00
minggo 3dbabdee05 Merge pull request #15099 from feijing566/v3 
Add "id" for parser object
 2016-04-19 10:18:04 +08:00
tomi-payne fbadcf188a Update CCSprite3D.cpp 
Fixed Sprite3DCache::removeSprite3DData error
 2016-04-19 10:11:29 +08:00
mogemimi 24a09a5ae7 Add missing dllexport to avoid warning C4275 2016-04-19 04:01:13 +09:00
mogemimi d1871d1ca7 Refactor HttpRequest and HttpResponse 2016-04-19 02:58:42 +09:00
mogemimi 19c2893509 Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning 2016-04-18 19:50:59 +09:00
minggo f3fd111200 Merge pull request #14944 from mxenabled/josh/export_wicimageloader 
Export WICImageLoader form DLL
 2016-04-18 18:33:39 +08:00
minggo 93d331f1e8 Merge pull request #14965 from elloop/fix_opengl_log_function 
fix opengl log function.
 2016-04-18 18:32:00 +08:00
minggo 5bd592ca34 Merge pull request #15231 from SteveKChiu/v3 
Fix calculation of base64Encode outLength
 2016-04-18 17:54:14 +08:00
Xpol Wan dc0f7bf903 Fixes format warnings. 2016-04-18 17:52:58 +08:00
Бесшапошников Никита e555ed5b9e Implement createDirectory for apple platform. 2016-04-18 12:52:20 +03:00
minggo 9c40277e48 Merge pull request #14980 from catinred2/dev 
fix typo
 2016-04-18 17:21:40 +08:00
xiaofeng11 061fc2f287 Fix on win32 platform if cpp-tests' windows been minisized, after window restore, content size is wrong. (#15236) 2016-04-18 17:15:56 +08:00
minggo 37655ea271 Merge pull request #15091 from mogemimi/fix-null-conversion 
Fix return value of VertexAttribBinding::init()
 2016-04-18 16:52:15 +08:00
minggo 6cc80f28fc Merge pull request #15096 from fnz/volume_control 
Set music volume control as default
 2016-04-18 16:48:55 +08:00
Xpol Wan bd263d6be4 Fixes deprecated warnings 
* remove all internal use of FileUtils::getFileData().
 2016-04-18 16:45:46 +08:00
minggo 7749ba6de8 Merge pull request #15444 from xpol/fixes-warings-unused-static-consts-in-cpp 
Fixes warning about unused static constants.
 2016-04-18 16:37:10 +08:00
xpol 24db45e925 Fixes some warnings in Lua manual bindings. (#15443) 
1. Use __Type for deprecated classes.
2. Refactored LuaStack::luaLoadChunksFromZIP() and use FileUtils:getDataFromFile().
3. Fixes wrongly compare NULL with char array.
 2016-04-18 16:35:50 +08:00
minggo a667b4bf00 Merge pull request #15445 from CocosRobot/update_cocosfiles_1460965737 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-18 16:09:23 +08:00
Xpol Wan 9ea3bc4aa8 Use decltype and std::remove_pointer to avoid side effect warnings. 2016-04-18 16:07:48 +08:00
Xpol Wan 810e855f44 Fixes some integer cast warnings. 2016-04-18 16:01:19 +08:00
CocosRobot 121e784484 [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-18 07:48:59 +00:00
minggo 3e183f7206 Merge pull request #15442 from minggo/cmake-refactor 
refactor cmake
 2016-04-18 15:45:54 +08:00