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

32393 Commits

Author SHA1 Message Date
子龙山人 ae7b45a569 Merge pull request #13732 from CocosRobot/update_lua_bindings_1441765845 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-09 10:42:04 +08:00
CocosRobot 2423f05024 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 02:37:17 +00:00
子龙山人 20531061a2 Merge pull request #13728 from CocosRobot/update_lua_bindings_1441765050 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-09 10:36:54 +08:00
子龙山人 54c1e208bf Merge pull request #13730 from CocosRobot/update_cocosfiles_1441765709 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-09 10:36:32 +08:00
pandamicro 9814851355 Merge pull request #13659 from seivan/patch-2 
EventListenerMouse will dispatch EventMouse events
 2015-09-09 10:34:12 +08:00
CocosRobot df4da8ffa0 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-09 02:28:31 +00:00
pandamicro dc607a1784 Merge pull request #13726 from jianglong0156/actionExtendSquash 
support custom action, and rewrite update function
 2015-09-09 10:25:56 +08:00
CocosRobot a78f5e3dcc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 02:23:01 +00:00
子龙山人 f206f60c41 Update .travis.yml 2015-09-09 10:10:24 +08:00
江龙 badd80bf3a support custom action, and rewrite update function 
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
    ctor:function (duration, deltaPos, deltaY) {
        this._super(duration, deltaPos, deltaY);
    },
    update:function (dt) {
        this._super(dt);

        if (this.getTarget()) { // rand color
            this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
        }

    }
});
 2015-09-09 10:08:07 +08:00
Neo Kim 586af44fe6 ListView - Add getter / setter for magnetic out of boundary flag. 2015-09-09 10:29:19 +09:00
Neo Kim b28b8146e7 ListView - Add the logic for magnetic bounce back. 2015-09-09 10:29:19 +09:00
Neo Kim 3085e1385c ListView - Add 'startMagnetScroll()' for non-inertia scroll. 2015-09-09 10:29:18 +09:00
Neo Kim e58c073186 ListView - Apply magnetic to inertia scroll. 2015-09-09 10:29:18 +09:00
Neo Kim ca3ea53ffd ListView - Add enum for magnetic type and test cases for magnetic scroll. 2015-09-09 10:29:18 +09:00
Neo Kim d8fc04d109 ListView - Add 'scrollToItem' method and its test cases. 2015-09-09 10:29:18 +09:00
Neo Kim 2599271410 ListView - Add APIs which return the closest item in specific position in current view. 2015-09-09 10:29:17 +09:00
Neo Kim a4e5f7c0a8 ScrollView - Refactor the logic about getting out of boundary amount. 2015-09-09 10:28:47 +09:00
Neo Kim 90891f9efb ScrollView - Add a utility function 'flattenVectorByDirection()' 2015-09-09 10:28:46 +09:00
Neo Kim ea79d92aa1 ScrollView - Fix an issue which occurs when auto scroll is started during already bouncing back. 2015-09-09 10:28:46 +09:00
Neo Kim 7394b3f467 ScrollView - Rename 'startAutoScrollChildrenWithDestination()' to 'startAutoScrollToDestination' and 'duration' to 'time'. 2015-09-09 10:28:46 +09:00
Neo Kim c037769e62 ScrollView - Correct auto scroll direction 2015-09-09 10:28:45 +09:00
Neo Kim 2dec85e175 ScrollView - Fix that the last touch when release was not considered for inertia scroll 2015-09-09 10:28:45 +09:00
Neo Kim 5f469264fc ScrollView - Refactor auto scroll for simpler implementation 
- Remove auto scroll callback
 2015-09-09 10:28:45 +09:00
Neo Kim ad01bc7699 ScrollView - Add startAttenuatingAutoScroll() 2015-09-09 10:28:44 +09:00
Neo Kim 3cff03e8ed ScrollView - Remove movement callback from auto scroll. 2015-09-09 10:28:44 +09:00
Neo Kim 0c4414625a ScrollView - Rectify wrong indentations 2015-09-09 10:28:44 +09:00
Nathanael Weiss 14b9c2e75c Fix crash in FrameBuffer if no DepthStencil 
This fixes a debug-config crash if a FrameBuffer has no `RenderTargetDepthStencil`.
 2015-09-08 13:13:38 -07:00
江龙 d6934cfc4b rename var resumeDownloaded to resumeDownloaded. 2015-09-08 16:38:02 +08:00
江龙 8daf026c6c fix the AssetsManagerEx can not continuous transmission for large zip file. 
the testcase is extension/assetsmanager
 2015-09-08 16:34:02 +08:00
zhangbin 523d4420bf Add Container tests. 2015-09-08 16:33:03 +08:00
zhangbin 5bb3f1b9c4 Add Math tests. 2015-09-08 15:49:04 +08:00
zhangbin 44b916ad74 Add Callback tests. 2015-09-08 15:29:56 +08:00
zhangbin a3c730e014 Optimize the output file format. 2015-09-08 14:33:38 +08:00
zhangbin 8bceb9c0ba Add Scenario tests. 2015-09-08 14:06:23 +08:00
pandamicro d60eb21d59 Merge pull request #13710 from minggo/implement-function-in-cpp 
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
 2015-09-08 13:28:19 +08:00
pandamicro eab6dbe6fd Merge pull request #13711 from minggo/crash-in-dynamic-library 
don't define static variable in header file or each dynamic lib will have a copy
 2015-09-08 11:45:12 +08:00
minggo d86b256396 don't define static variable in header file or each dynamic lib will have a copy 2015-09-08 11:04:51 +08:00
minggo 3510990a23 Merge pull request #13709 from minggo/physics-component-squash 
add physics component
 2015-09-08 10:45:54 +08:00
minggo bbe5861367 fix crash on xiaomi2 if cocos2d-x is built as a dynamic library 2015-09-08 10:26:37 +08:00
minggo 8326ed6535 add physics component 2015-09-08 09:54:01 +08:00
Seivan Heidari 2f02690394 EventListenerMouse will dispatch EventMouse events 2015-09-07 20:05:51 +02:00
子龙山人 75882e64a0 Merge pull request #13646 from neokim/refactor_scrollview_inertia_scroll 
Refactor scroll view's inertia scroll
 2015-09-07 22:38:20 +08:00
子龙山人 aec82b97a3 Merge pull request #13708 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-09-07 17:39:09 +08:00
zhangbin d145416e1f Update the reference of submodule cocos2d-console. 2015-09-07 17:36:54 +08:00
pandamicro 00abec6c2c Merge pull request #13707 from pandamicro/fix_layerrgba 
[ci skip] Fix compile error in __LayerRGBA
 2015-09-07 17:27:46 +08:00
TheCodez d77045818c Fix compile error in __LayerRGBA 2015-09-07 17:25:56 +08:00
zhangbin 669fc10d37 Clean the data when the auto tests are finished. 2015-09-07 16:40:47 +08:00
WenhaiLin e500b960f3 AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call. 2015-09-07 16:29:57 +08:00
zhangbin 0571383889 Add EventDispatcher tests. 2015-09-07 16:20:20 +08:00