Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/scripting/lua
History
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
 		2012-12-29 09:48:22 +08:00
..
cocos2dx_support Merge pull request #1776 from dualface/make_ccassert_compatible_lua 2012-12-26 23:28:32 -08:00
lua Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:38:57 +08:00
proj.android/jni fix android compile warning 2012-12-14 18:01:54 +08:00
proj.blackberry Adding lua scripting to BlackBerry port. 2012-08-21 13:32:28 -04:00
proj.linux repair linux eclipse build & add 64-bit project configurations 2012-12-22 07:14:59 +04:00
proj.marmalade update lua marmalade project 2012-12-02 15:29:10 +01:00
proj.win32 Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 2012-12-29 09:48:22 +08:00
tolua [luabinding] add tolua.isnull() 2012-12-02 15:29:00 +08:00