andyque
|
a4bd3879ac
|
fix ListView addChild problem
|
2014-06-25 16:17:16 +08:00 |
minggo
|
66703addb2
|
fixed #4693: override addChild by name
|
2014-06-25 11:27:48 +08:00 |
andyque
|
5f5b705bee
|
refactor setSize to setContentSize and deprecated the old interface
|
2014-06-20 14:03:33 +08:00 |
andyque
|
4ca184b58a
|
issue #5161, deprecated getSize
|
2014-06-20 11:18:53 +08:00 |
andyque
|
585ccf2c71
|
issue #5161, replace all _size to _contentSize
|
2014-06-20 10:40:16 +08:00 |
pandamicro
|
94fdff1da9
|
Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
|
2014-06-18 11:51:52 +08:00 |
pandamicro
|
d00c9fe70a
|
Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary)
|
2014-06-16 12:50:35 +08:00 |
pandamicro
|
d524ba1013
|
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
|
2014-06-13 17:59:23 +08:00 |
andyque
|
7a25fbfe29
|
refactor touch event
|
2014-06-09 10:23:11 +08:00 |
Ricardo Quesada
|
79ebc546f8
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
|
2014-06-04 09:19:22 -07:00 |
andyque
|
38e274de73
|
refact ui header file include
|
2014-06-04 14:56:33 +08:00 |
andyque
|
652c214374
|
remove sortChildren of Layout
|
2014-06-04 10:10:50 +08:00 |
Ricardo Quesada
|
1b8d0d88df
|
Adds setNormalizedPosition()
Changes in `visit()` were done in order to do it
in a robust and fast way.
|
2014-05-30 16:42:05 -07:00 |
andyque
|
769300d25e
|
rename UILayout
Executant.h to UILayoutManager.h
|
2014-05-28 10:17:34 +08:00 |
andyque
|
c5a118ee1b
|
refactor UILayoutExecutant to LayoutManager
|
2014-05-28 10:11:49 +08:00 |
andyque
|
df13d4033c
|
refactor Layout and Widget
|
2014-05-27 13:49:00 +08:00 |
andyque
|
b17de0cdcb
|
add const to UILayout
|
2014-05-27 11:30:35 +08:00 |
andyque
|
e32a637bf5
|
add const to ui framework methods
|
2014-05-27 11:30:35 +08:00 |
andyque
|
d8d5139aaf
|
closed #5176, refactor UILayout and focus
|
2014-05-26 23:04:44 +08:00 |
andyque
|
40f2128acd
|
Merge branch 'v3' into 5176
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
|
2014-05-26 14:00:23 +08:00 |
andyque
|
634fea7c45
|
Merge remote-tracking branch 'upstream/v3' into refactor5183
|
2014-05-26 09:18:32 +08:00 |
andyque
|
d612518421
|
fix ui widget copyProperties issue
|
2014-05-23 15:03:46 +08:00 |
andyque
|
3f363f0e51
|
issue #5176, add focus to UIScrollView
|
2014-05-23 10:59:18 +08:00 |
andyque
|
65fe431eae
|
issue #5176, fix a typo
|
2014-05-22 18:11:27 +08:00 |
andyque
|
1165ba8bc3
|
issue #5176, readd addChild methods into UIListView
|
2014-05-22 17:49:19 +08:00 |
andyque
|
c8d9ab8122
|
issue #5176, refactor passTouchEventToParent method of UIWidget
|
2014-05-22 15:23:13 +08:00 |
andyque
|
0c065b4be0
|
issue #5176, refactor Layout and UIPageView
|
2014-05-22 13:51:44 +08:00 |
andyque
|
d5e68e4803
|
issue #5176, fix override problems
|
2014-05-22 11:01:58 +08:00 |
andyque
|
dbd2de63b2
|
issue #5183, fix Layout visit issue
|
2014-05-21 15:21:55 +08:00 |
andyque
|
1ed9b9749e
|
Revert "Merge pull request #6752 from andyque/refactorLayout"
This reverts commit ae118a9d22 , reversing
changes made to 6f2f2046c7 .
|
2014-05-20 14:36:29 +08:00 |
andyque
|
432f688a67
|
issue #5183, refactor
|
2014-05-20 10:16:19 +08:00 |
andyque
|
b434840bc9
|
issue #5183, add layout parameter type to widget for convenient access
|
2014-05-16 10:33:28 +08:00 |
andyque
|
1b3c28ea90
|
Merge branch 'v3' into refactorLayout
Conflicts:
cocos/ui/UILayout.cpp
|
2014-05-16 10:22:53 +08:00 |
andyque
|
3f08dd2758
|
issue #5183, remove no needed type
|
2014-05-15 10:48:33 +08:00 |
andyque
|
b32ca246e7
|
issue #5183, done
|
2014-05-15 10:44:19 +08:00 |
andyque
|
5697d2417a
|
issue #5183, done
|
2014-05-15 10:23:25 +08:00 |
andyque
|
0639e49031
|
issue #5183, add LayoutProtocol
|
2014-05-15 10:07:42 +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
|
967c071c68
|
issue #5183, refator LayoutExecutant
|
2014-05-14 18:24:23 +08:00 |
andyque
|
8c8f9611f7
|
issue #5183, add CCLayoutExecutant file
|
2014-05-14 18:03:44 +08:00 |
andyque
|
a0a4df5ac5
|
closed #5118, remove WidgetType and refactor LayoutType to Type
|
2014-05-12 18:00:54 +08:00 |
andyque
|
9a8c87601c
|
Merge branch 'v3' into refactor5057
|
2014-05-12 15:52:47 +08:00 |
andyque
|
da3e794631
|
issue #5057, convert const char* to std::string&
|
2014-05-12 14:59:00 +08:00 |
andyque
|
8232b98525
|
issue #5057, fix android compile error
|
2014-05-12 13:54:30 +08:00 |
Ricardo Quesada
|
77c03fcf11
|
ShaderCache -> GLProgramCache
|
2014-05-09 18:39:25 -07:00 |
andyque
|
e1fe26543d
|
issue #5057, refactor & remove deprecated warnings
|
2014-05-09 18:37:22 +08:00 |
andyque
|
264769f814
|
issue #5057, refactor LinearGravity
|
2014-05-09 17:54:25 +08:00 |
andyque
|
0c0f18e7f3
|
issue #5047, refactor LayoutParameterType
|
2014-05-09 17:38:05 +08:00 |
andyque
|
09a53e7b03
|
issue #5057, refactor BackGroundColorType
|
2014-05-09 17:05:36 +08:00 |
andyque
|
e8e0d007bd
|
issue #5057, refactor LayoutType
|
2014-05-09 16:49:00 +08:00 |
andyque
|
305f052344
|
issue #5057, refactor LayoutClippingType
|
2014-05-09 16:31:22 +08:00 |
andyque
|
762e8d9249
|
issue #5057, refactor WidgetType to strong typed enum
|
2014-05-09 15:16:33 +08:00 |
andyque
|
6a7277c38f
|
issue #5057, refactor TextureResType to strong typed enum
|
2014-05-09 14:56:05 +08:00 |
Ricardo Quesada
|
62d9c24518
|
moves shaders files from 2d/ to renderer/
|
2014-05-08 18:01:48 -07: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 |
andyque
|
238ffcc545
|
issue #4861, fix pass focus to child
|
2014-05-08 11:24:09 +08:00 |
andyque
|
b5f1f7455b
|
issue #4861, fix a problem when layout focus loops
|
2014-05-08 10:46:05 +08:00 |
andyque
|
05b7d274c8
|
issue #4861. fix distance calculation
|
2014-05-07 18:27:05 +08:00 |
andyque
|
def0505ba7
|
closed #4861, refactor
|
2014-05-07 14:26:41 +08:00 |
andyque
|
1282252c25
|
closed #4861, refactor
|
2014-05-07 14:06:44 +08:00 |
andyque
|
8baa88e2e1
|
closed #4861, fixed temparory variable issue
|
2014-05-07 11:55:00 +08:00 |
andyque
|
ef70c684de
|
issue #4861, add requestFocus method and the layout current can get focus
|
2014-05-07 10:23:57 +08:00 |
andyque
|
62a66872aa
|
issue #4861, fixed some boundary conditions
|
2014-05-07 10:05:20 +08:00 |
andyque
|
9d71ae29b9
|
issue #4861. fixed all widget focus diabled bug
|
2014-05-06 17:28:12 +08:00 |
andyque
|
a15dd55baa
|
closed #3861, fixed some typo and indent problem
|
2014-05-06 12:04:52 +08:00 |
andyque
|
bcd2d3ccb3
|
issue #3861, fix layout contentSize caculation
|
2014-05-06 11:46:28 +08:00 |
andyque
|
afb65bbebd
|
issue #4861, fix widget query method
|
2014-05-05 11:37:39 +08:00 |
andyque
|
503be87675
|
issue #4861. refactor UILayout to search widget by index
|
2014-05-05 11:37:39 +08:00 |
andyque
|
9383900123
|
issue #4861. cleanup some code of UILayout and UIWidget
|
2014-05-05 11:37:39 +08:00 |
Ricardo Quesada
|
40fe815ab9
|
Squashed commit of the following:
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
|
2014-04-30 19:09:13 -07:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |
Ricardo Quesada
|
9b118e5e96
|
Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
|
2014-04-26 10:11:22 -07:00 |
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 |
CaiWenzhi
|
19f6526ef8
|
Widget supports contentsize
|
2014-04-17 14:08:25 +08:00 |
Huabing.Xu
|
d14d3007d0
|
remove kazmath include file
|
2014-04-16 14:08:58 +08:00 |
Huabing.Xu
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
Huabing.Xu
|
ec5398e7c6
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
|
2014-04-14 14:08:19 +08:00 |
James Chen
|
7c5b4be0b1
|
Warning fixes in ui, getZOrder -> getLocalZOrder
|
2014-04-11 18:06:53 +08:00 |
Huabing.Xu
|
231cdcb906
|
adjust comment message
|
2014-04-10 11:14:46 +08:00 |
Huabing.Xu
|
07ac817a7c
|
Merge branch 'develop' into develop_migrate_math_lib_merge
|
2014-04-10 10:52:15 +08:00 |
James Chen
|
61134426a8
|
Some fixes detected by xcode analyze
|
2014-04-09 20:41:09 +08:00 |
Huabing.Xu
|
a269ac2864
|
remove kmMat4 interface in cocostudio and UI
|
2014-04-09 14:44:54 +08:00 |
Huabing.Xu
|
b9af100493
|
visit() using Matrix instead of kmMat4
|
2014-04-08 21:45:54 +08:00 |
Huabing.Xu
|
29c345bd02
|
Merge branch 'develop' into develop_migrate_math_lib_merge
|
2014-04-04 18:45:21 +08:00 |
Huabing.Xu
|
960ac300d5
|
migrate cocostudio to director matrix stack
|
2014-04-03 14:55:55 +08:00 |
andyque
|
fe33588038
|
issue #4636. finish UILayout
|
2014-04-03 11:14:35 +08:00 |
CaiWenzhi
|
a05969c395
|
Move layout "exe" to cpp
|
2014-03-26 17:58:53 +08:00 |
CaiWenzhi
|
243b7e5822
|
Modify layout and add Boxes
|
2014-03-25 17:15:54 +08:00 |
CaiWenzhi
|
2dffcb9808
|
Add ProtectedNode and remove "addNode"
|
2014-03-25 14:28:58 +08:00 |
andyque
|
cbcc1bbbcf
|
let ios project compile correct
|
2014-03-11 18:48:26 +08:00 |