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

33544 Commits

Author SHA1 Message Date
Ricardo Quesada e5032dccc0 rootObject/unrootObject working again 2015-12-03 14:49:23 -08:00
Ricardo Quesada bd943c5415 Sequence/Spawn converted to use new API 2015-12-03 13:56:00 -08:00
CocosRobot 3edadc035b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 21:34:13 +00:00
Ricardo Quesada ef76c0ff01 Merge pull request #14571 from ricardoquesada/seq_spawn_init_api 
Sequence + spawn init api
 2015-12-03 13:19:09 -08:00
Ricardo Quesada f14688464f spawn2 in the correct place 2015-12-03 12:18:33 -08:00
Ricardo Quesada 3646d1e9fc Adds init(array) for Sequence and Spawn 
it also makes the code cleaner.
this is needed for JS
 2015-12-03 12:16:21 -08:00
CocosRobot 2b55b92e87 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 16:19:37 +00:00
Shun Lin d0ce2473a1 Merge pull request #14499 from xiaofeng11/v3_combine_safety 
Change ASSERT to safety mode
 2015-12-04 00:04:36 +08:00
mogemimi be213bf306 Fix typos in documentation 2015-12-03 21:03:00 +09:00
CocosRobot bfb148e6ef [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 11:28:02 +00:00
zilongshanren ea42c09243 Merge pull request #14566 from zilongshanren/fixIssue14564 
fix scale9sprite be culled unexpectedly
 2015-12-03 19:17:40 +08:00
pandamicro 3961114fda Merge pull request #14567 from pandamicro/v3 
Permit http access to cocos2d-x.org in test projects
 2015-12-03 19:01:25 +08:00
pandamicro c304348c34 Merge pull request #14565 from pandamicro/v3 
Add js test case for fix, improve template
 2015-12-03 18:48:34 +08:00
pandamicro 91909081da Merge pull request #14542 from pandemosth/issue_14539 
Fix for Issue 14539
 2015-12-03 18:47:17 +08:00
pandamicro e23432c6fa Merge pull request #14530 from cezheng/fix/downloader_bug_ios_android 
Fix Downloader bug iOS & Android
 2015-12-03 18:46:43 +08:00
pandamicro b6fd2e9449 Permit http access to cocos2d-x.org in test projects 2015-12-03 18:00:48 +08:00
zilongshanren 73d00b9262 fix scale9sprite be culled unexpectedly 
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
 2015-12-03 17:53:02 +08:00
pandamicro cd7d26a7cc Update web ref 2015-12-03 17:20:54 +08:00
pandamicro e7dca08df9 Add js test case for fix, improve template 2015-12-03 16:55:15 +08:00
pandamicro 4cc4dd3a9f Fix Rooting API usage issue in cocos2d_specifics 2015-12-03 16:48:25 +08:00
pandamicro 48de781fc6 Merge pull request #14563 from CocosRobot/update_lua_bindings_1449128855 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-03 16:46:15 +08:00
xiaofeng11 d5f082218a Merge pull request #25 from liamcindy/pull_14409 
revert glprogram change
 2015-12-03 16:43:23 +08:00
Liam 07bc48c1b8 revert glprogram 2015-12-03 16:29:02 +08:00
CocosRobot b1fd2277d8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-03 07:53:26 +00:00
pandamicro d0cd5ee9ab Merge pull request #14562 from ricardoquesada/js_fixes 
JS bindings fixes for Menu, Sprite and Label
 2015-12-03 15:44:01 +08:00
XiaoFeng 30874d457f Update sub module 2015-12-03 15:04:08 +08:00
XiaoFeng 70b9183ddb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 
Conflicts:
	tools/bindings-generator
 2015-12-03 14:35:36 +08:00
XiaoFeng 32b81a69f5 Add test for new API 
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
 2015-12-03 14:21:00 +08:00
pandamicro 9deee44965 Merge pull request #14548 from mogemimi/fix-deprecation-warning 
Fix deprecation warning in SkeletonRenderer
 2015-12-03 13:18:15 +08:00
pandamicro 52c14fcc1f Merge pull request #14559 from CocosRobot/update_cocosfiles_1449100563 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-12-03 13:14:47 +08:00
Ricardo Quesada 58e4d3c487 JS Menu fixes 2015-12-02 17:30:54 -08:00
Ricardo Quesada 48523572b7 label JS fixes 2015-12-02 17:23:23 -08:00
Ricardo Quesada 6e50cf883f Sprite::create() using new API... 
...also code easier to understand
 2015-12-02 16:45:28 -08:00
CocosRobot 55f1a2c466 [AUTO][ci skip]: updating cocos2dx_files.json 2015-12-02 23:56:05 +00:00
Ricardo Quesada 4ab1540ccc Merge pull request #14551 from slackmoehrle/fix_server_in_cpp_tests 
changed to cocos2d-x.org server
 2015-12-02 15:53:53 -08:00
Ricardo Quesada bc418feb96 Merge pull request #14556 from ricardoquesada/updates_js_bindings 
new js bindings
 2015-12-02 15:25:28 -08:00
Ricardo Quesada e5d722b2a8 new bindings 2015-12-02 15:24:49 -08:00
Ricardo Quesada d2dde94259 Merge pull request #14553 from ricardoquesada/js4 
JS improvements
 2015-12-02 15:19:22 -08:00
Ricardo Quesada c321d35a9a Squashed commit of the following: 
commit 000a025fb4027c26bf05f7296e2d1fbbf21abe6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Dec 2 10:38:27 2015 -0800

    updated submodule

commit b5f45a62b48493f05d75aea865158c371241973d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 19:21:34 2015 -0800

    ooops... thanks Panda

commit 85f0b9c01d5281970f748b6460107bc0ca82cdf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 18:19:16 2015 -0800

    better macro name for GC. Thanks panda

commit e42ad74a664dd2b85cbf4463a6fef8f6abc06664
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 17:10:32 2015 -0800

    RepeatForever, Repeat and Speed converted

commit 3a8130ffc06301c91c836539736bbae456f05b4d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 14:31:32 2015 -0800

    cherry-picking changes to disable retain/release from GC

commit 3ed6e00dc2d9d46248d9374a1f9874cd0b2ba67d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 12:31:04 2015 -0800

    fixes autorelease issues on rebind

commit b65f5f6b16c1542c28b04d66377a27233c6cf214
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 1 12:23:33 2015 -0800

    my JS changes... again
 2015-12-02 14:45:13 -08:00
slackmoehrle 1b4d12ced7 changed to cocos2d-x.org server 2015-12-02 15:16:05 -05:00
mogemimi d4233dd63a Fix deprecation warning in SkeletonRenderer 2015-12-03 00:09:47 +09:00
zilongshanren 3fc0d327bf Merge pull request #14544 from CocosRobot/update_lua_bindings_1449037532 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-02 18:27:03 +08:00
zilongshanren 706e005c3d Merge pull request #14543 from zilongshanren/fixLabelOverflowShrink 
fix label clamp when scaled with bmfont
 2015-12-02 18:26:46 +08:00
XiaoFeng a804c67a12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 
Conflicts:
	cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
 2015-12-02 15:07:58 +08:00
CocosRobot edd786e7f6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-02 06:30:18 +00:00
XiaoYang 867664197e Merge pull request #14526 from super626/v3 
3D Normal Map Support
 2015-12-02 14:22:20 +08:00
zilongshanren ed55d41858 fix label clamp when scaled with bmfont 2015-12-02 13:48:20 +08:00
yangxiao 45b25666ea reset submodule 2015-12-02 13:28:24 +08:00
yangxiao f07e36d167 reset submodule 2015-12-02 13:26:36 +08:00
Pan Demosthenous ef931b61af correct typo in method name of doDestroy 2015-12-02 15:23:05 +11:00