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

33665 Commits

Author SHA1 Message Date
zilongshanren df44b164ef change layout scale9 rendering type to simple 2015-12-09 14:38:53 +08:00
zilongshanren 4c99bdf04f change imageview non-s9 to simple rendering type 2015-12-09 14:26:12 +08:00
zilongshanren df2ebfbc9c change uibutton nons9 to simple rendering mode 2015-12-09 14:21:26 +08:00
Ricardo Quesada 2251b52929 Merge pull request #14611 from ricardoquesada/js_get_or_create_jsobject 
js_get_or_create_jsobject() and other stuff
 2015-12-08 20:48:58 -08:00
Ricardo Quesada 96ee343884 fixes for windows 2015-12-08 20:07:13 -08:00
zilongshanren 9fd5985581 add simple rendering mode to slider 2015-12-09 11:32:52 +08:00
XiaoFeng 724e9b42a2 Remove default focus item from "Node:UI-->1:GUI Dynamic Create Test-->4:Focus Test" 2015-12-09 11:12:42 +08:00
zilongshanren a671bf7ce9 loading bar use new scale9 feature 2015-12-09 10:41:31 +08:00
mogemimi f280a31323 Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
zilongshanren ea5dacedd0 Merge pull request #14608 from xiaofeng11/v3_310fix 
Bug fix & make test case more clear.
 2015-12-08 18:05:36 +08:00
yangxiao 6e1f38fdc4 fxi model bug 2015-12-08 16:32:06 +08:00
Ricardo Quesada e675657cae improved docstrings 2015-12-07 19:14:10 -08:00
Ricardo Quesada 13dc967b03 js_get_or_create_jsobject() and other stuff 
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()

Squashed commit of the following:

commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 19:04:24 2015 -0800

    logging added (and commented)

    will be useful in the future

commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 19:00:09 2015 -0800

    new js_get_or_create_jsobject<T>

    Specializes Template on cocos2d::Ref.
    When Ref, it calls the `jsb_ref` functions

commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 13:31:52 2015 -0800

    singletons converted

commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 12:20:07 2015 -0800

    getDescendants() converted
 2015-12-07 19:05:23 -08:00
zilongshanren 5ef1c92420 Merge pull request #14609 from zilongshanren/fixLabelClampIssue 
fix horizontal clamp and shrink issue
 2015-12-07 19:45:19 +08:00
XiaoFeng 73d0f8a46e Bug fix & make test case more clear. 
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
 2015-12-07 18:36:28 +08:00
zilongshanren 6f7e5a5c06 Merge pull request #14607 from liamcindy/v3_issuseRevert 
revert error changes
 2015-12-07 18:16:49 +08:00
zilongshanren 6c17ef4baf fix horizontal clamp and shrink issue 2015-12-07 18:13:03 +08:00
Liam 15072a6dd3 revert error changes 2015-12-07 16:21:12 +08:00
pandamicro 9ff4fb4f7e Merge pull request #14604 from dumganhar/actionnode-fix 
Bug fix for ActionNode in CocosStudio, please don't use weak reference.
 2015-12-07 15:49:16 +08:00
James Chen 462796d2dd Bug fix for ActionNode in CocosStudio, please don't use weak reference. 2015-12-07 15:06:50 +08:00
zilongshanren e1656264fc Merge pull request #14601 from CocosRobot/update_lua_bindings_1449457848 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-07 14:27:06 +08:00
zilongshanren 9d85b6ca04 Merge pull request #14602 from CocosRobot/update_lua_bindings_1449458892 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-07 14:26:53 +08:00
CocosRobot 7e803cbd0a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-07 03:30:43 +00:00
xiaofeng11 2efab7d2df Merge pull request #14586 from xiaofeng11/v3_xf 
Add missing export declaration.
 2015-12-07 11:24:29 +08:00
CocosRobot 64fa2de345 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-07 03:13:21 +00:00
zilongshanren c9d32a83b8 Merge pull request #14597 from mogemimi/fix-api-spelling 
Fix misspelled APIs in v3.10
 2015-12-07 11:07:13 +08:00
XiaoFeng b435f1df86 Fix wrong #endif statement 2015-12-07 10:44:52 +08:00
XiaoFeng 0328c31596 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_xf 2015-12-07 10:27:38 +08:00
Ricardo Quesada 622c34e8ba Merge pull request #14591 from ricardoquesada/js_more_conversions 
Js more conversions
 2015-12-06 08:27:13 -08:00
Ricardo Quesada d02f4afd4a using new bindings templates 
ignores createInstance() from ui
 2015-12-05 22:26:54 -08:00
mogemimi c7640c8aaf Replace 'resoucedata' with 'resourcedata' in JS Binding 2015-12-05 18:59:54 +09:00
mogemimi 745f54b421 Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
mogemimi 09c6e5d2f7 Replace 'Disabeld' with 'Disabled' 2015-12-05 18:59:54 +09:00
Ricardo Quesada aebfefd7a8 Merge branch 'v3' into js_more_conversions 2015-12-04 19:01:20 -08:00
Ricardo Quesada cd8631ef09 sfunction "create" uses new optimized code 
...although this code should never be called
 2015-12-04 18:42:31 -08:00
Pan Demosthenous 54ac5d8d2e fix allocation issue with remote images 2015-12-05 10:10:58 +11:00
Slack-Moehrle 558c4cf248 added learning, spreading the word, where to get help 
added learning, spreading the word, where to get help
 2015-12-04 15:27:51 -05:00
XiaoFeng 76bd37e109 Add missing export declaration. 2015-12-04 19:40:09 +08:00
pandamicro d371ec2c8a Merge pull request #14585 from CocosRobot/update_lua_bindings_1449222153 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-04 17:53:46 +08:00
pandamicro 51acfa8908 Merge pull request #14581 from xiaofeng11/v3_xf 
Add missing lua engine export declaration.
 2015-12-04 17:51:38 +08:00
CocosRobot d5e54bdb81 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 09:48:13 +00:00
pandamicro 6ff2586f26 Merge pull request #14574 from super626/v3 
Fix Sprite3D::setMaterial when multiple meshes exist
 2015-12-04 17:38:56 +08:00
XiaoFeng 1b6a13d4b5 Fix compile error 2015-12-04 17:22:41 +08:00
pandamicro 88d2987fb1 Merge pull request #14582 from CocosRobot/update_cocosfiles_1449216428 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-12-04 16:16:41 +08:00
CocosRobot ddb0fc91b2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-12-04 08:07:09 +00:00
pandamicro 1820a006ba Merge pull request #14502 from xiaofeng11/v3_combine_2d 
Combine Studio change for 2d components
 2015-12-04 16:05:24 +08:00
XiaoFeng 8f9ea8a87e Add missing lua engine export declaration. 2015-12-04 15:23:59 +08:00
pandamicro 968d038d2c Merge pull request #14579 from CocosRobot/update_lua_bindings_1449212834 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-04 15:15:30 +08:00
XiaoFeng 71217fd393 Fix indent 2015-12-04 15:14:47 +08:00
CocosRobot d09eae92f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-04 07:13:02 +00:00