axmol/cocos/scripting/js-bindings/script/studio/parsers
andyque 82f597ce98 Merge branch 'v3.7.1' into v3
# Conflicts:
#	cocos/scripting/lua-bindings/auto/api/CheckBox.lua
#	cocos/ui/UICheckBox.cpp
#	cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
..
action-1.x.js Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:23:06 +08:00
action-2.x.js Update JSON parser 2015-08-04 16:04:35 +08:00
compatible.js Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:23:06 +08:00
scene-1.x.js Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:59:42 +08:00
timelineParser-1.x.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
timelineParser-2.x.js Merge branch 'v3.7.1' into v3 2015-08-12 17:59:50 +08:00
uiParser-1.x.js Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:23:06 +08:00