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

34078 Commits

Author SHA1 Message Date
zilongshanren a839d5818e add horizontal cell reuse ListView 2016-03-01 00:07:49 +08:00
zilongshanren 9af2f4e73a Merge pull request #15118 from CocosRobot/update_lua_bindings_1456452560 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-26 14:49:38 +08:00
CocosRobot 78c99e33e9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-26 02:11:26 +00:00
zilongshanren 32d6762c72 Merge pull request #15116 from mogemimi/fix-function-name 
Fix typo of function name in AsyncTaskPool
 2016-02-26 10:00:47 +08:00
mogemimi 5de611b4b5 Fix typo of function name in AsyncTaskPool 2016-02-26 00:22:46 +09:00
zilongshanren c7ced7d388 Merge pull request #15105 from xiaofeng11/v3_updateDeps 
update dept lib
 2016-02-25 18:24:29 +08:00
XiaoFeng 9cec9c61d1 update dept lib 2016-02-25 17:49:44 +08:00
pandamicro e991282ed8 Merge pull request #15109 from dongtaohan/v3 
exported api for Cocos Studio.
 2016-02-25 14:35:57 +08:00
zilongshanren 699b76c738 Merge pull request #15114 from CocosRobot/update_lua_bindings_1456379985 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-25 14:02:15 +08:00
CocosRobot 9a11556f4b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-25 06:01:49 +00:00
xiaofeng11 c3eeb7c6b9 Merge pull request #15113 from zilongshanren/improve-node-api-docs 
improve the api doc for node.
 2016-02-25 13:56:23 +08:00
zilongshanren 8f05f33a01 Merge pull request #15112 from zilongshanren/improve-editbox-mac 
improve mac editbox
 2016-02-25 11:44:52 +08:00
zilongshanren c56835d743 improve the api doc for node. 
fixes https://github.com/cocos2d/cocos2d-x/issues/15100
 2016-02-25 11:43:36 +08:00
zilongshanren 92dca220ce improve mac editbox 2016-02-25 11:05:18 +08:00
dongtao.han 34b1c1bc18 exported js_get_type_from_native for cocos2d::Node type. 2016-02-25 09:47:19 +08:00
dongtao.han 7955721cb9 exported api. 2016-02-25 09:46:34 +08:00
zilongshanren ffe960c995 Merge pull request #15103 from CocosRobot/update_cocosfiles_1456299803 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-02-24 15:46:08 +08:00
CocosRobot a95a4f49f8 [AUTO][ci skip]: updating cocos2dx_files.json 2016-02-24 07:43:24 +00:00
xiaofeng11 8176b7e69d Merge pull request #15102 from FrostPolaris/v3 
Add FlatBuffers serialize function for language data used in Cocos Studio.
 2016-02-24 15:41:26 +08:00
beichen.liu f1d8a28b96 Add FlatBuffers serialize function for language data used in Cocos Studio. 2016-02-24 14:59:37 +08:00
zilongshanren 1a537488dd Merge pull request #15095 from CocosRobot/update_cocosfiles_1456067005 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-02-23 15:51:13 +08:00
CocosRobot 303cce24e3 [AUTO][ci skip]: updating cocos2dx_files.json 2016-02-21 15:03:26 +00:00
Ricardo Quesada 37db8407f1 Merge pull request #14867 from dumganhar/refactor-websocket 
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
 2016-02-21 06:59:59 -08:00
pandamicro 7607382440 Merge pull request #15094 from pandamicro/v3 
Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS
 2016-02-21 20:58:21 +08:00
pandamicro 6e8c46d0be Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS 2016-02-21 20:20:32 +08:00
zilongshanren d28acbf2fe Merge pull request #13906 from perminovVS/unzopen-use-getsuitablefopen 
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
 2016-02-19 15:36:06 +08:00
zilongshanren 5072e11bac Merge pull request #15069 from chengstory/FixRealBoolValueError 
Fix value type error when read value of bool type from .plist file.
 2016-02-19 14:07:29 +08:00
zilongshanren dbb10d73e1 Merge pull request #15051 from Shulepov/fix_drawing_in_incorrect_app_states_iOS 
Fix drawing in incorrect app states on iOS
 2016-02-19 14:00:37 +08:00
zilongshanren a038666a1f Merge pull request #15088 from CocosRobot/update_lua_bindings_1455848042 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-19 10:23:28 +08:00
zilongshanren a2a891458a Merge pull request #15089 from CocosRobot/update_lua_bindings_1455848255 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-19 10:23:17 +08:00
CocosRobot b2fd4b0c32 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-19 02:19:55 +00:00
pandamicro a4a85bafab Merge pull request #15087 from CocosRobot/update_lua_bindings_1455848009 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-19 10:16:28 +08:00
CocosRobot b77f2c9058 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-19 02:16:03 +00:00
CocosRobot 38aaee2dd4 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-19 02:15:27 +00:00
zilongshanren 9a65b0c7a1 Merge pull request #15065 from mogemimi/add-missing-reference-types 
Add missing reference-return types
 2016-02-19 10:14:07 +08:00
zilongshanren 3a2900494f Merge pull request #15080 from njh0602/somefix 
fix return value
 2016-02-19 10:09:55 +08:00
zilongshanren a4f3826fa9 Merge pull request #15083 from mogemimi/fix-docs-typo 
Fix typos in documentation
 2016-02-19 10:09:32 +08:00
mogemimi 1d9e688707 Fix typos in documentation 2016-02-18 16:16:36 +09:00
zilongshanren 8e1c53b541 Merge pull request #15074 from xiaofeng11/v3 
Remove test/lua-tests/project/Classes/lua_module_register.h, use the one in libluacocos2d instead.
 2016-02-18 12:00:39 +08:00
肖峰 4e501149a3 Fix lua-test link error under linux 2016-02-18 10:53:33 +08:00
NamJunHyone 79c69d77d6 fix return value 2016-02-18 11:23:54 +09:00
mogemimi 8280f06c1f Add missing reference-return types 2016-02-18 05:10:42 +09:00
James Chen 0cb94cc373 Merge branch 'v3_libwebsockets' of https://github.com/xiaofeng11/cocos2d-x into refactor-websocket 2016-02-17 14:56:57 +08:00
James Chen 7d43e35741 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket 2016-02-17 14:56:32 +08:00
XiaoFeng 9224a9d03b Remove test/lua-tests/project/Classes/lua_module_register.h, use the one in libluacocos2d instead. 2016-02-17 14:54:15 +08:00
James Chen 5b55a453d9 Updates config.json 2016-02-17 14:44:07 +08:00
zilongshanren ced5493304 Merge pull request #15064 from CocosRobot/update_lua_bindings_1455542820 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-17 09:34:17 +08:00
pandamicro cf4c18e90d Merge pull request #15070 from CocosRobot/update_lua_bindings_1455613548 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-16 17:08:32 +08:00
CocosRobot 4d7186f5bd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-16 09:07:51 +00:00
zhangcheng 2b1511096e Fix ValueVector read type error. 2016-02-16 17:01:54 +08:00