Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/base
History
Huabing.Xu 3b83d52f95 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/ui/UIButton.cpp
	cocos/ui/UIButton.h
	cocos/ui/UICheckBox.cpp
	cocos/ui/UICheckBox.h
	cocos/ui/UIImageView.cpp
	cocos/ui/UIImageView.h
	cocos/ui/UILayout.cpp
	cocos/ui/UILayout.h
	cocos/ui/UILoadingBar.cpp
	cocos/ui/UIRichText.h
	cocos/ui/UISlider.cpp
	cocos/ui/UIText.cpp
	cocos/ui/UIText.h
	cocos/ui/UITextAtlas.cpp
	cocos/ui/UITextAtlas.h
	cocos/ui/UITextBMFont.cpp
	cocos/ui/UITextBMFont.h
	cocos/ui/UITextField.cpp
	cocos/ui/UITextField.h
	cocos/ui/UIWidget.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
 		2014-04-19 00:30:34 +08:00
..
CCAffineTransform.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCAffineTransform.h remove kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
CCAutoreleasePool.cpp remove unused params warnings 2014-03-20 16:34:42 +08:00
CCAutoreleasePool.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCConsole.cpp Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-15 17:10:24 +08:00
CCConsole.h issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
CCData.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCData.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCDataVisitor.cpp issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
CCDataVisitor.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCGeometry.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCGeometry.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCMap.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCNS.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCNS.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCPlatformConfig.h added CC_PLATFORM_WINRT and WP8 2014-03-22 06:11:27 -07:00
CCPlatformMacros.h enable CC_ENABLE_CACHE_TEXTURE_DATA for wp8 2014-03-22 06:12:04 -07:00
CCRef.cpp closed #4097: Adds a macro to disable inserting script binding relevant codes. 2014-02-20 16:40:46 +08:00
CCRef.h issue #4106: Ref class's constructor should be protected. 2014-02-21 11:21:08 +08:00
CCValue.cpp fix Value's memory leak 2014-04-05 18:55:55 +08:00
CCValue.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCVector.h issue #4106: Updates comments for 'Vector::eraseObject' 2014-02-21 11:30:55 +08:00
CMakeLists.txt issue #4729: Compilation error fixes for linux 2014-04-10 00:36:42 +08:00
atitc.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
atitc.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
etc1.cpp issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
etc1.h issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
s3tc.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
s3tc.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00