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

47 Commits

Author SHA1 Message Date
andyque 29e9ef7edf Merge branch 'v3' into modifyWidgetDefaultBehavior 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
 2014-12-25 18:08:07 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
Liam 7c4d31feab update for lay out samples 2014-12-22 14:51:50 +08:00
andyque e118b085b8 add UIText bug fix tests 2014-11-26 15:05:20 +08:00
andyque 8433127b45 finish tests 2014-11-07 11:11:51 +08:00
andyque 4bfa94b8c2 add button flip test 2014-11-07 11:11:51 +08:00
Dale Stammen f2d9fd2746 enabled tests for winrt 2014-10-23 07:23:13 -07:00
Huabing.Xu ff27c3539d [ci skip] fix typo 2014-10-21 17:37:00 +08:00
andyque 952e52365b fix scrollView rotate issue 2014-10-17 14:02:49 +08:00
andyque f3f15c58fe remove UIWebView.cpp in win32 2014-10-16 16:46:49 +08:00
andyque fb1adb5b90 add issue tests skeleton 2014-10-10 17:07:08 +08:00
andyque 53d28168fe remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32 2014-09-24 16:39:32 +08:00
andyque 7615eb8d39 fix editbox test 2014-09-19 14:21:18 +08:00
andyque 6badfb30e1 add getTitleRenderer interface to UIButton 2014-09-17 10:57:40 +08:00
andyque c81cfc1ecf fix text doesn't scale with button issue 2014-09-12 14:24:27 +08:00
andyque ed22792a72 fix text only button issue 2014-09-12 13:50:13 +08:00
andyque 0076953f97 fix iOS compile error 2014-09-01 15:55:09 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
andyque cd031c4493 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/Android.mk
	cocos/ui/Android.mk
 2014-08-29 10:25:24 +08:00
minggo 6a8270f33b Merge pull request #7900 from minggo/setposition-optimize 
not create Vec as possible for setting position
 2014-08-28 14:31:54 +08:00
minggo 9fb977ff99 not create Vec as possible for setting position 2014-08-28 11:41:18 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
andyque 2226d4b420 change WebView namespace and add WebViewTest 2014-08-26 11:39:56 +08:00
andyque 0517ceb0dc add scrollView nested tests 2014-08-15 16:21:27 +08:00
andyque 0e637b4d9f add swallow touch and propagation customization to UIWidgets 2014-08-15 15:28:28 +08:00
minggo 8364e179a4 Merge pull request #7780 from andyque/addOptionsForHardCodedValue 
add customization to UIButton and UIPageView
 2014-08-15 15:16:12 +08:00
andyque 18851d3e81 add customization to UIButton and UIPageView 2014-08-14 11:14:24 +08:00
andyque e2d609c05d add UITextField color & place hold color, fix double delete bug 2014-08-13 11:28:37 +08:00
andyque f44906d56c fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property 2014-08-05 08:11:37 +08:00
andyque 1de2b78d61 refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
andyque ebf05d1acc add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
minggo b2e705acd8 Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf 
fix remove self in Widget touch callback issue
 2014-07-28 14:04:20 +08:00
andyque 7353f8685a Simplify Widget ContentSize cascade change algorithm 2014-07-25 14:59:58 +08:00
andyque 3502cb0a23 fix remove self in Widget touch callback issue 2014-07-25 14:23:04 +08:00
andyque 4fe3723edf add TextField TrueTypeFont tests 2014-07-14 14:29:28 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
andyque 6f33e4b84f add UIPageView button tests 2014-07-07 15:31:06 +08:00
andyque 634f1b58c4 add todo to reminder me 2014-06-25 14:10:53 +08:00
andyque 1902fdc9f4 dimiss ListView focus tests 2014-06-25 14:04:32 +08:00
andyque 57d5e6f2d5 issue #5176, add ListView focus test 2014-05-22 11:01:58 +08:00
Ricardo Quesada dc711643cd Squashed commit of the following: 
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 14 10:03:44 2014 -0700

    math renames

    `Vector2` -> `Vec2`
    `Vector3` -> `Vec3`
    `Vector4` -> `Vec4`
    `Matrix` -> `Mat4`

commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:24:28 2014 -0700

    raw version of rename Vector3

commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:07:14 2014 -0700

    rename Vector2 after merge

commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:05:30 2014 -0700

    Merge branch 'v3' into v3_renameMathClassName

    Conflicts:
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp

commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 08:51:45 2014 -0700

    rename vector2 in tests/cpp-empty-test folder

commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:58:23 2014 -0700

    rename vector2 in tests/cpp-tests cpp files

commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:52:57 2014 -0700

    rename vector2 in tests/cpp-tests head files

commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:49:48 2014 -0700

    rename vector2 in extension folder

commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:47:22 2014 -0700

    rename vector2 in cocos/2d cpp files

commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:44:39 2014 -0700

    rename vector2 in cocos/2d head files

commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:59 2014 -0700

    rename vector2 in cocos/base folder

commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:43 2014 -0700

    rename vector2 in cocos/deprecated folder

commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:26 2014 -0700

    rename vector2 in cocos/editor-support folder

commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:36:48 2014 -0700

    rename vector2 in cocos/ui folder

commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:39 2014 -0700

    rename vector2 in cocos/renderer folder

commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:15 2014 -0700

    rename vector2 in cocos/physics folder

commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:25:01 2014 -0700

    rename vector2 in cocos/math folder

commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:16:55 2014 -0700

    rename Vector2 to Vec2
    deprecate typedef Vector2
 2014-05-14 10:07:09 -07:00
andyque 6cb3b47488 closed #5110, refactor 2014-05-14 17:07:24 +08:00
andyque 46cf6251b6 issue #5110, rename a member variable and delete gui prefix in ui tests 2014-05-14 11:26:04 +08:00
Dhilan007 06f264e87d rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
Dhilan007 972f9447dd issue #4876:Add test case to play video 2014-05-08 18:14:32 +08:00
andyque 898a66131a issue #5056. move gui test from ExtensionsTest to the outside 2014-05-08 14:35:45 +08:00