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

11789 Commits

Author SHA1 Message Date
mogemimi d2c46167c3 Fix compiler warning C4804 under Visual Studio 2016-04-25 10:46:33 +09:00
Naoto Yoshioka d42cb71a27 Warn if fontDef.charID exceeds 16bits. 2016-04-25 01:02:50 +09:00
Steve Tranby 510e7b831e csv support working test 2016-04-23 17:31:10 -06:00
treert 2c4b634a50 reset UIGrayScale Shader when reload shaders 
reset GLProgram for UIGrayScale Shader when reload shaders
 2016-04-23 13:33:22 +08:00
NamJunHyone ea2b73c30e Renamed ignoreAnchorPointForPosition() 2016-04-22 22:29:49 +09:00
NamJunHyone 401f3a84ac Renamed ignoreAnchorPointForPosition() 2016-04-22 21:36:02 +09:00
mogemimi 71677ee286 Fix unused variable warning when building with Xcode 2016-04-22 20:25:32 +09:00
minggo 5aa83ef1cf Merge pull request #15490 from mogemimi/fix-signed-unsigned-mismatch 
Fix warnings about signed/unsigned mismatch
 2016-04-22 13:54:52 +08:00
Steve Tranby 0f0c9b627b Add support for Unsigned with CCValue (#13785) 
Add support for Unsigned with CCValue
 2016-04-22 13:49:20 +08:00
mogemimi a3ad4cddf8 Fix warnings about signed/unsigned mismatch 2016-04-22 12:20:05 +09:00
minggo 16c7a594c8 Merge pull request #14005 from wighawag/draw_node_shader_fix 
allow to use custom shader uniforms and attributes on drawNode
 2016-04-22 10:49:41 +08:00
minggo 2c75a4cf39 Merge pull request #15480 from mogemimi/remove-unary-operator 
Remove incorrect unary operator to fix warnings
 2016-04-21 15:42:29 +08:00
minggo 488ceb485d Merge pull request #14547 from colajam93/fix-linux-clang-build 
Add missing header
 2016-04-21 15:38:53 +08:00
CocosRobot 361e054d6d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 07:07:41 +00:00
minggo 6459c92ee7 Merge pull request #13950 from Almax27/patch-4 
Added CC_PROPERTY const qualifier
 2016-04-21 14:56:01 +08:00
minggo 7de8f761d0 Merge pull request #14123 from jgod/patch-2 
Check that textureAtlas isn't null before removing quads in SpriteBatchNode
 2016-04-21 14:44:32 +08:00
minggo 949112fdc2 Merge pull request #14321 from pandemosth/socketIO_issue_14287 
Fix SocketIO crash on reconnect
 2016-04-21 14:28:21 +08:00
minggo fcd8aa30f4 Merge pull request #14312 from TimothyZhang/jsb-getDataFromFile-should-return-null-if-read-failed 
return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile
 2016-04-21 14:17:44 +08:00
minggo de3dac7664 Merge pull request #14090 from SongCF/v3 
issues #14050 ActionManager memory leak
 2016-04-21 14:09:52 +08:00
mogemimi eae7ec40ef Remove incorrect unary operator to fix warnings 2016-04-21 14:39:42 +09:00
MURAKAMI Yukio 9514b51057 Console refactor (#15013) 2016-04-21 11:31:20 +08:00
Ricardo Quesada b8eae430fb Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor 
extend the RichText
 2016-04-20 20:05:29 -07:00
CocosRobot f4c9ea3902 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 01:54:49 +00:00
minggo 481c55adb2 Merge pull request #15466 from wefiends/spriteframe-clone 
Copy polygonInfo when cloning SpriteFrame
 2016-04-21 09:49:00 +08:00
minggo 6b262a55cb Merge pull request #15472 from mogemimi/fix-deprecation-warning 
Fix deprecation warning caused by PageView::getPages()
 2016-04-21 09:47:49 +08:00
minggo b0ae128ec3 Merge pull request #15066 from TheCodez/patch-2 
setPhysicsBody can be called multiple times again
 2016-04-21 09:40:28 +08:00
Yukio Murakami a8ddbdc12c defaults and append tag support 2016-04-21 10:03:57 +09:00
Ricardo Quesada 775db978da fix: fix issue 15423 for v3.11 
Github issue #15423
 2016-04-20 08:41:20 -07:00
mogemimi 4dfdd159b7 Fix deprecation warning caused by PageView::getPages() 2016-04-21 00:28:34 +09:00
TheCodez afdd600045 Fix setPhysicsBody method 2016-04-20 11:46:10 +02:00
CocosRobot a9184f1047 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-20 09:31:06 +00:00
AlwynC 4c7e4671d9 Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. (#15194) 2016-04-20 17:25:31 +08:00
Nicholas Barrios 20b31eb1e8 Copy polygonInfo when cloning SpriteFrame 2016-04-20 03:04:19 -04:00
minggo 0a609e9176 Merge pull request #15461 from ricardoquesada/issue_15423 
fix: fix crash in win for rich text
 2016-04-20 13:41:07 +08:00
Ce Zheng 200c9fda59 fix HTTPAsyncConnection bad memory management 
Removed a redundant release on certDataRef that caused crash on
NSURLConnectionLoader thread.
Fixed a memory leak of SecCertificateRef
This fixes #15464
 2016-04-20 14:04:44 +09:00
Ce Zheng d848292860 make android downloader taskQueue thread 
My previous fixes for the android downloader in #14530 are not thread
safe, this commit fixes the problem
 2016-04-20 13:42:00 +09:00
minggo 08b000bacf Merge pull request #14426 from pyrosphere/fix-controller-ios6 
Fix crash when using cocos2d::Controller on iOS6
 2016-04-20 11:45:13 +08:00
minggo 3a7195f4b0 Merge pull request #14485 from cpascal/fix_libexport 
Fix app-project generates .lib file in Win32
 2016-04-20 11:26:25 +08:00
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 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
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 f9f751834a Add missing float suffix to avoid warning C4305 2016-04-20 03:54:47 +09: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
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
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
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
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
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
Ricardo Quesada 3eb7d62e6e fix: compile in Windows 
Github issue #15372
 2016-04-15 09:33:19 +08:00
mogemimi 0825b1cc96 Fix indentation for readability 2016-04-15 04:31:19 +09:00
Xpol Wan cb0e768f32 Fixes warning: field 'isVertsOwner' will be initialized after field 'rect'. 2016-04-14 17:09:37 +08:00
xpol 3780064a82 Allow inherit form platform fileutils (#15304) 
* Allow inherit form FileUtilsLinux, FileUtilsWin32 and FileUtilsWinRT.

* Removed objc from CCFileUtils-apple.h

define FILEUTILS_APPLE_ENABLE_OBJC to enable FileUtilsApple:setBundle() for compatibility.

* Smart pointers heal us all.

* Add config macro in ccConfig.h and prefix with CC_.

* enabled by default.
* use #if rather than #ifndef.

* Do not deprecate setBundle.
 2016-04-14 11:59:24 +08:00
minggo 6e7ab0fb46 Merge pull request #15395 from Sai628/v3 
Bug fix: CCValue operator overloading of Comparison "==" in case Type::VECTOR
 2016-04-14 11:58:19 +08:00
Dale Stammen fe84af5dbd added zlib.dll 2016-04-12 17:18:47 -07:00
CocosRobot 7d9946a9cc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-11 09:56:18 +00:00
zilongshanren abfce2617e Merge pull request #15399 from geemedia/pageview-turning-time-configurable 
Make PageView page turning event time tweak configurable.
 2016-04-11 04:50:46 -05:00
James Chen f3e6e8331a Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener. 2016-04-11 11:54:15 +08:00
Juan Luis Boya García 9c4f3ffa8d Make selectedSprite optional in JSB too 2016-04-11 11:53:53 +08:00
Бесшапошников Никита 54e457f1be Fixed ccui scroll widgets constants for JS bindings 2016-04-11 11:29:00 +08:00
Ricardo Quesada fea84b8af3 fix: use chipmunk v6.2 API whenever possible 
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
 2016-04-11 11:12:34 +08:00
pandamicro 79cfe8ac0e Fix a issue in cc.CallFunc JSB implementation 2016-04-11 11:12:13 +08:00
CocosRobot 150ec2e7ce [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-11 11:11:54 +08:00
pandamicro f9f9551645 Fix some issues 
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
 2016-04-11 11:11:34 +08:00