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

35491 Commits

Author SHA1 Message Date
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 efe87b84db Merge pull request #15478 from CocosRobot/update_lua_bindings_1461209678 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-21 15:41:10 +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
zilongshanren 8fd5ef232f Merge pull request #15486 from CocosRobot/update_lua_bindings_1461222309 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-21 15:37:51 +08:00
CocosRobot 361e054d6d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 07:07:41 +00:00
minggo 7ccd05548e Merge pull request #13936 from Shulepov/app_controller_synthesize_window 
AppController: synthesize window #13285
 2016-04-21 15:02:07 +08: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
CocosRobot 43d4241432 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 03:37:00 +00:00
minggo 82ac46152f Merge pull request #15474 from minggo/update-console 
update cocos2d-console
 2016-04-21 11:35:00 +08: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
minggo 59f063a39b Merge pull request #15477 from CocosRobot/update_lua_bindings_1461203553 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-21 09:55:52 +08: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 e6d845a22e Merge pull request #15471 from ricardoquesada/issue15423_bis 
fix: fix issue 15423 for v3.11
 2016-04-21 09:42:57 +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
minggo ba78999ffd update cocos2d-console 2016-04-21 09:39:19 +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
minggo ebf558ae23 Merge pull request #15470 from CocosRobot/update_lua_bindings_1461144524 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-20 17:50:13 +08: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
Ce Zheng f3cd1298af improve asset manifest diff performance 
By reducing copies of large manifest files using const references
 2016-04-20 13:17:57 +09:00
minggo 5883c7c388 Merge pull request #15459 from MSOpenTech/v3.11-winrt-certs 
v3.11 updated expiration dates of all winrt test app and template certificates
 2016-04-20 12:00:12 +08:00
Ce Zheng 5858687161 fix AssetManagerEx bug when the last task fails 
This fixes #15463
 2016-04-20 12:53:38 +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 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