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
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 		2014-04-25 16:20:24 +08:00
..
proj.win32 Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
proj.wp8 added wp8 support files and projects 2014-03-28 15:39:20 -07:00
Android.mk Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
CCProtectedNode.cpp Merge branch 'v3' into develop_migrate_math_lib_merge 2014-04-25 16:20:24 +08:00
CCProtectedNode.h visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00
CMakeLists.txt Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
CocosGUI.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
CocosGUI.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
GUIDefine.h Removed unused comments in GUIDefine.h 2014-04-10 17:15:59 +08:00
UIButton.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIButton.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UICheckBox.cpp fix warning in compiling 2014-04-21 09:52:59 +08:00
UICheckBox.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIHBox.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHelper.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHelper.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIImageView.cpp Widget supports contentsize 2014-04-17 14:08:25 +08:00
UIImageView.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UILayout.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UILayout.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UILayoutDefine.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
UILayoutDefine.h let ios project compile correct 2014-03-11 18:48:26 +08:00
UILayoutParameter.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
UILayoutParameter.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIListView.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
UIListView.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
UILoadingBar.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UILoadingBar.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UIPageView.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
UIPageView.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
UIRelativeBox.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIRelativeBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIRichText.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIRichText.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIScrollInterface.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
UIScrollView.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
UIScrollView.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
UISlider.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UISlider.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIText.cpp Widget supports contentsize 2014-04-17 14:08:25 +08:00
UIText.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UITextAtlas.cpp Widget supports contentsize 2014-04-17 14:08:25 +08:00
UITextAtlas.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UITextBMFont.cpp Widget supports contentsize 2014-04-17 14:08:25 +08:00
UITextBMFont.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UITextField.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UITextField.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIVBox.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIVBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIWidget.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIWidget.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00