minggo
|
31664d979a
|
Merge pull request #8783 from andyque/adjustUITestProject
fix scrollView rotate issue
|
2014-10-17 14:54:32 +08:00 |
minggo
|
18ca7c936c
|
Merge pull request #8768 from Dhilan007/v3-33rc
Improve Android.mk
|
2014-10-17 14:09:49 +08:00 |
andyque
|
952e52365b
|
fix scrollView rotate issue
|
2014-10-17 14:02:49 +08:00 |
andyque
|
8161d2ad34
|
fix scrollView rotate issue
|
2014-10-17 11:31:00 +08:00 |
Dhilan007
|
ccbc668427
|
Improve Android.mk
|
2014-10-17 10:13:33 +08:00 |
andyque
|
f3f15c58fe
|
remove UIWebView.cpp in win32
|
2014-10-16 16:46:49 +08:00 |
Dale Stammen
|
8700c0b07e
|
added check for WinRT and WP8
|
2014-10-14 14:22:19 -07:00 |
Dale Stammen
|
fd638f00b7
|
removed old WP8 project files
|
2014-10-14 14:09:52 -07:00 |
minggo
|
0ab3017094
|
Merge pull request #8658 from pipu/v3_pipu
V3 pipu
|
2014-10-14 14:25:46 +08:00 |
minggo
|
1d5652ad48
|
Merge pull request #8635 from ahlwong/v3
Fix UIButton setFontSize sync ContentSize
|
2014-10-13 17:25:18 +08:00 |
pipu
|
96c8fde63a
|
1. Modifying UIButton.cpp
2. Modifying protocol directory name to "protobuf-lite" for iOS, mac platform
|
2014-10-13 12:49:15 +08:00 |
pipu
|
8040955062
|
Modifying cocos/editor-support/cocostudio/CMakeLists.txt, cocos/ui/CMakeLists.txt
|
2014-10-12 20:21:32 +08:00 |
pipu
|
2d51724686
|
1. Update wp8 projects.
|
2014-10-12 19:32:13 +08:00 |
pipu
|
9503253a17
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
|
2014-10-12 17:44:28 +08:00 |
minggo
|
2db8217b09
|
Merge pull request #8543 from Dhilan007/v3-fixwarns
fix warns and memory leak
|
2014-10-11 16:07:54 +08:00 |
pipu
|
ab969db441
|
Modifying ImageViewReader, UIImageView
|
2014-10-11 15:43:37 +08:00 |
pipu
|
29eb552d00
|
1. Modifying ButtonReader
2. Modifying UILoadingBar
3. Reverting UIScale9Sprite
|
2014-10-11 15:35:09 +08:00 |
Ahlwong
|
dd5c5a29b9
|
Refactor UIButton ContentSize update
|
2014-10-10 21:13:04 -07:00 |
pipu
|
b732ce378e
|
Merge branch 'v3_pipu_protocol_buffers' into merge_test
Conflicts:
cocos/ui/UIScale9Sprite.cpp
|
2014-10-11 11:08:46 +08:00 |
Ahlwong
|
d95b1cef7a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Update from upstream.
|
2014-10-10 19:10:44 -07:00 |
Ahlwong
|
4aceaee08c
|
Fix UIButton setFontSize sync ContentSize
|
2014-10-10 11:17:43 -07:00 |
pipu
|
ffd83bbdd0
|
Modifying win32 and wp8 protocol buffers lib
|
2014-10-10 22:38:34 +08:00 |
minggo
|
4a193c6d76
|
Merge pull request #8554 from newnon/v3_scale9sprite_capinets_fix
Scale9Sprite capInsets set fix
|
2014-10-10 18:05:32 +08:00 |
Dhilan007
|
89db9ecd3b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
|
2014-10-10 17:02:45 +08:00 |
minggo
|
63e4d7ce27
|
Merge pull request #8614 from andyque/fixEditBoxMaxLengthOnMac
fix setMaxLength issue of EditBox-mac
|
2014-10-10 16:28:21 +08:00 |
andyque
|
2013cdb4ef
|
fix setMaxLength issue of EditBox-mac
|
2014-10-10 15:26:33 +08:00 |
andyque
|
da48649370
|
fix button title only content size issue
|
2014-10-10 11:01:51 +08:00 |
pipu
|
ee624e47cc
|
1. Modifying UIScale9Sprite
2. Updating UI Test
3. Updatding resource of ActionTimeline
|
2014-10-10 10:44:16 +08:00 |
Ahlwong
|
5027f24348
|
Fix UIButton Scale 9 Highlight
|
2014-10-09 12:48:09 -07:00 |
pipu
|
752eb839c7
|
Add protocolbuf.a
|
2014-10-09 18:28:09 +08:00 |
Dhilan007
|
83150aa4d1
|
fix warns and memory leak
|
2014-10-09 17:19:43 +08:00 |
martell
|
73980195c0
|
wp8: use CC_STATIC because libs are static
|
2014-10-09 06:33:46 +01:00 |
martell
|
1a7ecbe427
|
Finalise Mac Support for cmake
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:19 +01:00 |
martell
|
c3172bef50
|
Finalise Windows cmake support for mingw-w64
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:09 +01:00 |
martell
|
30240a8a37
|
Multi platform cmake support
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:21:45 +01:00 |
martell
|
c7f3594a1b
|
added support for static and shared builds with ui
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:20:38 +01:00 |
Ricardo Quesada
|
342d934a0e
|
scheduler and macro fixes
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
|
2014-10-03 09:38:36 -07:00 |
Sergey
|
d9b0039517
|
Scale9Sprite capInsets set fix
|
2014-10-03 17:38:02 +04:00 |
Sergey Perepelitsa
|
d9204b009e
|
scale9Sprite without scale9enabled scale fix
scale9Sprite crop > border tile bug fix
|
2014-09-30 10:59:20 +04:00 |
Sergey Perepelitsa
|
c1f37a6926
|
Misprint fix
scale9Image double draw fix
|
2014-09-28 10:30:33 +04:00 |
Sergey Perepelitsa
|
ab45c582a7
|
Scale9Sprite improvements
small bugs fix
small optimizations
support for cropped sprite frames
|
2014-09-28 01:58:26 +04:00 |
andyque
|
3c434ec354
|
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
|
2014-09-24 17:47:38 +08:00 |
andyque
|
53d28168fe
|
remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32
|
2014-09-24 16:39:32 +08:00 |
Sergey Perepelitsa
|
0a46a83794
|
fix missing includes
|
2014-09-23 23:19:25 +04:00 |
Jeff
|
2ffbe23c50
|
The files name: modify underline to hyphen
|
2014-09-19 10:24:17 +08:00 |
Jeff
|
6152b70945
|
LE
|
2014-09-18 16:33:46 +08:00 |
Jeff
|
0ee4ee03c1
|
CE
|
2014-09-18 16:00:18 +08:00 |
Jeff
|
418ec69abf
|
compile error
|
2014-09-18 15:18:30 +08:00 |
Jeff
|
ac6b83f8f9
|
fix compile error
|
2014-09-18 14:22:40 +08:00 |
Jeff
|
c5cc16336a
|
fix compile error
|
2014-09-18 14:04:54 +08:00 |