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

33037 Commits

Author SHA1 Message Date
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
子龙山人 75376e2a4f Merge pull request #13755 from CocosRobot/update_lua_bindings_1441795214 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-10 09:46:46 +08:00
yangxiao 8f5cd6cdc8 remove setParent 2015-09-10 09:28:01 +08:00
yangxiao 64471fab85 fix material clone 2015-09-10 09:23:02 +08:00
CocosRobot b164ac059d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 10:45:05 +00:00
pandamicro d03b100ec1 Merge pull request #13706 from WenhaiLin/v3-ios-phonecall-fix 
[IOS platform]AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
 2015-09-09 18:37:13 +08:00
zhangbin 7fa1976fa6 Optimize the output test data. 2015-09-09 18:29:18 +08:00
CocosRobot 8724f3b71a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 10:12:47 +00:00
pandamicro f31ebfe331 Merge pull request #13748 from jianglong0156/uniformConversion 
add uniform conversion
 2015-09-09 18:04:07 +08:00
zhangbin 5b90476f65 Write the test result file to sdcard on Android. 2015-09-09 17:00:38 +08:00
pandamicro 94187245af Merge pull request #13749 from natural-law/v3 
[ci skip] Solve the error in templates.
 2015-09-09 16:20:18 +08:00
zhangbin 4996fe5c1b Solve the error in templates. 
When creating project from template, the app name of android-studio project is not changed.
 2015-09-09 16:08:15 +08:00
江龙 4509a316cc add uniform conversion 
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
 2015-09-09 16:03:57 +08:00
zhangbin f3ade30b0b Add proj.android & proj.android-studio support. 2015-09-09 16:02:33 +08:00
WenhaiLin e251866d23 Uncoupling the implementation of MenuItemToggle dependence on tag. 2015-09-09 15:32:44 +08:00
pandamicro fd3a867f65 Merge pull request #13744 from CocosRobot/update_lua_bindings_1441778641 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-09 14:35:17 +08:00
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