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
..
Android.mk	Chipmunk support	2012-08-29 16:35:30 -07:00
CCPhysicsSprite.cpp	Chipmunk support	2012-08-29 16:35:30 -07:00
CCPhysicsSprite.h	Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x.	2012-08-27 10:02:19 -07:00
ScriptingCore.cpp	Remove 'readFileInMemory' to make it compile ok on win32, initialized the member variables for ScriptingCore class.	2012-08-29 14:49:03 -07:00
ScriptingCore.h	Modified the implementation of ScriptingCore::getInstance by using new operator.	2012-08-29 14:49:03 -07:00
cocos2d_generated.cpp.REMOVED.git-id	Updated cocos2d_generated.cpp.	2012-08-29 18:03:34 +08:00
cocos2d_specifics.cpp	Remove iOS specific code	2012-08-28 17:56:01 -07:00
cocos2d_specifics.hpp	Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'.	2012-08-29 14:49:03 -07:00
cocos2dx.cpp.REMOVED.git-id	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
cocos2dx.hpp.REMOVED.git-id	Fixing GC crash issue. Forcing the GC from Javascript at any time, doesn't crash the app	2012-08-28 17:29:25 -07:00
js_bindings_chipmunk_functions.cpp.REMOVED.git-id	Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x.	2012-08-27 10:02:19 -07:00
js_bindings_chipmunk_functions.hpp	Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x.	2012-08-27 10:02:19 -07:00
js_bindings_chipmunk_manual.cpp	Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x.	2012-08-27 10:02:19 -07:00
js_bindings_chipmunk_manual.hpp	Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x.	2012-08-27 10:02:19 -07:00
js_bindings_config.h	Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x.	2012-08-27 10:02:19 -07:00
js_manual_conversions.cpp	Chipmunk support	2012-08-29 16:35:30 -07:00
js_manual_conversions.h	Chipmunk support	2012-08-29 16:35:30 -07:00
spidermonkey_specifics.h	Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'.	2012-08-29 14:49:03 -07:00
uthash.h	Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x.	2012-08-27 10:02:19 -07:00