sunzhuoshi
fa39c41136
Fixed bad commit
2013-05-06 19:06:16 +08:00
James Chen
9a63b39974
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
2013-05-06 18:13:26 +08:00
sunzhuoshi
3da5a7d5cd
Removed redundant code
2013-05-06 18:06:18 +08:00
sunzhuoshi
6e70884853
Removed redundant code
2013-05-06 15:43:33 +08:00
James Chen
f86a843c8b
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
2013-05-06 12:55:44 +08:00
sunzhuoshi
d4c4170368
Removed bad comment
2013-05-06 12:02:17 +08:00
James Chen
4657ef716c
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
2013-05-06 11:43:40 +08:00
sunzhuoshi
de27f1137a
Changed byte code file ext to ".jsc"
...
Modified loading logic to load js file first
2013-05-06 11:32:23 +08:00
James Chen
0718e6cf70
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
2013-05-06 11:15:19 +08:00
minggo
0c721096ec
fixed #2099:fixed a bug in ScriptingCore::evalString not setting the outval
2013-05-02 09:03:24 +08:00
sunzhuoshi
077214c419
Modified to ensure no popup notify when no byte code file
2013-04-30 20:39:06 +08:00
sunzhuoshi
d4832e3f46
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master
...
Conflicts:
scripting/javascript/bindings/ScriptingCore.cpp
2013-04-30 03:51:07 +08:00
sunzhuoshi
163c19fac2
Added support for javascript byte code
2013-04-30 03:29:56 +08:00
James Chen
2d27353dd3
Using the same native stack size for DEBUG and RELEASE target.
...
#define JSB_MAX_STACK_QUOTA 500000
2013-04-27 23:49:04 +08:00
Rohan Kuruvilla
2636bafd0c
Fixing network logging for Android and iOS
2013-04-25 18:41:29 -07:00
CocosRobot
c501a73a54
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-25 21:30:20 +08:00
James Chen
5572990e5d
Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop.
2013-04-25 20:56:27 +08:00
CocosRobot
1e4370f43b
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-25 14:35:16 +08:00
CocosRobot
ca30ce7462
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-23 12:11:31 +08:00
James Chen
e84cf9ef83
Correct log output in js_cocos2dx_CCTMXLayer_getTiles
2013-04-23 10:57:55 +08:00
James Chen
30c6915449
fix a typo.
2013-04-23 10:52:51 +08:00
CocosRobot
8d8a2293a1
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-19 17:27:38 +08:00
James Chen
20b0e41b78
fixed #2017 : Binding cc.TMXLayer.getTiles manually.
2013-04-19 17:25:24 +08:00
James Chen
556d95d922
Removing an unused comment in ccaffinetransform_to_jsval.
2013-04-18 14:13:26 +08:00
CocosRobot
5ead6d7322
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-18 13:58:01 +08:00
James Chen
4db3c9c692
Refactoring js_cocos2dx_CCFileUtils_getByteArrayFromFile.
2013-04-18 13:53:16 +08:00
James Chen
642d1746f9
issue #2064 : Adding conversation for "jsval ~> CCAffineTransform" and "CCAffineTransform ~> jsval".
2013-04-18 13:50:58 +08:00
James Chen
4bd012dfbf
fixed #2060 : Implementing support for cc.FileUtils.getInstance().getByteArrayFromFile(filename)
2013-04-17 18:43:57 +08:00
James Chen
63ce8adfad
fixed #2059 : Fix complication errors on Android.
2013-04-17 17:05:39 +08:00
James Chen
ddd6d9d155
fixed #2059 : cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string.
2013-04-17 16:08:48 +08:00
James Chen
694c47f5d6
Merge pull request #2382 from wedteam/keypad-support
...
fixed #2057 : [JSB] Adding response for back and menu keypad event for Android.
2013-04-16 21:56:37 -07:00
akira_cn
e1f9e1a300
update keypad support
2013-04-17 10:40:46 +08:00
akira_cn
54f18be09a
add back key support
2013-04-16 10:19:36 +08:00
CocosRobot
5928d2836c
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-16 10:02:11 +08:00
CocosRobot
d6e9d4420e
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-15 14:01:47 +08:00
James Chen
3f695d1934
Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master
2013-04-10 16:07:54 +08:00
CocosRobot
40c5280527
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-09 14:49:20 +08:00
James Chen
a2c71f8e89
Exposing CCApplication to js.
2013-04-09 14:42:12 +08:00
James Chen
831dfb6ade
Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash
2013-04-08 11:56:10 +08:00
James Chen
2c3427dcee
issue #1592 : Fixing complication errors for windows port.
2013-04-08 11:56:04 +08:00
James Chen
ea4603a057
issue #1592 : Removing uthash.h in scripting/javascript/bindings. Using the version in cocos2d-x/cocos2dx/support/data_support/uthash.h.
2013-04-08 11:55:35 +08:00
James Chen
ef731879f1
Merge pull request #2291 from dumganhar/iss1944-remove-associate-nativeobj
...
fixed #1944 : The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
2013-04-06 20:20:33 -07:00
CocosRobot
3871129c1f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-07 11:13:28 +08:00
Sergej Tatarincev
1510354568
Support variable cell sizes in CCTableView
2013-04-04 17:57:43 +03:00
CocosRobot
0338a3e504
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-04 00:08:15 +08:00
James Chen
f1d48b41e2
issue #1944 : Fixing a typo.
2013-04-03 10:39:40 +08:00
James Chen
ad555e70fb
issue #1944 : Removing commented codes in cc.associateWithNative.
2013-04-03 10:39:15 +08:00
James Chen
6d6bc03465
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1944-remove-associate-nativeobj
2013-04-03 10:27:01 +08:00
CocosRobot
1462c2a570
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-02 12:01:52 +08:00
James Chen
ec7a2f4c5c
fixed #1944 : The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
2013-04-02 11:35:55 +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 #1936 : 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
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 #1841 , obfuscated js source can run on iOS correctly now.
2013-03-22 12:06:04 +08:00
James Chen
d80d68f7e0
fixed #1855 : 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 #1841 , 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
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 #1841 , 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 #1838 : 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 #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
James Chen
3aeb22292b
Reverting ccarray_to_jsval.
2013-03-16 21:23:33 +08:00
James Chen
09757428e7
fixed #1836 : 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 #1830 : Force casting `unsigned short*` to `jschar*` for `cc_utf8_to_utf16`.
2013-03-14 20:34:54 +08:00
James Chen
3e33868a63
fixed #1824 : Exposed cc.EditBox to js.
2013-03-14 18:14:16 +08:00
CocosRobot
0b828a67c7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-14 11:20:23 +08:00
James Chen
a57cc21d7a
Merge pull request #2156 from dumganhar/iss1830-jsb-utf8
...
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 19:59:25 -07:00
James Chen
29aa62d923
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 18:10:54 +08:00
CocosRobot
57b7a85dc8
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-13 12:05:05 +08:00
minggo
85f39cee24
Merge pull request #2114 from linshun/master
...
Added compatible function for multi secene resouces preloading.
2013-03-12 19:38:09 -07:00
CocosRobot
bf31b7af26
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-13 00:03:13 +08:00
James Chen
3aaf5cabdb
Updating cocos2dx.ini(adding CCScheduler to 'abstract_class' section) and adding ScriptingCore::getGlobalObject method.
2013-03-12 22:03:37 +08:00
CocosRobot
ee768ba814
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-11 17:34:03 +08:00
James Chen
c780f2ff78
Merge pull request #2137 from dumganhar/iss1748-jsb-chipmunk-sqlite
...
fixed #1748 : Separating js extension from cocos2dx.hpp/cpp.
1) Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original cocos2dx.hpp/cpp. Developer could remove redundant jsbinding native codes now.
2) cocos2dx.hpp/cpp ~> jsb_cocos2dx_auto.hpp/cpp
3) Adding jsb_cocos2dx_extension_manual.hpp/cpp
2013-03-11 02:31:40 -07:00
James Chen
2a032bc6c9
fixed #1748 : Updating win32 project setting.
2013-03-11 17:24:33 +08:00
James Chen
69b2b13325
fixed #1748 : Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original `cocos2dx.hpp/cpp`.
...
Developer could remove redundant jsbinding codes now.
2013-03-11 16:39:28 +08:00
James Chen
6829f82893
Merge pull request #2107 from SevInf/patch-1
...
fixed #1823 : Using shared NodeLoaderLibrary in CCBReader bindings.
2013-03-10 23:14:56 -07:00
CocosRobot
50f1ca7956
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-10 16:12:51 +08:00
CocosRobot
3b183c0517
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-10 14:03:20 +08:00
James Chen
1a42e85219
fixed #1808 : Updated the submodule of cxx-generator and fixed some compilation errors after that.
2013-03-10 13:55:29 +08:00
James Chen
a91d308070
fixed #1811 : getStringWithContentsOfFile ~> getStringFromFile .
2013-03-08 16:50:16 +08:00
James Chen
91e3570ec4
fixed #1811 : Fixing complication error on win32 after this pull request ( https://github.com/cocos2d/cocos2d-x/pull/2119 ).
2013-03-08 15:15:08 +08:00
James Chen
f7e60e290f
fixed #1811 : Adding a method to get file data for JSB. Updating the way of encoding cpp string to jsval or jsval to cpp string.
2013-03-08 14:34:59 +08:00
CocosRobot
da5d1dcce8
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-07 16:04:48 +08:00
linshun
d60ba89b36
Added compatible functions for HTML5 multi resources preloading.
2013-03-07 15:49:05 +08:00
Sergej Tatarincev
56ab904e0a
Use shared NodeLoaderLibrary in CCBReader bindings
2013-03-06 14:09:01 +02:00
CocosRobot
bc159f1ba7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 16:30:34 +08:00
CocosRobot
bee13bd7d5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 11:04:33 +08:00
CocosRobot
86891fb15f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 09:31:09 +08:00
CocosRobot
dfc1cb8139
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-28 09:51:31 +08:00
James Chen
537abaec42
fixed #1753 : Android works ok now.
2013-02-27 16:57:36 +08:00
James Chen
0d70e6f92f
issue #1753 : Win32 works ok.
2013-02-27 15:45:23 +08:00
James Chen
473e8e6139
issue #1753 : Upgrading SpiderMonkey to Firefox19.0, iOS works ok.
2013-02-27 15:16:49 +08:00
James Chen
9c9e64283e
fixed #1747 : Crash occurs when passing null to cc.AnimationFrame.initWithSpriteFrame.
2013-02-25 14:20:38 +08:00
CocosRobot
e3745b0078
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-22 12:12:11 +08:00
CocosRobot
397457aa68
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-22 10:54:39 +08:00
James Chen
486f7941a7
Merge pull request #2023 from nicolasgramlich/patch-7
...
fixed #1740 : Added cleanup and reset methods to ScriptingCore.
2013-02-21 17:56:55 -08:00
Nicolas Gramlich
84aae750a9
Converted tabs to spaces since that seemed to be the predominant choice in this file.
2013-02-21 08:34:51 -08:00
Nicolas Gramlich
b993c6fa08
Added cleanup and reset methods to ScriptingCore.
2013-02-21 08:33:37 -08:00
CocosRobot
06ad046c2f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-21 10:24:44 +08:00
James Chen
cf33a4538d
fixed #1730 : Binds CCScrollView and CCTableView to js.
2013-02-21 10:06:22 +08:00
CocosRobot
ac0fa1251b
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-19 10:05:12 +08:00
Sergej Tatarincev
0b8713c80c
Make ScriptingCore.cpp compile with C++11 on iOS
...
When compiling with clang -stdlib=libc++ -std=c++11, write, read, and close functions are part of the unistd.h header file.
2013-02-18 09:12:39 +02:00
James Chen
7a902b494c
issue #1724 : fixed errors for HelloJavascript of win32 port.
2013-02-18 14:51:36 +08:00
CocosRobot
9f9d69b14f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-16 11:21:03 +08:00
minggo
3949f0c70f
Merge pull request #1972 from theGoodEvil/fix_texparams_js
...
Use correct arg type for ccTexParams
2013-02-15 18:01:20 -08:00
Guido Lorenz
5f3a63e794
Use correct arg type for ccTexParams
...
In the JavaScript bindings, ccTexParams was initialized with (signed) GLint
values, even though it consists of (unsigned) GLuint values.
2013-02-11 11:09:35 +01:00
minggo
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
minggo
744bfb3cb2
Merge pull request #1945 from dualface/add_CCLuaObjcBridge
...
add CCLuaObjcBridge
2013-02-03 19:32:17 -08:00
CocosRobot
d3086850c7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-03 14:55:53 +08:00
dualface
7839ceb45b
add CCLuaObjcBridge
2013-02-02 02:05:52 +08:00
James Chen
2694cb150b
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
2013-01-29 09:56:38 +08:00
CocosRobot
3450e75789
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-01-28 19:43:29 +08:00
James Chen
119115502d
issue #1683 : Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray.
2013-01-26 22:31:57 +08:00
CocosRobot
fdda0fa285
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-01-25 22:40:36 +08:00
James Chen
ef131beed1
Merge pull request #1885 from dumganhar/refactor-ccfileutils
...
issue #1683 :Refactoring CCFileUtils.TO BE DONE:
Making the api of CCFileUtils more c++ friendly.
2013-01-25 05:55:10 -08:00
James Chen
6f3b22031f
Using new API of getting full path for file name.
2013-01-25 20:51:52 +08:00
minggo
71defcba99
update JSB codes to latest
2013-01-25 18:24:39 +08:00
Rohan Kuruvilla
578b1c741e
Fixing bug in resetting context that fails because of setting UTf8 string twice
2013-01-24 18:37:24 -08:00
James Chen
a3dbfaafd3
Merge pull request #1856 from funkaster/master
...
fixed #1660 : Some fixes to the js debugger.
2013-01-21 17:54:39 -08:00
James Chen
31e91e554e
issue #1661 : Added CrystalCraze for win32 and fix some compilation errors.
2013-01-17 17:07:18 +08:00
Rolando Abarca
a265120f4c
cc namespace
2013-01-16 14:07:51 -08:00
Rolando Abarca
bc19f40239
Merge branch 'gles20'
2013-01-16 14:02:40 -08:00
Rolando Abarca
7ab43b9dfc
adds missing runLoop for cc2dx (debug)
2013-01-16 14:02:05 -08:00
Rolando Abarca
49432ef742
removes old header file reference
2013-01-16 13:42:41 -08:00