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

670 Commits

Author SHA1 Message Date
CocosRobot 781ff463a2 [AUTO]: updating luabinding automatically 2014-03-19 01:56:50 +00:00
CocosRobot fc5a34e500 [AUTO]: updating luabinding automatically 2014-03-18 07:55:30 +00:00
boyu0 f23db68151 build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files. 2014-03-15 01:19:06 +08:00
CocosRobot c9259bb800 [AUTO]: updating luabinding automatically 2014-03-13 13:17:32 +00:00
CocosRobot b1becd3fae [AUTO]: updating luabinding automatically 2014-03-13 06:51:53 +00:00
CocosRobot 6d8bc4e616 [AUTO]: updating luabinding automatically 2014-03-13 03:45:57 +00:00
CocosRobot e93feaa068 [AUTO]: updating luabinding automatically 2014-03-12 11:41:17 +00:00
James Chen 9c980dfcfe Merge pull request #5706 from dumganhar/rename-tests 
Rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects. And compilation error fix after changing folder name from 'gui' to 'ui'
 2014-03-12 15:48:29 +08:00
James Chen eae6880599 Adds 'ui' include path in liblua.vcxproj 2014-03-12 15:44:56 +08:00
CocosRobot 31b304af26 [AUTO]: updating luabinding automatically 2014-03-12 07:43:13 +00:00
CocosRobot 41c689c545 [AUTO]: updating luabinding automatically 2014-03-12 03:31:17 +00:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
andyque 4ed33fa4c8 fix lua bindings 2014-03-11 21:36:00 +08:00
andyque f6a9824df1 fix win32 compile error 2014-03-11 20:59:35 +08:00
andyque df7aa27b8b fix mac lua 2014-03-11 18:48:28 +08:00
andyque 026ef95b07 add lua ui binding 2014-03-11 18:48:27 +08:00
andyque dcc98ef79f rename cocos2dx_gui to cocos2dx_ui 2014-03-11 18:48:27 +08:00
samuele3hu 9a30984783 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-11 17:36:43 +08:00
samuele3hu 5c33155bc9 fix:Remove some warning about lua. 2014-03-11 17:35:09 +08:00
CocosRobot b6ebd84534 [AUTO]: updating luabinding automatically 2014-03-11 08:38:10 +00:00
CocosRobot 725440fe3f [AUTO]: updating luabinding automatically 2014-03-11 02:52:22 +00:00
CocosRobot 8aa11f005b [AUTO]: updating luabinding automatically 2014-03-10 11:27:21 +00:00
James Chen 479579fadc Update CMakeLists.txt, lua-tests works ok on linux now. 2014-03-10 02:39:54 -07:00
James Chen e39dcd9974 [Linux] Updates CMakeLists.txt to re-add lua scripting support. 2014-03-10 17:10:08 +08:00
James Chen fd44277e7c lua-tests works again for Win32. 2014-03-10 17:05:35 +08:00
James Chen 6deadf34b8 lua-tests works again for Android. 2014-03-10 16:04:46 +08:00
James Chen 69bbda688b lua-tests works ok for iOS / Mac, luabindings has its own project. 2014-03-10 15:32:48 +08:00
James Chen 650a88a8b1 Re-add lua bindings codes. 2014-03-10 14:04:58 +08:00
James Chen c2acfea633 issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
CocosRobot 01e37a0000 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-26 03:53:49 +00:00
CocosRobot e6104f9649 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-26 03:41:20 +00:00
CocosRobot ef18a6edd1 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-25 03:14:40 +00:00
andyque f88e4be4ce rollback gui filename change 2014-02-25 10:18:45 +08:00
andyque 8359ddd4d4 fix lua bindings error 2014-02-25 10:18:45 +08:00
andyque f92301a872 fix jsb munaul bindings error 2014-02-25 10:18:45 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
James Chen 64ec1611a5 compilation error fix for win32. 2014-02-25 09:45:10 +08:00
James Chen 2898909130 Merge pull request #5444 from samuele3hu/developDynamic 
issue #3956:Modifyt the mechanism of toluafix_pushusertype_ccobject to pass the real typename to lua
 2014-02-24 15:29:23 +08:00
