Commit Graph

487 Commits

Author SHA1 Message Date
James Chen 2de4dde0bd Merge pull request from dumganhar/iss1942-layertest
fixed : LayerTest for TestLua is ok.
2013-04-02 02:54:21 -07:00
James Chen a73395507c fixed : LayerTest for TestLua is ok. 2013-04-02 17:52:08 +08:00
minggo e8ba299b80 Merge pull request from DenizPiri/master
print() function in LUA should write to android device log (adb logcat)
2013-04-01 22:42:17 -07:00
CocosRobot 1462c2a570 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-02 12:01:52 +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
CocosRobot 9f50cb71e2 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-29 17:02:38 +08:00
CocosRobot 7b37a9aaef cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-29 12:02:51 +08:00
James Chen 92d132ae19 Updating Android.mk to add OpenGL jsb support. 2013-03-29 11:43:25 +08:00
James Chen fd1b056d6a define JSB_INCLUDE_OPENGL in js_bindings_config.h 2013-03-29 11:41:32 +08:00
James Chen b7a86c601a fixing compilation errors for TestJavascript on windows. 2013-03-29 11:16:14 +08:00
James Chen 54edf8cafd Don't require 'jsb_opengl_constants.js' in 'jsb_opengl.js'. It will break js obscure 2013-03-28 16:58:02 +08:00
James Chen 771ffb4368 fixer : Updating "obfuscate_exclude_cocos2d.js". 2013-03-28 16:53:35 +08:00
James Chen 65bcc6035e Fixing a type: "FiniteTimeAction" --> "GLNode". 2013-03-28 16:51:11 +08:00
Rohan Kuruvilla 1d89b137ed Adding new Javascript bindings for OpenGL to cocos2d-x. Modifying bindings generated in cocos2d-iphone 2013-03-27 23:59:29 -07:00
Rohan Kuruvilla 57fd3cdb9c Modifying JS files to load OpenGL bindings. Also modify AppDelegate and Project files and generator template 2013-03-27 23:59:29 -07:00
flamingo 4a313e0ffe Update CCLuaEngine.cpp
Null pointer check in order to prevent crashes.
2013-03-26 00:24:47 +04:00
James Chen 0faeb5da5e Merge branch 'jsb_obfuscate' of https://github.com/walzer/cocos2d-x into walzer-jsb_obfuscate
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-03-22 14:12:38 +08:00
walzer 42c73fb820 Fixed , obfuscated js source can run on iOS correctly now. 2013-03-22 12:06:04 +08:00
James Chen d80d68f7e0 fixed : std_string_to_jsval generates messy js string when passing non-ascii UTF8 std::string. 2013-03-22 12:01:08 +08:00
walzer 6f41b7c4ea Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate 2013-03-21 17:37:28 +08:00
walzer 0a252aceaf update submodule scripting/javascript/bindings/generated to the same ref ptr as upstream/master branch. 2013-03-21 17:13:24 +08:00
walzer 67cda2bfd4 issue , TestJavascript is obfuscated successfully 2013-03-21 16:55:55 +08:00
CocosRobot 5414a02c9f cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-20 18:36:26 +08:00
James Chen 4bf7f9bad4 Fix a crash in cc.Scheduler.unscheduleAll cpp binding codes. 2013-03-20 18:32:30 +08:00
James Chen 196ff7228d Updating CCLabelBMFont.pkg. 2013-03-20 16:05:45 +08:00
CocosRobot e34d9b18e5 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-20 14:20:23 +08:00
James Chen a38fc50593 Fixing compilation errors for win32. 2013-03-19 19:51:07 +08:00
CocosRobot a115096bec cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-19 18:05:15 +08:00
walzer 0d73934f5c issue , TestJavascript-ios is obfuscated successfully 2013-03-19 17:21:01 +08:00
CocosRobot afccad27e1 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-19 13:45:54 +08:00
James Chen 7b5e2351c3 Updating jsb_cocosbuilder.js. 2013-03-19 13:08:34 +08:00
James Chen 3380c7cdca fixed : Updating iOS project setting for CocosDragonJS. 2013-03-19 13:05:06 +08:00
Rohan Kuruvilla e4efa88d00 Adding empty virtual definition to CCBScriptCallbackProxy to support CallFunc 2013-03-18 20:54:48 -07:00
Rohan Kuruvilla 5ca6648e47 Updating CCBReader JS bootstrap file 2013-03-18 16:06:48 -07:00
James Chen 6a98553633 Synchronizing the submodule reference of cocos2d-js-test to the latest one. 2013-03-18 18:24:37 +08:00
CocosRobot d098eb06aa cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-18 15:41:39 +08:00
James Chen f57a751a48 fixed : 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
James Chen 3aeb22292b Reverting ccarray_to_jsval. 2013-03-16 21:23:33 +08:00
James Chen 09757428e7 fixed : JS target of "cc.Scheduler().scheduleCallbackForTarget" should not depend on CCNode or its subclass. 2013-03-16 21:14:39 +08:00
James Chen 529e65787a Fix the crash CrystalCraze, we should check whether the arr parameter is valid for ccarray_to_jsval. 2013-03-15 22:22:44 +08:00
CocosRobot da16e7d2ff cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-15 11:57:26 +08:00
James Chen 92d0e1c983 Uncommenting jsb_CCEditBox_prototype, updating the submodule of cxx-generator to the latest one. 2013-03-15 11:53:56 +08:00
CocosRobot 5ee810c535 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-15 11:35:51 +08:00
James Chen ae2f2e2f0e Temporarily comment `jsb_CCEditBox_prototype` to make jsb projects compiled ok, because the server of auto generating jsbinding has some issues now. 2013-03-14 23:23:52 +08:00
James Chen 911f607484 Tabs ~> 4 spaces 2013-03-14 20:38:52 +08:00
James Chen 293e17494d fixed : Force casting `unsigned short*` to `jschar*` for `cc_utf8_to_utf16`. 2013-03-14 20:34:54 +08:00
James Chen d783715c18 Merge pull request from dumganhar/iss1824-editbox-js
fixed :  Exposed cc.EditBox to js and refactored ScriptingCore::executeFunctionWithOwner
2013-03-14 03:19:45 -07:00
minggo ee846c3248 Merge https://github.com/cocos2d/cocos2d-x into iss1803-spritetest-lua 2013-03-14 18:14:57 +08:00
James Chen 3e33868a63 fixed : Exposed cc.EditBox to js. 2013-03-14 18:14:16 +08:00