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

129 Commits

Author SHA1 Message Date
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
James Chen 8c261c1789 issue #1770: Updating linux makefile. 2013-02-06 15:59:29 +08:00
James Chen c42ef7e44a Merge pull request #1953 from dualface/add_CCFileUtils_Lua_support 
issue #1687: Adding CCFileUtils Lua support. Adding CCFileUtils::addSearchPath, addSearchResolutionsOrder.
 2013-02-04 18:59:49 -08:00
James Chen 4506214cef issue #1689: Adding some missing files. 2013-02-04 15:01:44 +08:00
minggo 07cd6d2bb2 issue #1689:modify lua samples to make them work correctly 2013-02-04 14:50:45 +08:00
dualface 5904512ac6 add CCFileUtils Lua support 2013-02-04 12:41:24 +08:00
minggo a771bc8183 issue #1689:modify lua Android.mk 2013-02-04 12:02:21 +08:00
minggo 744bfb3cb2 Merge pull request #1945 from dualface/add_CCLuaObjcBridge 
add CCLuaObjcBridge
 2013-02-03 19:32:17 -08:00
dualface 74e497bb2b restore CCLuaEngine missed methods 2013-02-04 11:28:09 +08:00
dualface 7839ceb45b add CCLuaObjcBridge 2013-02-02 02:05:52 +08:00
James Chen 3a9346e6ff issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms. 2013-02-01 11:20:46 +08:00
James Chen c80d438110 issue #1683: Exporting `fullPathForFilename` to Lua. 2013-01-27 20:26:04 +08:00
James Chen f2303b854a Fixed a typo, and regenerated luabinding codes. 2013-01-23 15:59:13 +08:00
James Chen 5a41e1fc86 fixed compilation errors for lua project. Rebuild LuaCocos2d.cpp. 2013-01-22 14:40:54 +08:00
johnangel 16269d952d Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
johnangel 674bb8e728 Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010. 2013-01-07 11:51:05 +01:00
minggo ffd0ca6c0e Merge pull request #1804 from dualface/fix_ccassert_lua_compatibility 
[luabinding] fix CCAssert Lua compatibility
 2013-01-03 23:51:47 -08:00
dualface e74e597dba [luabinding] fix CCAssert Lua compatibility 2012-12-30 02:27:25 +08:00
James Chen 0ee9cf027b Merge pull request #1803 from dumganhar/iss1627-vs2012 
fixed #1627: VS version check in project file.
 2012-12-28 22:54:04 -08:00
James Chen 9bd302e35b fixed #1627: VS version check in project file. 2012-12-29 13:54:46 +08:00
dualface d1e39a9c00 [luabinding] add CCDirector::setDisplayStats() 2012-12-29 11:16:07 +08:00
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
minggo 0adc6abe30 Merge pull request #1776 from dualface/make_ccassert_compatible_lua 
[luabinding] make CCAssert compatible Lua
 2012-12-26 23:28:32 -08:00
James Chen 023b32a618 issue #1625: Updated LuaCocos2d.cpp. 2012-12-27 11:48:14 +08:00
dualface 09b1d9f520 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua 2012-12-26 18:37:51 +08:00
dualface 57bccc7e4a remove CC_LUA_ENGINE_ENABLED macro 2012-12-26 18:33:55 +08:00
johnangel 08cd9e37fc Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
ivzave fcce930188 repair linux eclipse build & add 64-bit project configurations 2012-12-22 07:14:59 +04:00
dualface cc69e39c8a [luabinding] make CCAssert compatible Lua 2012-12-22 10:13:37 +08:00
James Chen 6700a1c4ce issue #1603: fixed some warnings for liblua.vcxproj. 2012-12-20 17:28:49 +08:00
James Chen 4660e72eda issue #1603: Moved the position of some projects. 2012-12-20 12:58:21 +08:00
unknown adb68ddbb6 Enable Windows XP support in Visual Studio 2012 Update 1. 
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
 2012-12-19 19:28:25 +01:00
dualface 98ea80329e fix android compile warning 2012-12-14 18:01:54 +08:00
James Chen 190e6c1de5 Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2012-12-10 17:25:23 +08:00
dualface f815cdc423 merge gles20 2012-12-10 17:00:16 +08:00
dualface 268aa45d2c rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua() 
remove unused functions
 2012-12-10 16:09:23 +08:00
dualface 77d4da6e22 [lua] remove va_list 2012-12-10 14:28:26 +08:00
dualface b6e605b9ae [lua] fix CCSequence export 2012-12-10 14:19:18 +08:00
dualface 4ca6cf8c7a [lua] update LuaCocos2d.cpp 2012-12-10 14:09:00 +08:00
dualface c8753f72ef [scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority() 2012-12-10 13:48:27 +08:00
James Chen 6a7a365365 Updated eclipse project configurations for linux 2012-12-06 14:57:03 +08:00
James Chen b044a89d6f Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2012-12-06 14:55:18 +08:00
minggo 75845b56c0 Merge pull request #1694 from dualface/update_luabinding 
Update luabinding
 2012-12-03 18:59:23 -08:00
minggo bbcbfa71ef Merge pull request #1704 from minggo/cclayer_script_support 
Cclayer script support
 2012-12-03 18:55:11 -08:00
James Chen 9f168faeb0 Merge pull request #1696 from fape/lua_marmalade 
fixed #1591: Update for Lua marmalade.
* Add ignore marmalade generated Visual Studio directory
* Update Lua and HelloLua marmalade project file
* Add TestLua marmalade project
 2012-12-03 18:51:39 -08:00
fape aac98975da update lua marmalade project 2012-12-02 15:29:10 +01:00
dualface 0e65257bc2 [luabinding] remove duplicate ccLanguageType 2012-12-02 16:17:17 +08:00
dualface 5bc95780c0 update luabinding 2012-12-02 15:48:15 +08:00
dualface 308a01e629 [luabinding] add tolua.isnull() 2012-12-02 15:29:00 +08:00
dualface e0ee27cb17 [luabinding] fix CCLayer:getScriptTOuchHandlerEntry() 
[luabinding] add CCLayer keypad, accelerometer support
 2012-12-02 15:17:34 +08:00