Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/scripting/javascript/bindings
History
Huabing.Xu bc55d3246b Merge branch 'develop' into free_instead_of_delete 
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG[ci skip]
  Update AUTHORS [ci skip]
  fix bug: cccolor to jsval function has error in jsb
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  C++11: NULL -> nullptr
  [ci skip]
  Fix: UserDefault::createXMLFile with correct XML definition.
  [ci skip]
  [ci skip]
  [ci skip]
  Fix bug: rename const with under line seperator
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Fix bug: Z fighting on TransitionScenePageTurn
  Fixed bugs
  Modify reader and fixed bugs
  ...

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 		2013-11-14 14:47:01 +08:00
..
chipmunk Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
cocosbuilder Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue 2013-11-06 15:31:58 +08:00
cocostudio Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue 2013-11-06 15:31:58 +08:00
extension issue #2826: Bug fixes after using Spidermonkey v25. Adding JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET macro. 2013-10-31 15:13:49 +08:00
localstorage [sp v25] Fixing complication errors after updating Spidermonkey to v25. 2013-10-31 11:15:17 +08:00
network Some fixes: 2013-11-11 14:36:42 +08:00
proj.win32 Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
Android.mk Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
ScriptingCore.cpp replaces `delete[]` with `free()` in C-based API 2013-11-11 18:09:47 -08:00
ScriptingCore.h Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
cocos2d_specifics.cpp.REMOVED.git-id replaces `delete[]` with `free()` in C-based API 2013-11-11 18:09:47 -08:00
cocos2d_specifics.hpp Using std::unordered_map instead of UTHASH for js_type_class_t. 2013-11-11 14:36:43 +08:00
js_bindings_config.h issue #2826: Bug fixes after using Spidermonkey v25. Adding JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET macro. 2013-10-31 15:13:49 +08:00
js_bindings_core.cpp Some fixes: 2013-11-11 14:36:42 +08:00
js_bindings_core.h Removing JSB Version since JSB source codes will be updated with cocos2d-x. 2013-11-11 10:40:51 +08:00
js_bindings_opengl.cpp Using std::unordered_map instead of UTHASH for js_type_class_t. 2013-11-11 14:36:43 +08:00
js_bindings_opengl.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
js_manual_conversions.cpp fix bug: cccolor to jsval function has error in jsb 2013-11-14 12:03:44 +08:00
js_manual_conversions.h Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
jsb_helper.h [sp v25] Fixing complication errors after updating Spidermonkey to v25. 2013-10-31 11:15:17 +08:00
jsb_opengl_functions.cpp Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
jsb_opengl_functions.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
jsb_opengl_manual.cpp Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
jsb_opengl_manual.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
jsb_opengl_registration.cpp [sp v25] Fixing complication errors after updating Spidermonkey to v25. 2013-10-31 11:15:17 +08:00
jsb_opengl_registration.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
spidermonkey_specifics.h Using std::unordered_map instead of UTHASH for js_type_class_t. 2013-11-11 14:36:43 +08:00