Commit Graph

315 Commits

Author SHA1 Message Date
andyque 8c8f9611f7 issue #5183, add CCLayoutExecutant file 2014-05-14 18:03:44 +08:00
minggo 9ab2dae212 Merge pull request #6635 from dumganhar/iss4660-unicode
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
2014-05-12 17:57:25 +08:00
andyque 9a8c87601c Merge branch 'v3' into refactor5057 2014-05-12 15:52:47 +08:00
James Chen a61b1097db issue #4660: Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String 2014-05-10 19:24:03 +08:00
James Chen e84ccc8914 issue #4660: Updates Xcode project 2014-05-10 19:24:03 +08:00
Ricardo Quesada 77c03fcf11 ShaderCache -> GLProgramCache 2014-05-09 18:39:25 -07:00
Ricardo Quesada fec1b82c0a Shader files use STRINGIFY 2014-05-09 16:45:42 -07:00
Ricardo Quesada 6727c6d19c Adds missing files to xcode 2014-05-09 11:45:12 -07:00
andyque d12a71f738 issue #5057, refactor UILayoutDefine 2014-05-09 17:16:11 +08:00
andyque c5a505ec4c issue #5057, Merge branch 'v3' into refactor5057
Conflicts:
	cocos/ui/CocosGUI.h
2014-05-09 15:39:02 +08:00
Dhilan007 c904fff9eb update XCode project.pbxproj 2014-05-09 11:37:14 +08:00
Dhilan007 52d7d804f7 Update XCode project.pbxproj for add files related to VideoWidget. 2014-05-08 18:28:28 +08:00
andyque 0c2fd977ea issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of
Widget and also simplify the enum value
2014-05-08 18:10:21 +08:00
andyque 47acbc24e0 issue #4861, add CCEventFocus and CCEventListener 2014-05-05 11:37:38 +08:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00