Commit Graph

180 Commits

Author SHA1 Message Date
samuele3hu 0a1c12a2d3 issue #2103 add some overlapping file and delete some comment line 2013-05-24 13:45:06 +08:00
samuele3hu 338c7c8d67 issue #2103 add more test lua 2013-05-24 11:42:27 +08:00
samuele3 5da5407efe issue #2103 add menu test lua sample 2013-05-23 15:39:41 +08:00
Lee, Jae-Hong 6acd8c66c2 Adding lua libaray and sample projects for Tizen. 2013-05-22 21:45:53 +09:00
James Chen 99664b5998 Merge pull request #2391 from sbc100/log_asserts
fixed #2152: Logging assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
2013-05-13 19:56:28 -07:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
Sam Clegg 4f6de1bcad Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
Also remove the first "cond" argument, since it is always false.
2013-05-06 12:25:13 -07:00
James Chen c70d9f203a Don't export classes in scripting/lua/cocos2dx_support. 2013-04-27 18:24:08 +08:00
James Chen 91036225c3 [Lua] Fixing "memset" and "memcpy" can't be found on BB port. 2013-04-27 14:45:00 +08:00
James Chen eb0358fda6 [Lua] Passing full path to luaL_dofile in CCLuaEngine::executeScriptFile. 2013-04-27 14:44:20 +08:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
James Chen 8c779ff98f Fixing compilation errors for linux port. 2013-04-27 09:32:46 +08:00
minggo 89591fdccc fixed #2084:add lua loader for all platforms 2013-04-26 12:12:19 +08:00
James Chen 862ce85c7a fixed #2083: Bytecode of LuaJIT can't work on android. 2013-04-25 21:29:31 +08:00
James Chen a005852fa5 issue #1847: Using luajit for win32. 2013-04-17 10:46:38 +08:00
James Chen 2384d97ce8 issue #1847: Adding luajit library for win32. 2013-04-17 10:09:17 +08:00
James Chen 4a7bacf0b5 Updating Android.mk. 2013-04-16 18:19:46 +08:00
James Chen bbbf139c8d Adding luajit iOS prebuilt library. 2013-04-16 18:19:25 +08:00
James Chen 79d58bcdb9 issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support. 2013-04-16 17:34:58 +08:00
James Chen 0ecf9da3a6 Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg. 2013-04-12 14:27:29 +08:00
James Chen 0bab4609ab fixed #1592: Removing some marco definitions in CCTexture2D.pkg. 2013-04-08 14:14:35 +08:00
James Chen 1a44f776f8 fixed #2005: Adding CurrentLanguageTest for Testlua. 2013-04-07 16:34:07 +08:00
James Chen 85b0fd306a Adding CocosDenshionTest. 2013-04-06 14:32:46 +08:00
James Chen e754909c5f Adding RenderTexture test for TestLua. 2013-04-05 17:13:46 +08:00
James Chen 2bff6d6480 Adding Texture2dTest. And format some lua codes. 2013-04-05 16:13:04 +08:00
James Chen 818a570b7f fixed #1998: Adding SceneTest.lua for TestLua. 2013-04-03 18:14:03 +08:00
James Chen 2d9f8ca8de fixed #1814: MenuTest for Testlua is ok. 2013-04-03 16:29:16 +08:00
James Chen 2de4dde0bd Merge pull request #2293 from dumganhar/iss1942-layertest
fixed #1942: LayerTest for TestLua is ok.
2013-04-02 02:54:21 -07:00
James Chen a73395507c fixed #1942: LayerTest for TestLua is ok. 2013-04-02 17:52:08 +08:00
Deniz Piri c73a6e3b14 LUA: print() function should use CCLOG internally.
CCLOG uses __android_log_print internally, this allows lua's print() function
to print to android log output and allows developer to see print output from
LUA using "adb logcat".
2013-04-01 19:16:43 +02:00
James Chen 5fd2acca47 Updating CCLabelBMFont.pkg, CCLabelTTF.pkg, and updating luabinding. 2013-04-01 17:39:26 +08:00
flamingo 4a313e0ffe Update CCLuaEngine.cpp
Null pointer check in order to prevent crashes.
2013-03-26 00:24:47 +04:00
James Chen 196ff7228d Updating CCLabelBMFont.pkg. 2013-03-20 16:05:45 +08:00
James Chen f57a751a48 fixed #1837: Refactoring schedule binding codes.
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 15:29:53 +08:00
minggo 815733e0b7 issue #1803:add SpriteOffsetAnchorRotationalSkewScale 2013-03-14 15:11:55 +08:00
Sam Clegg c0b150c859 Cleanup the tolua++ bindings build system.
Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.

Update README file with current instructions.

Re-generate output file using new build system.

Add build.sh and build.bat for building on POSIX and
win32 respectively.
2013-03-08 11:09:10 -08:00
wangshuai d5cdba484e Merge branch 'master' into feature_1802
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
wangshuai 6914c9d902 feature #1802:add touches lua test 2013-03-07 11:55:57 +08:00
minggo 44857e5137 Merge pull request #2093 from sbc100/linux_build_system
Linux build system
2013-03-06 19:09:49 -08:00
Sam Clegg 7ad171d8ee Use same top level Makefile for nacl and linux builds.
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.

Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
Sam Clegg 8677dad3c6 Improved build system from linux.
This change makes several fundamental improvements to the linux
build system:

- Remove duplication: a lot of the common make logic is now in
  a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk

- Quiet by default: unless you specify V=1 on the commandline
  the output is now very clean and quiet.

- Dependencies: gcc's automatic dependancy generation is now
  used (-MMD).  This means that if you change a header file
  then all the object that depend on it now get rebuilt.

- Don't store objects in the source tree: previously object
  files were stored alongside the sources, which meant that
  debug and release object clobbered each other which leads
  to confusion and lots of unnecessary rebuilding.Q

- Library dependencies: each binary now depends on the libraries
  it links aginst.  This means that if the cocos2dx library
  changes then all examples will get re-linked.

- Top level Makefile: there is now a top level Makefile that
  can be shared/used by any platform the uses make as the
  build system (for example NaCl).  Everything can be built
  by simply running 'make' at the top level. e.g:

    make DEBUG=1
    make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
wangshuai 3aaa18f7f4 Merge branch 'master' into iss1425-lua
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc.
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
wangshuai bdbdbc27f5 issue #1425:exist lua test case is ok!
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
Sam Clegg 33c422d1d5 Add new port: Native Client 2013-03-02 12:15:24 -08:00
Sam Clegg dcb591eadb Add missing ccGLServerState to CCNode.pkg.
Without this missing enum the resuling cpp file would generate
an unused function warning.

Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property.  Instead use build.sh, which
should work on all UNIXs, no just maxosx.
2013-03-02 11:28:04 -08:00
wangshuai 8867766241 issue #1425: exist lua test case is ok.
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
wangshuai b4e13af460 issue #1425: 
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
2013-02-28 10:23:30 +08:00
giginet 70612a722b Fix CCRepeat#create is recieved bad argument on Lua binding.
CCRepeat#create must be recieved CCFiniteTimeAction as first argument.
But, CCActionInterval recieved in LuaCocos2d.cpp
2013-02-22 20:24:22 +09:00
James Chen ab00de629a Removed the definition of the touch event type . 2013-02-20 12:06:12 +08:00