Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,512 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

16 Commits

Author SHA1 Message Date
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Jeff e9c6f5d02b fix compile errors 2014-09-18 01:30:14 +08:00
Jeff 08e8963b1a fix compile errors 2014-09-18 00:04:48 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 2014-09-01 15:26:25 +08:00
andyque 043acb2fd4 rename webview to UIWebView 2014-08-29 11:28:28 +08:00
andyque 2226d4b420 change WebView namespace and add WebViewTest 2014-08-26 11:39:56 +08:00
andyque 8d1c422ac5 merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
andyque ebf05d1acc add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
zhangcheng 76c12e9029 1. add export to function CocosGUIVersion() 2014-07-22 10:02:00 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +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 06f264e87d rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
Dhilan007 af26fb9b07 issue #4870:Add a ui widget of playing video 2014-05-08 18:13:50 +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
CaiWenzhi 243b7e5822 Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00