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

29 Commits

Author SHA1 Message Date
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
YuLei fc3a55a065 [Lua] move LUA_FUNCTION, LUA_TABLE, LUA_STRING declare to CCLuaEngine.h 2012-09-11 15:44:33 +08:00
James Chen 7d8b261ced fixed #1477: Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions. 2012-09-11 14:02:33 +08:00
James Chen ae320b5f9c stage sth. 2012-09-10 18:38:18 +08:00
YuLei da79992275 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:38:57 +08:00
James Chen 9ba5a1bfef issue #1454: Removed COCOS2D_JAVASCRIPT macro. 2012-08-31 21:23:23 +08:00
minggo 860d3eff4b issue #1454: make js binding work together with lua binding and native codes 2012-08-31 17:55:45 +08:00
James Chen 21547fb96f Don't make CCScriptEngineProtocol inherits from CCObject since setScriptEngine is invoked only once in AppDelegate.cpp, 
It will affect the lifecycle of ScriptCore instance, the autorelease pool will be destroyed before destructing ScriptCore.
So a crash will appear on Win32 if you close the game window.
 2012-08-29 14:49:04 -07:00
YuLei 2c518e43b2 [Lua] fix CCLayer:registerScriptTouchHandler() 
[Lua] make CCNotificationCenter script support
 2012-08-28 12:08:15 +08:00
Rohan Kuruvilla 8d7516a0ef Test project for cocos2d-x js. 2012-08-27 10:07:31 -07:00
Rohan Kuruvilla c47d9d4e7c Adding Touch callbacks and capability to pass this around 2012-08-27 08:43:38 -07:00
Rohan Kuruvilla 0e9ba1173a Callbacks 2012-08-27 08:43:37 -07:00
YuLei 8b54355aa1 [Lua] update luabinding 
[Lua] add LuaValue, LuaDict, LuaArray
 2012-08-25 15:05:59 +08:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen 595a402c83 fixed #1292:make some function names more readable. 2012-06-15 16:47:30 +08:00
James Chen 08fc714a7f issue #1310: Reverted floatr to CCTimer. 2012-06-12 17:07:54 +08:00
minggo cc16320445 issue #1310: syncronize actions 2012-06-08 13:55:28 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
James Chen 4068be84e9 Refactored project folders. 2012-04-19 11:46:08 +08:00
Anton Rusanov 8e53d9db9f fix m_nEntryID typo for CC_LUA_ENGINE_DEBUG 2012-03-12 00:59:03 +04:00
YuLei Liao 1d6d966717 fix CCScriptEngineManager::purgeSharedManager() 2012-02-09 20:07:55 +08:00
YuLei Liao 6ebdf9cb4b * add CCScriptSupport 2012-02-09 14:07:11 +08:00
YuLei Liao 7685982081 * remove unused files for script support 2012-02-01 16:42:44 +08:00
minggo 3e080476f3 [win32] fixed #620: change the output of lua to a lib 2011-07-20 15:21:51 +08:00
Walzer f3375f0dbb issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object. 2011-06-21 17:02:08 +08:00
minggo 968779912a fixed #528: add copyright & modify pop menu position 2011-06-21 15:50:47 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00