Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/editor-support/cocostudio/WidgetReader
History
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 		2015-08-02 22:28:27 +08:00
..
ArmatureNodeReader GBKToUTF8 2015-06-17 13:16:06 +08:00
ButtonReader And more warnings. 2015-07-07 23:10:04 +08:00
CheckBoxReader GBKToUTF8 2015-06-17 13:16:06 +08:00
ComAudioReader GBKToUTF8 2015-06-17 13:16:06 +08:00
GameMapReader Fix cocos reader bug. 2015-07-08 16:13:38 +08:00
GameNode3DReader Optimization of Custom Data. 2015-07-23 16:30:23 +08:00
ImageViewReader GBKToUTF8 2015-06-17 13:16:06 +08:00
LayoutReader GBKToUTF8 2015-06-17 13:16:06 +08:00
ListViewReader GBKToUTF8 2015-06-17 13:16:06 +08:00
LoadingBarReader GBKToUTF8 2015-06-17 13:16:06 +08:00
Node3DReader update for reader 2015-07-06 16:14:41 +08:00
NodeReader Optimization of Custom Data. 2015-07-23 16:30:23 +08:00
PageViewReader GBKToUTF8 2015-06-17 13:16:06 +08:00
Particle3DReader GBKToUTF8 2015-06-17 13:16:06 +08:00
ParticleReader Fix cocos reader bug. 2015-07-08 16:13:38 +08:00
ProjectNodeReader GBKToUTF8 2015-06-17 13:16:06 +08:00
ScrollViewReader GBKToUTF8 2015-06-17 13:16:06 +08:00
SingleNodeReader GBKToUTF8 2015-06-17 13:16:06 +08:00
SkeletonReader some doxygen comments and copyright 2015-07-24 01:30:34 +08:00
SliderReader Fix percentage setting won't effect when UISlider's background resource set to null 2015-07-10 17:00:16 +08:00
Sprite3DReader fix simulator crash when sprite3d resource is error 2015-07-29 16:52:40 +08:00
SpriteReader GBKToUTF8 2015-06-17 13:16:06 +08:00
TextAtlasReader Remove missing resource label from all UI widget 2015-05-22 18:21:59 +08:00
TextBMFontReader GBKToUTF8 2015-06-17 13:16:06 +08:00
TextFieldReader GBKToUTF8 2015-06-17 13:16:06 +08:00
TextReader Fixes some warnings and a related bug in CCSprite. 2015-07-07 23:01:24 +08:00
UserCameraReader update for code format 2015-07-22 14:11:20 +08:00
NodeReaderDefine.cpp Add flat buffers reader and serialize 2014-11-21 15:15:38 +08:00
NodeReaderDefine.h GBKToUTF8 2015-06-17 13:16:06 +08:00
NodeReaderProtocol.cpp Add flat buffers reader and serialize 2014-11-21 15:15:38 +08:00
NodeReaderProtocol.h GBKToUTF8 2015-06-17 13:16:06 +08:00
WidgetReader.cpp Optimization of Custom Data. 2015-07-23 16:30:23 +08:00
WidgetReader.h GBKToUTF8 2015-06-17 13:16:06 +08:00
WidgetReaderProtocol.h GBKToUTF8 2015-06-17 13:16:06 +08:00