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

21782 Commits

Author SHA1 Message Date
samuele3hu 3c8dc7a596 Update the cocos2d.ini config 2014-07-11 17:21:55 +08:00
samuele3hu 01c3f2a4ed Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/tolua/cocos2dx.ini
 2014-07-11 16:44:59 +08:00
minggo 0c28b676fb Merge pull request #7408 from samuele3hu/v3_test 
Remove glView setting codes form AppDelegate.cpp to related lua script
 2014-07-11 16:38:34 +08:00
samuele3hu d1bd21b1db Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 16:17:51 +08:00
samuele3hu d9291031cd Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 16:10:42 +08:00
vision 7495a611ea fix conflict 2014-07-11 16:03:40 +08:00
samuele3hu 229ad0cc27 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test 2014-07-11 16:01:12 +08:00
samuele3hu 175ff37302 Remove glView setting form cpp to lua script and remove lua bindings for Bone3D 2014-07-11 16:00:02 +08:00
samuele3hu 82070e5205 Remove glView setting form cpp to lua script 2014-07-11 15:34:56 +08:00
samuele3hu 54970c109f Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 15:34:21 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
minggo c71eec610a Merge pull request #7406 from andyque/fixMacProj 
fix ios project bug
 2014-07-11 14:51:36 +08:00
andyque da80170d06 fix ios project bug 2014-07-11 14:55:00 +08:00
minggo 627443ce5e Merge pull request #7405 from CocosRobot/update_cocosfiles_1405059271 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-11 14:18:47 +08:00
minggo c63983345b Merge pull request #7353 from andyque/addStudio1.4 
add studio v1.3, v1.4, v1.5 tests
 2014-07-11 14:15:07 +08:00
andyque 74772e97c9 fix linux compile error 2014-07-11 14:17:57 +08:00
CocosRobot 57827e9465 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-11 06:14:32 +00:00
andyque d4122d616a fix text reader binray version setFontName 2014-07-11 13:58:08 +08:00
andyque 43255e2b96 Merge branch 'v3' into addStudio1.4 
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
 2014-07-11 13:55:13 +08:00
minggo f7cd1fc9cc Merge pull request #7399 from CocosRobot/update_cocosfiles_1405057476 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-11 13:53:15 +08:00
minggo 41c267fdb7 Merge pull request #7400 from CocosRobot/update_lua_bindings_1405057491 
[AUTO]: updating luabinding automatically
 2014-07-11 13:52:38 +08:00
CocosRobot 563386a777 [AUTO]: updating luabinding automatically 2014-07-11 05:46:37 +00:00
CocosRobot b32bd895a0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-11 05:44:37 +00:00
minggo f205c0b704 Merge pull request #7392 from xhcnb/fix_CC_ENABLE_SCRIPT_BINDING_build 
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
 2014-07-11 13:41:33 +08:00
minggo 9e74048409 Merge pull request #7397 from CocosRobot/update_lua_bindings_1405057136 
[AUTO]: updating luabinding automatically
 2014-07-11 13:41:06 +08:00
CocosRobot cdf8743597 [AUTO]: updating luabinding automatically 2014-07-11 05:40:36 +00:00
minggo d1d84e0d1f Merge pull request #7386 from chengstory/v3_fixesLoaddTTFError 
1. fixes TextReader load default font error.
 2014-07-11 13:40:16 +08:00
andyque 646f7c7e3f Merge branch 'v3' into addStudio1.4 2014-07-11 13:39:34 +08:00
minggo 72f8ab8483 Merge pull request #7395 from samuele3hu/v3_controller 
Add Lua bindings for controller and related test case project
 2014-07-11 13:39:30 +08:00
minggo 65404066ec Merge pull request #7396 from CocosRobot/update_lua_bindings_1405051544 
[AUTO]: updating luabinding automatically
 2014-07-11 13:37:55 +08:00
minggo 6c37541657 Merge pull request #7363 from Dhilan007/v3-event-clear 
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
 2014-07-11 13:36:52 +08:00
minggo 7cf8cf42d3 Merge pull request #7389 from Dhilan007/v3-gc-nibiru 
Update Nibiru SDK and remove prompt box of install driver .
 2014-07-11 13:36:19 +08:00
CocosRobot 20c4e6530d [AUTO]: updating luabinding automatically 2014-07-11 04:07:14 +00:00
minggo a0b16a29d1 Merge pull request #7394 from Dhilan007/v3-gc-annotation 
Add annotation for Controller class.
 2014-07-11 12:03:01 +08:00
samuele3hu 2cbe262842 Add newline for some files 2014-07-11 12:00:43 +08:00
samuele3hu 77a82731a5 Remove auto bindings files for controller 2014-07-11 11:57:40 +08:00
samuele3hu 9b9713073e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 2014-07-11 11:55:10 +08:00
samuele3hu dd76ae93f6 Update controller lua binding and related test cases 2014-07-11 11:52:05 +08:00
Dhilan007 4e4464c9c1 Add annotation for Controller class. 2014-07-11 10:56:09 +08:00
minggo f0dcb7681a Merge pull request #7391 from super626/v3 
rename Bone to Bone3D
 2014-07-11 10:44:50 +08:00
Jason Xu d94941243a Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed 2014-07-11 10:27:00 +08:00
yangxiao fd8541e32d rename Bone to Bone3D 2014-07-11 10:17:36 +08:00
Dhilan007 900d4b36fc Enabled nibiru\moga\ouya controller support. 2014-07-11 09:57:26 +08:00
minggo 7a4dfda868 Merge pull request #7390 from CocosRobot/update_cocosfiles_1405043017 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-11 09:49:13 +08:00
CocosRobot 463a2ab5ac [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-11 01:43:39 +00:00
minggo e4042fbf0c Merge pull request #7388 from CocosRobot/update_lua_bindings_1405001287 
[AUTO]: updating luabinding automatically
 2014-07-11 09:42:32 +08:00
samuele3hu caae8392d4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/scripting/lua-bindings/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
	tools/tolua/genbindings.py
 2014-07-10 22:42:09 +08:00
Dhilan007 dfbeb0fb63 Update Nibiru SDK and remove prompt box of install driver . 2014-07-10 22:33:58 +08:00
CocosRobot c205bd0806 [AUTO]: updating luabinding automatically 2014-07-10 14:10:03 +00:00
minggo c79dabce17 Merge pull request #7387 from CocosRobot/update_cocosfiles_1405001188 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-10 22:07:30 +08:00