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

408 Commits

Author SHA1 Message Date
James Chen d733556270 Merge pull request #4955 from CocosRobot/updategeneratedsubmodule_1389081296 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 00:00:19 -08:00
James Chen 49ca35fc3d Merge pull request #4956 from dumganhar/move-temp-obj 
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build'  folder.
 2014-01-06 23:58:42 -08:00
CocosRobot f8e7f570f3 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 07:54:58 +00:00
James Chen f5ae2bbacc Merge pull request #4932 from boyu0/iss3401_physical_lua_binding 
issue #3401: physical lua binding
 2014-01-06 23:48:47 -08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
Zhe Wang 9b6027d284 Merge pull request #4947 from walzer/develop 
udpate copyrights for the new year 2014 and Chukong.
 2014-01-06 19:50:18 -08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CocosRobot 641255e3ef [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 03:25:39 +00:00
boyu0 f7c88a8134 issue #3401: update cmake project set 2014-01-07 11:09:40 +08:00
boyu0 8e64ef6d6d issue #3401: add physics lua auto generate to android.mk 2014-01-07 10:20:59 +08:00
boyu0 cf146b32cf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2014-01-07 10:16:44 +08:00
samuele3hu c553fd2b73 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-07 10:10:17 +08:00
samuele3hu 01013195d3 Fix:Resolve the release lua test sample compile error 2014-01-07 10:08:58 +08:00
boyu0 eaa3041a97 issue #3401: physical lua banding script, add testlua->physics test 2014-01-06 22:19:40 +08:00
James Chen 1bd0f90437 Warning fix in js_manual_conversions.cpp/h 2014-01-06 20:02:01 +08:00
CocosRobot cc4bee319c [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-05 10:43:05 +00:00
CocosRobot 5f8d4f867c [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-05 05:52:52 +00:00
CocosRobot f44775b581 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 14:05:19 +00:00
CocosRobot 0b2926cb70 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 11:09:00 +00:00
samuele3hu 362c1dc0ea Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-04 18:37:34 +08:00
samuele3hu 465aba951c Fix:Remove the ScollView and TableView of extension gui lua binding 2014-01-04 18:36:33 +08:00
CocosRobot c793f2e0fc [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 10:19:07 +00:00
samuele3hu 70ee13e2e1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-04 15:46:27 +08:00
samuele3hu 0550ec33ad Fix:Resolve the bugs that some lua test cases can’t run 2014-01-04 15:46:04 +08:00
CocosRobot ad11468b7b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 07:40:50 +00:00
James Chen 98346474b8 Merge pull request #4863 from Dhilan007/develop_crash 
fix compiling error and miss file on vs.
 2014-01-03 20:41:19 -08:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
CocosRobot e42f721c6b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 04:22:17 +00:00
CocosRobot d29cdb5b52 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 03:58:44 +00:00
CocosRobot 0ed307a583 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 02:58:59 +00:00
James Chen f3eb21e748 Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash 
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
 2014-01-03 18:51:16 -08:00
James Chen 61af958976 closed #3579: Bug fix in setTouchEnabledForLayer for jsbindings. 2014-01-04 10:32:04 +08:00
James Chen baeacaddfc closed #3579: Bug fix in setTouchEnabledForLayer for luabindings. 
Also fixed lua module error.
 2014-01-04 10:30:11 +08:00
CocosRobot 54ee3392fc [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-04 01:40:17 +00:00
Dhilan007 e017609fc4 fix compiling error in jsb_cocos2dx_studio_manual.cpp on android. 2014-01-03 23:59:05 +08:00
Dhilan007 b6e676caa4 fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp. 2014-01-03 23:03:48 +08:00
Dhilan007 b4d392dc38 update js binding for studio change. 2014-01-03 21:33:48 +08:00
CocosRobot 126c315673 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 11:32:54 +00:00
CocosRobot 37c8b03253 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 08:37:25 +00:00
James Chen 5346677a47 Merge pull request #4825 from samuele3hu/developNewUI 
Update the lua test cases about the armature
 2014-01-03 00:29:24 -08:00
Dhilan007 8e2c51d31e update vs project for split spine binding. 2014-01-03 15:29:50 +08:00
samuele3hu a72cf0428c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 14:53:15 +08:00
samuele3hu 2b19da00df Update the lua test cases about the armature 2014-01-03 14:51:36 +08:00
CocosRobot 0661d87cdb [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 05:02:28 +00:00
samuele3hu 53f2415fcf Resolve the android compile error 2014-01-03 11:29:56 +08:00
samuele3hu 51e3e3fd1b Resolve the android and linux compile error 2014-01-03 11:15:46 +08:00
samuele3hu bfc7441453 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:51:05 +08:00
samuele3hu cdc82d6e8c Add a newline 2014-01-03 10:50:06 +08:00
samuele3hu c4588722dd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:41:03 +08:00
samuele3hu 07a3efb585 Update the lua test cases about the GUI 2014-01-03 10:39:19 +08:00