Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/ui
History
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 		2014-09-09 12:18:31 -07:00
..
UIEditBox Squashed commit of the following: 2014-09-09 12:18:31 -07:00
proj.win32 Merge branch 'v3' into mergeExtensionEditBox 2014-09-01 15:26:25 +08:00
proj.wp8 merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
Android.mk remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
CocosGUI.cpp
…
CocosGUI.h Merge branch 'v3' into mergeExtensionEditBox 2014-09-01 15:26:25 +08:00
GUIDefine.h refact ui header file include 2014-06-04 14:56:33 +08:00
GUIExport.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIButton.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
UIButton.h add customization to UIButton and UIPageView 2014-08-14 11:14:24 +08:00
UICheckBox.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
UICheckBox.h deprecated UICheckBox setSelectedState/getSelectedState, use isSelected/setSelected instead 2014-08-15 15:26:19 +08:00
UIDeprecated.cpp add MarginZero as an external variable 2014-06-27 15:56:29 +08:00
UIDeprecated.h add MarginZero as an external variable 2014-06-27 15:56:29 +08:00
UIHBox.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIHBox.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIHelper.cpp refactor 2014-07-30 10:45:35 +08:00
UIHelper.h refactor 2014-07-30 10:45:35 +08:00
UIImageView.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIImageView.h refactor ImageView 2014-07-30 15:27:18 +08:00
UILayout.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
UILayout.h add swallow touch and propagation customization to UIWidgets 2014-08-15 15:28:28 +08:00
UILayoutManager.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
UILayoutManager.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UILayoutParameter.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UILayoutParameter.h add virtual destructor 2014-08-11 15:54:40 +08:00
UIListView.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIListView.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UILoadingBar.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
UILoadingBar.h refactor loadingBar 2014-07-30 16:08:29 +08:00
UIPageView.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIPageView.h fix typo 2014-08-14 14:36:30 +08:00
UIRelativeBox.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIRelativeBox.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIRichText.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
UIRichText.h fix RichText visit issue 2014-07-24 11:51:47 +08:00
UIScale9Sprite.cpp remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
UIScale9Sprite.h remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
UIScrollView.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIScrollView.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UISlider.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
UISlider.h refactor Slider control 2014-07-30 15:52:27 +08:00
UIText.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIText.h Correct some typos/mistakes in declarations 2014-07-29 13:47:21 +09:00
UITextAtlas.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UITextAtlas.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UITextBMFont.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UITextBMFont.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UITextField.cpp deprecated ui::TextField getStringValue and setText, use getString and 2014-09-09 13:59:35 +08:00
UITextField.h deprecated ui::TextField getStringValue and setText, use getString and 2014-09-09 13:59:35 +08:00
UIVBox.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIVBox.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIVideoPlayer.h Fixed VideoPlayer can't quitting the full screen mode by press the back key. 2014-07-17 21:10:26 +08:00
UIVideoPlayerAndroid.cpp GLView Hook 2014-07-31 00:53:04 +08:00
UIVideoPlayerIOS.mm fix conflict 2014-08-08 14:04:38 +08:00
UIWebView-inl.h rename webview to UIWebView 2014-08-29 11:28:28 +08:00
UIWebView.cpp Squashed commit of the following: 2014-09-09 12:18:31 -07:00
UIWebView.h rename webview to UIWebView 2014-08-29 11:28:28 +08:00
UIWebView.mm Squashed commit of the following: 2014-09-09 12:18:31 -07:00
UIWebViewImpl_android.cpp Squashed commit of the following: 2014-09-09 12:18:31 -07:00
UIWebViewImpl_android.h Squashed commit of the following: 2014-09-09 12:18:31 -07:00
UIWebViewImpl_iOS.h rename webview to UIWebView 2014-08-29 11:28:28 +08:00
UIWebViewImpl_iOS.mm rename webview to UIWebView 2014-08-29 11:28:28 +08:00
UIWidget.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIWidget.h add click event listener to Widget 2014-08-21 10:21:07 +08:00