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

32706 Commits

Author SHA1 Message Date
zhangcheng f88b23f52b Move "ui::Helper::DoLayout" to "CreateNode". 2015-09-14 13:07:15 +08:00
pandamicro 9fbefb8eed Merge pull request #13786 from dumganhar/lua-xmlhttprequest-fix 
[Lua] Life control fix for XMLHttpRequest
 2015-09-14 12:12:41 +08:00
CocosRobot a4cb98d993 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-14 04:01:38 +00:00
pandamicro 1e7b78b057 Merge pull request #13795 from pandamicro/v3 
Update bindings-generator to initialize numeric/pointer variables
 2015-09-14 11:54:02 +08:00
zhangbin da24454c6c Update the reference of submodule cocos2d-console. 2015-09-14 11:46:02 +08:00
子龙山人 c532db4f11 Merge pull request #13793 from CocosRobot/update_cocosfiles_1442199430 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-14 11:36:01 +08:00
子龙山人 c013634bd5 Merge pull request #13796 from CocosRobot/update_lua_bindings_1442200986 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-14 11:35:54 +08:00
CocosRobot 643bdd8d6e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-14 03:29:24 +00:00
pandamicro b0dc83aed8 Update bindings-generator to initialize numeric/pointer variables 2015-09-14 11:22:06 +08:00
pandamicro aff87935a8 Merge pull request #13794 from pandamicro/v3 
[ci skip]Fix build_native for js default template
 2015-09-14 11:19:18 +08:00
pandamicro 737dc5ba8d Fix build_native for js default template 2015-09-14 11:18:32 +08:00
CocosRobot f8eb3a9b1a [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-14 02:57:12 +00:00
pandamicro d3a76bc872 Merge pull request #13792 from natural-law/v3 
Add tools for converting the performance tests data to excel files.
 2015-09-14 10:55:27 +08:00
zhangbin 5d47ce8f23 Add tools for converting the performance tests data to excel files. 2015-09-14 09:52:21 +08:00
Neo Kim 3fff195c20 Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary. 2015-09-13 22:32:22 +09:00
Neo Kim 7f9c8acc2a ScrollView - Add a guard statement in setContentSize() to avoid resetting inner container's position if not necessary. 2015-09-13 21:43:34 +09:00
James Chen 10e45ee744 Updates XMLHttpRequestTest.lua 2015-09-12 19:11:32 +08:00
Avail 352511c1d8 Minor typo in README 2015-09-12 12:16:10 +02:00
James Chen 6073456f23 [Lua] Life control fix for XMLHttpRequest 2015-09-12 17:49:30 +08:00
Naoyuki Totani 6da543d231 fix method name 2015-09-12 16:03:30 +09:00
pandamicro 4022fb65e1 Merge pull request #13760 from super626/materialfix2 
fix material clone
 2015-09-11 18:24:05 +08:00
子龙山人 0e9ae83376 Merge pull request #13782 from CocosRobot/update_lua_bindings_1441965150 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-11 18:06:47 +08:00
CocosRobot e79678454b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-11 09:59:04 +00:00
pandamicro 2795d0a488 Merge pull request #13779 from pandamicro/v3 
Fix Chipmunk setCollisionType issue by initializing variables
 2015-09-11 17:58:48 +08:00
子龙山人 96d6221daf Merge pull request #13723 from neokim/add_scroll_to_item_and_magnetic_scroll_into_listview 
Add scrolling to item and magnetic scroll into ListView
 2015-09-11 17:48:40 +08:00
pandamicro 04d3119871 Merge pull request #13776 from natural-law/v3 
Remove performance tests from lua-tests & js-tests.
 2015-09-11 16:09:19 +08:00
zhangbin edb964a673 Remove the performance related config in project.json. 2015-09-11 16:03:07 +08:00
pandamicro 5a918608c1 Fix Chipmunk setCollisionType issue by initializing variables 2015-09-11 15:23:29 +08:00
yangxiao ca24e6eba3 fix clone 2015-09-11 15:08:59 +08:00
Neo Kim f39644d129 Remove default arguments in APIs and rename the parameter 'time' to 'timeInSec'. 2015-09-11 16:00:53 +09:00
Neo Kim 22b2f8b7b3 ListView - Change the order of test cases and fix for windows builds. 2015-09-11 16:00:53 +09:00
yangxiao 6fd9784fce setParent for RenderState 2015-09-11 11:47:36 +08:00
zhangbin 8e9928ad99 Remove performance tests from lua-tests & js-tests. 2015-09-11 10:53:17 +08:00
pandamicro 62b5f173d5 Merge pull request #13765 from natural-law/performance-test 
Add performance tests project.
 2015-09-11 10:37:23 +08:00
pandamicro 61eb3338e8 Merge pull request #13769 from CocosRobot/update_lua_bindings_1441879781 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-11 10:31:29 +08:00
geron-cn 966e568051 add ActionTimeline Frame End Call Back and Animation Clip End Call Back 2015-09-10 18:29:09 +08:00
CocosRobot cfe0be269b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-10 10:14:45 +00:00
pandamicro f281ae31b0 Merge pull request #13725 from WenhaiLin/v3-comonent-refine 
Refine ComponentContainer to  improve performance
 2015-09-10 18:04:26 +08:00
Vincent Yang bd80eb6f46 CCDownloader-android implements Data Task Download. 2015-09-10 18:03:15 +08:00
Seivan Heidari ea12b601d9 Don't call release() before retain() 2015-09-10 11:09:17 +02:00
pandamicro 7611f99ee4 Merge pull request #13746 from WenhaiLin/v3-menuitemtoggle-refine 
Uncoupling the implementation of MenuItemToggle dependence on tag.
 2015-09-10 16:15:18 +08:00
zhangbin 6f06ea19ac Merge branch 'v3' into performance-test 2015-09-10 16:06:36 +08:00
zhangbin e3161eb127 Remove performance tests from cpp-tests project. 2015-09-10 16:01:56 +08:00
Vincent Yang 7e2fe05050 CCDownloader-android implements File Task Download. 2015-09-10 15:56:06 +08:00
pandamicro 98f29e4dee Merge pull request #13764 from fusijie/fix_autopolygon_comments 
[ci skip]Fixed autopolygon comments
 2015-09-10 15:22:55 +08:00
fusijie d957e0c032 Fixed auto polygon comments out of date. 2015-09-10 15:18:04 +08:00
bill.zhang c82fcfa6ca Add win32 support for performance-tests. 2015-09-10 11:45:00 +08:00
pandamicro 941cd3c9de Merge pull request #13717 from jianglong0156/assetsmanagerContinue 
fix the AssetsManagerEx can not continuous transmission
 2015-09-10 11:34:03 +08:00
yangxiao d5fab0bd38 merge cocos 2015-09-10 10:44:09 +08:00
子龙山人 aeadb4cf29 Merge pull request #13753 from CocosRobot/update_lua_bindings_1441793251 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-10 09:47:01 +08:00