James Chen
34f359384c
issue #1530 : Minor fixes in ScriptingCore.cpp, js_bindings_chipmunk_auto_classes.cpp and js_bindings_chipmunk_funcitons.cpp.
2012-11-16 15:58:20 +08:00
Rohan Kuruvilla
f7848eb171
Adding Object Oriented Chipmunk JS bindings
2012-11-16 15:56:29 +08:00
Rohan Kuruvilla
6d59009953
Adding executeAccelerometerEvent for to CCScriptSupport and ScriptingCore
2012-11-16 15:56:29 +08:00
Rohan Kuruvilla
39a4e6a19e
Fixing bindings bug for CCScheduler. Also adding custom bindings for TMXLayer. Also updating ini
2012-11-16 15:56:27 +08:00
Rohan Kuruvilla
66f85468e5
Adding JS conversion of CCDictionary objects, also modified CCArray conversion
2012-11-16 15:56:27 +08:00
Rohan Kuruvilla
672bed3ed0
Updating bindings for ONE_BY_ONE touch handling
2012-11-16 15:56:27 +08:00
Rohan Kuruvilla
f9aea7befe
Changing parameter ordering for callbacks (making thisObj optional). Also adding custom bindigns for CCScheduler
2012-11-16 15:56:26 +08:00
Rolando Abarca
6e9d2e808c
improved debugger
2012-11-15 11:14:57 -08:00
Rolando Abarca
c9df076378
new JSStringWrapper
2012-11-15 11:14:37 -08:00
Rolando Abarca
2ea2cb616c
adds compartment code to chipmunk
2012-11-15 11:13:32 -08:00
Rolando Abarca
b894524ed0
removing some warnings
2012-11-15 11:13:21 -08:00
CocosRobot
cfd84b3fe6
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-08 22:53:19 +08:00
CocosRobot
b72c48f4c5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-06 17:01:34 +08:00
James Chen
449c719d96
issue #1549 : Added "ccdictionary_to_jsval" function, now TMXOrthoObjectsTest and TMXIsoObjectsTest don't crash.
2012-11-06 16:11:45 +08:00
James Chen
21e4f80fbd
Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS.
2012-11-06 14:18:13 +08:00
CocosRobot
5efdb93ef7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-06 10:12:52 +08:00
James Chen
ceb4371f12
issue #1549 : Using new JS API for MoonWarriors.
...
Updated the logics of js_cocos2dx_CCMenuItemSprite_create and js_cocos2dx_CCMenuItemImage_create.
2012-11-05 23:22:59 +08:00
CocosRobot
7de31acd38
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-05 18:50:00 +08:00
James Chen
10ba589ed5
issue #1549 : * Arguments in callbacks:
...
instead of: callback(this, func), it is now:callback( func, [this] )
2012-11-05 18:44:28 +08:00
CocosRobot
da457732b9
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-02 18:56:53 +08:00
James Chen
f88aa5058d
Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-ccb
...
Conflicts:
scripting/javascript/bindings/cocos2d_specifics.cpp
scripting/javascript/bindings/cocos2d_specifics.hpp
tools/tojs/cocos2dx.ini
2012-11-02 18:15:25 +08:00
CocosRobot
2bba105453
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-02 15:38:46 +08:00
James Chen
f031a09e77
Added cc.TMXLayer.getTileFlagsAt to jsbindings.
2012-11-02 15:21:44 +08:00
James Chen
d2a9acd227
issue #1530 : Two memory leaks fixes.
2012-11-01 16:06:05 +08:00
James Chen
026662ee5f
issue #1530 : Assigned JSVAL_VOID to member variables for JSCallbackWrapper class.
2012-11-01 15:45:22 +08:00
Rohan Kuruvilla
b3c6f1a2e1
Adding bindings for CCBReader and other improvements.
...
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
2012-11-01 15:34:23 +08:00
Rohan Kuruvilla
ea92936c1f
Adding bindings for CCBReader and other improvements.
...
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
2012-11-01 00:08:01 -07:00
Rohan Kuruvilla
dc51a78981
Updating bindings for CCBReader. It is now very similar to cocos2d-iphone CCBReader bindings
2012-11-01 00:06:24 -07:00
Rohan Kuruvilla
2fbb748b7c
Adding sections for CCBReader bindings generation as well as renaming other bindings
2012-11-01 00:06:24 -07:00
James Chen
bdbb70bea5
Merge branch 'gles20' of https://github.com/funkaster/cocos2d-x into js-surith-gnu
2012-10-31 10:04:35 +08:00
CocosRobot
e3304e44ba
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-10-29 18:22:46 +08:00
Rohan Kuruvilla
8f026d0b21
Fixing Javascript bindings Android makefile to include extensions
2012-10-29 15:15:00 +08:00
Rohan Kuruvilla
6773dc4154
Adding object roots for extra parameter of CallFunc and schedule
2012-10-29 15:14:25 +08:00
Rohan Kuruvilla
5760ea305c
Fixing CallFuncN bindings to properly pass optional third parameter
2012-10-29 15:14:11 +08:00
Rohan Kuruvilla
094d52664d
Fixing bug in CCNode::copy bindings. Fixes MoonWarriors crash
2012-10-29 15:10:29 +08:00
James Chen
1ede7b6434
Modifying action/schedules cleanup, ignoring libjs_static.a of debugging version.
2012-10-29 15:10:13 +08:00
Rohan Kuruvilla
a409fc0164
Fixing CallFunc bindings to support easier cleanup
2012-10-29 15:07:27 +08:00
Rohan Kuruvilla
f8fc7328d7
Fixing bug in bindings for MenuItemImage
2012-10-29 15:06:56 +08:00
Rohan Kuruvilla
c24acd4733
Changing ScriptingCore flow of execution of targetted Touch events
2012-10-29 15:06:34 +08:00
Rohan Kuruvilla
7ede1373f7
Adding function to cleanup actions and schedule to ScriptingCore
2012-10-29 15:06:10 +08:00
James Chen
0ce4f61bb6
Updating submodule reference to latest autogenerated bindings.
2012-10-26 10:04:29 +08:00
James Chen
26f7b36797
update submodule for JS-Bindings auto-gen codes.
2012-10-25 11:40:24 +08:00
Rolando Abarca
463ae31180
upgrades to new spidermonkey API
...
FF beta - this fixes the auto-compartment issue
2012-10-24 11:14:15 -07:00
Rolando Abarca
003f6e4cf3
fixes ScriptingCore for FF 16 API
2012-10-19 09:54:21 -07:00
James Chen
871541ac6b
Updated one comment.
2012-10-19 15:03:10 +08:00
James Chen
e5096ce091
Made TestJavascript and MoonWarriors work ok on android after merging Rolando's commit.
2012-10-19 15:01:05 +08:00
James Chen
1a373f70ff
issue #1517 : Upgrading js engine to FF 16.0.1 for IOS.
2012-10-19 13:41:03 +08:00
James Chen
de3376b43f
issue #1517:[Win32]Upgrading SpiderMonkey js engine to FF 16.0.1
2012-10-19 11:15:23 +08:00
Rolando Abarca
b0f02a0773
updates on the js front
2012-10-18 17:44:41 -07:00
James Chen
c202671636
Update to latest generated bindings.
2012-10-15 17:31:25 +08:00
folecr
2ac7a5cbe4
microlattice : updating submodule reference to latest autogenerated bindings
2012-10-12 09:48:37 -07:00
James Chen
21491317c0
Fix compilation errors.
2012-10-12 15:41:45 +08:00
Rohan Kuruvilla
eafd6ebf08
Fixing restart of context to not leak memory
2012-10-11 18:48:37 -07:00
Rohan Kuruvilla
e7ac758b9f
Updating bindings to match cocos2d-html5
2012-10-11 18:45:22 -07:00
Rohan Kuruvilla
0c1c5a432d
Adding support to pass array of CCPoints from JS
2012-10-11 18:44:46 -07:00
folecr
4af5abbc56
Update submodule reference to point to latest auto-generated changes
2012-10-10 20:07:46 -07:00
James Chen
26a5f31f0e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1469-moonwarriors
2012-10-10 15:25:49 +08:00
James Chen
700b83f3b9
issue #1469 : Added 'setBlendFunc' support for CCSprite, CCParticleSystem...etc.
2012-10-10 15:25:27 +08:00
James Chen
9f93b609e8
issue #1469 : Added cc.config for js-bindings.
2012-10-10 15:24:20 +08:00
folecr
12d711a13e
Update to latest generated JS bindings
2012-10-09 21:18:58 -07:00
Rohan Kuruvilla
12292afee6
Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modifying cocos2dx.ini
2012-10-09 15:03:14 -07:00
walzer
d6ba2b44c4
update javascript/bindings/generated/ submodule revision pointer
2012-09-28 10:29:21 +08:00
folecr
5859260b25
Update to latest generated bindings
2012-09-27 13:39:49 -07:00
folecr
f1aff597a2
Update makefile to include CocosDenshion
2012-09-27 13:39:49 -07:00
minggo
e20b933f1a
make TestJavaScript work and fix some warnings
2012-09-24 13:57:45 +08:00
James Chen
e4cee68688
Added libExtensions.lib for TestJavascript vs2010 project.
...
Removed some calling of 'USING_NS_CC;' in extensions.
2012-09-24 11:47:33 +08:00
James Chen
426915dd4a
fixed some compilation error for win32 platform.
2012-09-24 11:05:15 +08:00
folecr
78bfc2df62
Fix spurious file introduced into makefile
2012-09-21 12:09:26 -07:00
folecr
12e88ac514
Update bindings
2012-09-21 12:07:30 -07:00
folecr
2a78f8d176
Separate out cocos specific manual type conversions.
2012-09-21 11:38:19 -07:00
folecr
6730294dbe
Generated bindings are a submodule pointing to a separate repository
...
* This allows bindings to be generated by a build server
* ... when the Cocos2D-X API changes
2012-09-21 11:38:19 -07:00
minggo
29fad4d570
Merge branch 'gles20-android-refactoring' of https://github.com/nicolasgramlich/cocos2d-x into merge_nicolas
2012-09-21 11:05:31 +08:00
Rohan Kuruvilla
100a7a1883
Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader
2012-09-20 18:02:17 -07:00
Rohan Kuruvilla
d097406f18
Modifying MenuItemToggle bindings to make it work
2012-09-20 18:02:17 -07:00
Rohan Kuruvilla
9e1e64509b
Copying changes previously made into cxx-generator/targets/spidermonkey/common
...
1. Fixed memory leak while removing proxy objects
2. Fixed JS Context restart
3. Added JS conversion for CCArray
4. Updated generated bindings with some more classes
2012-09-20 18:02:17 -07:00
Rohan Kuruvilla
dde8d50d15
Adding member function executeFunctionWithOwner to ScriptingCore
2012-09-20 14:45:35 -07:00
Rohan Kuruvilla
57680ec2d6
Adding CCBuilderReader JS bindings
2012-09-20 14:45:34 -07:00
folecr
c6f06ddced
Refer to cocos2dx.cpp from the generated subdirectory
2012-09-18 17:02:21 -07:00
folecr
60fd3c5b9c
Remove generated files...
...
* ... in favour of automatically generated bindings
* ... in the generated/ subfolder.
2012-09-18 17:02:21 -07:00
Nicolas Gramlich
48062e222d
Reverted change in scripting/javascript/bindings/Android.mk.
2012-09-18 11:01:31 -07:00
Nicolas Gramlich
c2a62875cf
Added ANDROID_SCRIPTINGCORE_LOAD_SCRIPTS_FROM_EXTERNAL_ASSET_DIRECTORY flag, that allows to load from external assets directory instead of from internal apk assets directory.
2012-09-13 11:13:02 -07:00
Nicolas Gramlich
696cdbaa8c
Minor build fix due to merge fail.
2012-09-12 16:55:56 -07:00
James Chen
b6e4c98334
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua
2012-09-11 14:03: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
folecr
991d63eaad
Update location of spidermonkey-android makefile
2012-09-10 16:12:48 -07:00
James Chen
0d2c2b3bf8
issue #1454 : Updated win32 project configuration and some .plist files.
...
Removed old binding files.
2012-08-31 22:01:57 +08:00
James Chen
9ba5a1bfef
issue #1454 : Removed COCOS2D_JAVASCRIPT macro.
2012-08-31 21:23:23 +08:00
James Chen
e2629ef175
Fixed some compile errors on win32.
2012-08-30 23:10:09 +08:00
James Chen
e584b94728
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js
...
Conflicts:
scripting/javascript/bindings/cocos2d_generated.cpp
2012-08-30 20:16:54 +08:00
Rohan Kuruvilla
743478570c
Chipmunk support
...
* Changing CGPoint to cpVect
* Fix build and test code
2012-08-29 16:35:30 -07:00
James Chen
68e9210434
Modified the implementation of ScriptingCore::getInstance by using new operator.
...
Some implemented method should return default value.
2012-08-29 14:49:03 -07:00
James Chen
2dd0b9e0d3
Using '#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)' instead of '#ifdef ANDROID' to make it compiled successfully on win32.
2012-08-29 14:49:03 -07:00
James Chen
708be4e474
Remove 'readFileInMemory' to make it compile ok on win32, initialized the member variables for ScriptingCore class.
2012-08-29 14:49:03 -07:00
James Chen
a2b5916301
Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'.
...
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
2012-08-29 14:49:03 -07:00
James Chen
0fe9d12eaa
Updated cocos2d_generated.cpp.
2012-08-29 18:03:34 +08:00
folecr
122dab03d2
Remove iOS specific code
2012-08-28 17:56:01 -07:00
folecr
3c11684bf7
Remove commented code
2012-08-28 17:56:01 -07:00
folecr
6c604f02d3
Fix typo and add logs
2012-08-28 17:44:01 -07:00
folecr
148b67d374
Disable use of chipmunk
2012-08-28 17:44:00 -07:00
folecr
1902cdda05
Chipmunk bindings : clean up code
...
* Remove dead code
* Use generic float instead of platform-specific CGFloat
2012-08-28 17:44:00 -07:00
folecr
7636758f94
Add chipmunk library reference to build
2012-08-28 17:43:59 -07:00
folecr
c2f908cf8f
Hardcoded modification to generated file to work platform-specific code
...
* addPVRTCImage() is not supported on Android
2012-08-28 17:43:59 -07:00
James Chen
71b147ce2f
Use CCFileUtils and CCString to load file contents
2012-08-28 17:43:59 -07:00
James Chen
60dae250f2
Use CCLOG to implement js_log
2012-08-28 17:43:59 -07:00
folecr
4256dc6830
Update makefiles
2012-08-28 17:43:58 -07:00
Rohan Kuruvilla
6c8d2ea75b
Fixing GC crash issue. Forcing the GC from Javascript at any time, doesn't crash the app
...
Fixing GC crash issue. Bug in bind_menu_item. There is no more problem with GC, including force_GC
Updating generated bindings to remove std::string scoping bug
2012-08-28 17:29:25 -07:00
Rohan Kuruvilla
8d7516a0ef
Test project for cocos2d-x js.
2012-08-27 10:07:31 -07:00
Rohan Kuruvilla
ccd5e0a066
Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x.
2012-08-27 10:02:19 -07:00
folecr
51708123a1
remove scripting/javascript/bindings
2012-08-27 10:01:21 -07:00
Donald Alan Morrison
e4f6e48bf5
Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 12:01:26 -07:00
Donald Alan Morrison
2b4bab18af
Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 09:00:57 -07:00
Donald Alan Morrison
eaf0e71e57
Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 08:35:48 -07:00
Donald Alan Morrison
5ba3ff4d9a
Fixed VS2010 Warning C4065: switch statement contains 'default' but no 'case' labels.
2012-08-24 01:33:28 -07:00
Donald Alan Morrison
3c7846e32f
Fixed VS2010 Warning: C4018: '<' : signed/unsigned mismatch
2012-08-23 23:35:25 -07:00
James Chen
848381ef0f
Fixed a compile in cocos2d_generated.cpp.
2012-08-03 10:44:48 +08:00
pengfei tong
a37fd743e0
[FIX] testjs
2012-08-02 16:23:31 +08:00
pengfei tong
b93d0b5ebf
[LOG] add linux port
2012-08-02 13:02:59 +08:00
James Chen
1efe20e4c3
Fix a compile error in TestJavascript project.
2012-07-27 14:16:23 +08:00
James Chen
77f1fba566
issue #1399 : Adjust folder structure, made it built successfully on win32.
2012-07-20 14:05:52 +08:00