samuele3hu 82ee8a4abd Add some omitted modifications about “cc.ref” 2014-02-24 10:28:55 +08:00
samuele3hu 8fa8eaf64d issue #3956:Remove some unrelated modification 2014-02-24 10:08:00 +08:00
samuele3hu ac88d70d58 issue #3956:Update the related compile file 2014-02-24 10:01:00 +08:00
samuele3hu a765178a5f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 2014-02-24 09:38:08 +08:00
samuele3hu 8cbe22b12b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developFix 2014-02-23 20:57:45 +08:00
samuele3hu 5f28e6bd72 Replace “cc.object” with “cc.ref” for lua binding 2014-02-23 20:56:49 +08:00
CocosRobot e306c53d21 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-23 09:21:10 +00:00
samuele3hu 293ea66401 issue #3956:Remove the usage of “tolua.cast” 2014-02-21 16:22:35 +08:00
CocosRobot 2eadbefaeb [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-21 03:48:50 +00:00
samuele3hu e436aa4022 issue #3956:Replace Object with Ref 2014-02-21 10:22:03 +08:00
samuele3hu 555ef20202 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 
Conflicts:
	cocos/scripting/lua/bindings/LuaBasicConversions.h
	cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
 2014-02-21 10:10:20 +08:00
samuele3hu 3532665520 issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object 2014-02-21 09:45:33 +08:00
CocosRobot 6f2f35ab7a [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 13:11:20 +00:00
CocosRobot 9e061b751a [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 09:52:15 +00:00
samuele3hu e2596bce8b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 
Conflicts:
	tools/tojs/cocos2dx.ini
	tools/tolua/cocos2dx.ini
 2014-02-20 17:20:51 +08:00
CocosRobot 01bd61839b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 07:38:05 +00:00
James Chen e2cb0e3ba5 Reverts auto-generated submodule. 2014-02-20 15:14:55 +08:00
James Chen 0af0ce9032 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1 
Conflicts:
	cocos/scripting/auto-generated
 2014-02-20 15:13:40 +08:00
samuele3hu 7b85ffcb82 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-20 15:11:56 +08:00
samuele3hu 514112921f close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding 2014-02-20 15:10:34 +08:00
James Chen f7c8eb8de2 Merge pull request #5394 from samuele3hu/developEventTrigger 
issue #3229:The second param of glGetProgramiv which was called in the tolua_Cocos2d_glGetUniformfv00 was wrong
 2014-02-20 12:44:53 +08:00
CocosRobot 66906c3f66 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 03:38:12 +00:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
samuele3hu e1387f40eb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-19 16:57:18 +08:00
CocosRobot 1f45dd4349 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-19 08:27:37 +00:00
samuele3hu d7b0efd6d7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-19 16:27:08 +08:00
samuele3hu ce1656fa8d fix: The lua binding of getPropertiesForGID would lead to compile error 2014-02-19 15:47:45 +08:00
samuele3hu 52a0b906da Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-19 13:58:15 +08:00
CocosRobot 4ecd7ba58d [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-19 05:58:15 +00:00
samuele3hu d28e8485ec issue #3229:Lua version of GLGetUniformTest raise error on iOS when calling glGetUniformfv 2014-02-19 13:56:06 +08:00
James Chen e1a256d6f1 Merge pull request #5319 from samuele3hu/developDynamic 
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
 2014-02-19 13:52:08 +08:00
CocosRobot 97ff6c5bdf [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-18 08:04:14 +00:00
samuele3hu 5acb556c74 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 2014-02-18 13:46:21 +08:00
samuele3hu 8cb424b535 close #3593:Add more test cases about SceneReader of cocoStudio 2014-02-18 13:44:11 +08:00
xingsenma 1ec2d35631 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_20140103 2014-02-17 10:12:49 +08:00
CocosRobot a5a8ff2d87 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-14 06:22:19 +00:00
James Chen c7b1ab4525 Merge pull request #5362 from ucchen/develop 
closed #4037: fix copy-paste error, all spxxx_to_jsval use lower case;
 2014-02-14 14:17:33 +08:00
ucchen 185ed86214 fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment; 2014-02-14 13:24:56 +08:00
CocosRobot 104e0b4b29 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-14 03:24:11 +00:00
James Chen 78163e604e Merge pull request #5358 from dumganhar/merge5343 
closed #4037:Exposed the missing data structures of Spine to JS
 2014-02-14 11:17:38 +08:00
James Chen 32012ee72a Adds missing files for vs. 2014-02-14 10:53:30 +08:00
James Chen 79e7d218cb Updates Android.mk 2014-02-14 10:37:50 +08:00
James Chen 2078f6de57 Updates CMakeLists. 2014-02-14 10:34:28 +08:00
James Chen acefa4e237 Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:33:42 +08:00
CocosRobot 498a5e5b47 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-14 01:29:48 +00:00
xingsenma 4eecc7e56b #3947 Simulate 'setTimeout' and 'setInterval' in JSB. 2014-02-13 13:54:05 +08:00
ucchen 2c961bdfbf add spine manual binding; 2014-02-13 11:01:54 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
chuanweizhang2013 d5aee5eb04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime 2014-02-11 18:08:14 +08:00
CocosRobot 29bae34bc3 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-11 06:34:17 +00:00
chuanweizhang2013 e9dd3d828a issue #3498: commit jsruntime 2014-02-10 18:15:30 +08:00
samuele3hu 67a48c2a85 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 2014-02-10 17:41:06 +08:00
samuele3hu ba73217667 issue #3956:Add the conversional functions which are used in the templates of lua binding-generator 2014-02-10 15:03:53 +08:00
CocosRobot 12b5fba628 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-10 06:42:10 +00:00
James Chen 51ba0cbb17 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268 2014-02-10 14:09:57 +08:00
CocosRobot 4f54b36127 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-10 05:58:44 +00:00
James Chen a05cd6fbb2 Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5311 2014-02-10 12:53:08 +08:00
James Chen 99c20c4e30 Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 
Conflicts:
	tests/test-javascript/tests
 2014-02-10 11:38:56 +08:00
Ricardo Quesada 1c4321304c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:01:55 -08:00
Ricardo Quesada ceba63db8b Merge branch 'develop' into fast_tmx 2014-02-08 09:08:33 -08:00
hbb f5d4dd4afe remove the redundant check 
ccbreader can load file without the owner setting
 2014-02-08 19:12:33 +08:00
CocosRobot c775681767 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-08 06:09:04 +00:00