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

32691 Commits

Author SHA1 Message Date
CocosRobot b3976cdd63 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 06:08:45 +00:00
pandamicro 280f3efdfb Merge pull request #13740 from KAlO2/v3 
fix typos
 2015-09-09 14:00:53 +08:00
WenhaiLin 34be2065e4 Refine ComponentContainer to improve performance 2015-09-09 11:53:55 +08:00
Martin Taylor e592a1a02d fix typos 2015-09-09 11:37:41 +08:00
yangxiao ff85173b4b remove cached material switch test demo 2015-09-09 11:13:17 +08:00
pandamicro 747fab26a8 Merge pull request #13735 from jianglong0156/actionExtendReverse 
[ci skip]add action reverse issue test case
 2015-09-09 11:12:47 +08:00
yangxiao 153bdb7170 add comment 2015-09-09 11:11:17 +08:00
江龙 ac1af6cd91 add action reverse issue test case 2015-09-09 11:09:40 +08:00
子龙山人 8c46edb964 Merge pull request #13734 from CocosRobot/update_cocosfiles_1441766981 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-09 10:56:27 +08:00
子龙山人 b8494f3ba3 Merge pull request #13733 from CocosRobot/update_lua_bindings_1441766304 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-09 10:56:14 +08:00
CocosRobot c2e18e9737 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-09 02:49:42 +00:00
pandamicro f7f8a42ecf Merge pull request #13722 from NatWeiss/patch-17 
Fix crash in FrameBuffer if no DepthStencil
 2015-09-09 10:46:58 +08:00
CocosRobot d9402da0bc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 02:44:51 +00:00
子龙山人 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
yangxiao 7f7b4f83c4 add outline material 2015-09-08 15:33:24 +08:00
zhangbin 44b916ad74 Add Callback tests. 2015-09-08 15:29:56 +08:00
yangxiao f944750627 add material cache 2015-09-08 15:29:54 +08:00
zhangbin a3c730e014 Optimize the output file format. 2015-09-08 14:33:38 +08:00
yangxiao 2076071e8f outline test using material file 2015-09-08 14:13:53 +08:00