Commit Graph

7 Commits

Author SHA1 Message Date
James Chen 89a51433b8 issue #1564: Make TestJavascript works on windows. 2012-11-22 10:24:26 +08:00
Rolando Abarca ac539667f4 Merge remote-tracking branch 'origin/gles20' into gles20
Conflicts:
	scripting/javascript/bindings/ScriptingCore.cpp
	scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp
2012-11-16 09:44:34 -08:00
Rohan Kuruvilla f7848eb171 Adding Object Oriented Chipmunk JS bindings 2012-11-16 15:56:29 +08:00
Rolando Abarca 2ea2cb616c adds compartment code to chipmunk 2012-11-15 11:13:32 -08:00
minggo e20b933f1a make TestJavaScript work and fix some warnings 2012-09-24 13:57:45 +08:00
folecr 2a78f8d176 Separate out cocos specific manual type conversions. 2012-09-21 11:38:19 -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