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

35679 Commits

Author SHA1 Message Date
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
zilongshanren 001a0ee812 remove useless warning log of stencil buffer. (#15396) 
1. disable GC for Native object

2. improve js tests of label
 2016-04-18 15:43:54 +08:00
Xpol Wan 8c3137b07f Fixes warning about unused static constants. 2016-04-18 15:38:51 +08:00
minggo b88dc87b0a Merge pull request #15428 from mogemimi/fix-indent 
Fix indentation for readability
 2016-04-18 15:20:54 +08:00
Dale Stammen 69bd994760 added missing _USRJSSTATIC preprocessor define (#15438) 2016-04-18 15:10:35 +08:00
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
minggo c26eb228b2 refactor cmake 2016-04-18 15:03:06 +08:00
zilongshanren 7029df89cc Merge pull request #15434 from scphillips/layout-clipping-fix 
Fixed typo in UILayout using clipping rect x instead of y coordinate.
 2016-04-17 22:43:03 -05:00
zilongshanren 5730f024d1 Merge pull request #15440 from CocosRobot/update_cocosfiles_1460943818 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-17 22:12:24 -05:00
CocosRobot f136e9d94e [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-18 01:43:40 +00:00
zilongshanren b0b2d8a5e8 Merge pull request #15344 from xpol/withespaces-does-matter 
Withespaces does matter
 2016-04-17 20:41:26 -05:00
Stephen Phillips 7b35f31016 Fixed typo in UILayout using clipping rect x instead of y coordinate. 2016-04-15 13:45:21 +01:00
minggo 14c57c524f Merge pull request #15429 from minggo/sync-v3 
fix: compile in Windows
 2016-04-15 10:06:47 +08:00
minggo 80e532658c Merge pull request #15430 from minggo/release-note-v311 
[ci skip]Release note v311
 2016-04-15 09:48:36 +08:00
minggo 2f86809804 update release note 2016-04-15 09:46:56 +08:00
Ricardo Quesada 3eb7d62e6e fix: compile in Windows 
Github issue #15372
 2016-04-15 09:33:19 +08:00
minggo 8c7ae26f62 Merge pull request #15427 from MSOpenTech/v3.11-winrt-curl 
V3.11 winrt curl 7.48 update
 2016-04-15 09:28:56 +08:00
mogemimi 0825b1cc96 Fix indentation for readability 2016-04-15 04:31:19 +09:00
Dale Stammen a48752011c Merge branch 'v3.11' of https://github.com/cocos2d/cocos2d-x into v3.11-winrt-curl 2016-04-14 07:32:46 -07:00
minggo f07b6a6804 Merge pull request #15425 from xpol/fixes-warning-reorder 
Fixes warning: field 'isVertsOwner' will be initialized after field 'rect'
 2016-04-14 18:08:28 +08:00