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

1087 Commits

Author SHA1 Message Date
XiaoFeng ea077c5141 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim 
Conflicts:
	cocos/scripting/js-bindings/manual/js_manual_conversions.h
 2015-12-01 15:12:32 +08:00
CocosRobot 5c9084fd7d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-27 09:41:59 +00:00
XiaoFeng 58dd27efd3 add missing return type 2015-11-26 17:33:45 +08:00
XiaoFeng 108d145bf0 Add missing luaval and color3b conversion function export 2015-11-26 15:08:49 +08:00
CocosRobot da9e8548a0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 17:29:11 +00:00
XiaoFeng 928dc3ab1f Add lua value conversion function for cocos studio 2015-11-25 23:03:25 +08:00
XiaoFeng 145943068f Add missing function export 2015-11-25 22:35:02 +08:00
XiaoFeng 9811d6efcf Combine studio change for LuaBinding, jsb and simulator 2015-11-25 21:52:44 +08:00
CocosRobot 06c7b94440 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 09:28:43 +00:00
CocosRobot ded045ae26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-24 07:01:07 +00:00
pandamicro 378cfa35b6 Merge pull request #14394 from super626/v3 
Terrain: char* to string
 2015-11-24 14:53:00 +08:00
yangxiao e8d853934b terrain lua bindings 2015-11-23 14:33:39 +08:00
CocosRobot d5b07e5b60 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-19 03:14:03 +00:00
CocosRobot 0794c7a43c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 04:09:43 +00:00
CocosRobot 3ee2e7a490 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 02:56:26 +00:00
CocosRobot 4ccc6ce5de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-11 06:53:45 +00:00
CocosRobot f7803cba19 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-04 11:09:49 +00:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
pandamicro 7d93b419fd Merge pull request #14303 from xiaofeng11/v3_fix 
Fix ComponentTest in la-test can not load lua file under iOS & Android
 2015-11-04 13:52:14 +08:00
XiaoFeng 3223a97b26 Fix ComponentTest in la-test can not load lua file under iOS & Android 2015-11-03 15:49:46 +08:00
mogemimi 8f632365c3 Fix typos in documentation 2015-11-03 04:43:44 +09:00
CocosRobot 09cbc2145d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-28 03:29:16 +00:00
CocosRobot 5760e43387 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-26 01:45:38 +00:00
mogemimi 9df30d2454 Fix typos in documentation 2015-10-23 16:59:51 +09:00
pandamicro 4633a93631 Disable bitcode for all targets 2015-10-22 12:18:51 +08:00
CocosRobot 6a0e1b323f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-20 02:42:17 +00:00
mogemimi 59d7868d4c Fix minor typos 2015-10-14 15:12:22 +09:00
CocosRobot 216438fb9b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-10 01:40:55 +00:00
CocosRobot 1919d1a679 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-08 03:50:33 +00:00
CocosRobot 246fa7ffd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-29 07:45:48 +00:00
CocosRobot b082620d85 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-27 15:24:49 +00:00
pandamicro 7b85211cfe Remove ScriptComponent 
Because windows platform can't successfully compile in previous architecture
 2015-09-27 22:18:59 +08:00
WenhaiLin f4c56e8605 Fixed compile errors 2015-09-26 19:43:36 +08:00
pandamicro 2a3526a3fd Fix lua project 2015-09-26 19:43:36 +08:00
pandamicro 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +08:00
pandamicro ddb636a022 Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
pandamicro 7e2b8c71a7 Improve lua script component 2015-09-26 19:43:35 +08:00
minggo 26632ec69a linjia demo finish 2015-09-26 19:43:35 +08:00
CocosRobot b09b146f97 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-22 09:23:14 +00:00
CocosRobot 9ef7991b99 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 10:43:59 +00:00
CocosRobot 0af77fca90 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 08:35:18 +00:00
pandamicro 44329d96ba Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine 
Refine lua/js binding tool
 2015-09-20 16:42:40 +08:00
WenhaiLin b77d04f593 Fixed link errors 2015-09-19 00:59:28 +08:00
CocosRobot c562a57030 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 16:32:43 +00:00
CocosRobot 37cb9afb3f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 14:04:49 +00:00
CocosRobot ad65343814 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 13:51:58 +00:00
CocosRobot 79a7878687 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 07:41:46 +00:00
CocosRobot fe41739584 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 04:07:18 +00:00
James Chen 0eaf4c6866 [lua] Wrong callback setting for webview:setOnDidFailLoading 2015-09-17 10:52:17 +08:00
CocosRobot ae8a35a726 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 10:36:16 +00:00