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 |
Jeff
|
b9ec99d7f4
|
compile error & code spelling error
1.fix compile error on win32
2.modify spelling error
|
2014-09-18 11:52:23 +08:00 |
Jeff
|
ed530454b2
|
fix compile error
|
2014-09-18 02:11:20 +08:00 |
Jeff
|
e9c6f5d02b
|
fix compile errors
|
2014-09-18 01:30:14 +08:00 |
Jeff
|
08e8963b1a
|
fix compile errors
|
2014-09-18 00:04:48 +08:00 |
Jeff
|
27919dad77
|
add simple implement of WebView for win32
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
|
2014-09-17 22:30:15 +08:00 |
minggo
|
ccbf694927
|
Merge pull request #8086 from huangshiwu/v3_test
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
|
2014-09-17 14:50:42 +08:00 |
huangshiwu
|
c8bdba69ad
|
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView
|
2014-09-17 14:00:40 +08:00 |
andyque
|
6badfb30e1
|
add getTitleRenderer interface to UIButton
|
2014-09-17 10:57:40 +08:00 |
andyque
|
af3dd215cb
|
improve android web view
|
2014-09-15 18:14:04 +08:00 |
andyque
|
5f95ad221e
|
improve iOS WebView
|
2014-09-15 18:02:11 +08:00 |
andyque
|
126ec18a89
|
add video player debug draw config
|
2014-09-15 17:59:51 +08:00 |
andyque
|
71b6be678e
|
fix header guard
|
2014-09-15 16:56:51 +08:00 |
andyque
|
030fe34afa
|
fix UI related warnings
|
2014-09-15 11:13:56 +08:00 |
andyque
|
7b0f41ed7b
|
remove auto scale text
|
2014-09-15 09:28:56 +08:00 |
andyque
|
880929f102
|
fix button scale issue
|
2014-09-13 22:08:02 +08:00 |
minggo
|
55783b66c2
|
Merge pull request #8012 from huangshiwu/v3_drawnode_prbk
V3 drawnode prbk
|
2014-09-12 15:17:49 +08:00 |
andyque
|
294271682b
|
change return const value to value
|
2014-09-12 14:39:22 +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 |
huangshiwu
|
8922121ed1
|
Deprecate DrawPrimitives and enhance DrawNode --make some modify
|
2014-09-12 07:33:34 +08:00 |
huangshiwu
|
8d8f4436db
|
Deprecate DrawPrimitives and enhance DrawNode --fix android compile error
|
2014-09-11 17:55:47 +08:00 |
huangshiwu
|
d9634057ab
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
|
2014-09-11 16:41:54 +08:00 |
andyque
|
67ad24e7c1
|
remove orderOfArrival = 0
|
2014-09-11 15:44:31 +08:00 |
huangshiwu
|
fb1d47900c
|
Deprecate DrawPrimitives and enhance DrawNode
|
2014-09-11 15:39:56 +08:00 |
Ricardo Quesada
|
d5a6289a9b
|
compiles on wp8
|
2014-09-09 18:22:11 -07:00 |
Ricardo Quesada
|
0972506bf5
|
compiles and runs on linux
|
2014-09-09 17:41:49 -07:00 |
Ricardo Quesada
|
6f3ca63f00
|
Moved base/CCPlatform* -> platform/CCPlatform*
|
2014-09-09 17:17:07 -07:00 |
Ricardo Quesada
|
9082ca18c3
|
Platform fixed
|
2014-09-09 16:50:02 -07:00 |
Ricardo Quesada
|
0ead7b6307
|
Squashed commit of the following:
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
|
2014-09-09 12:18:31 -07:00 |
andyque
|
83e14259ad
|
deprecated ui::TextField getStringValue and setText, use getString and
setString instead
|
2014-09-09 13:59:35 +08:00 |
Sergey
|
14853d46f2
|
setPlaceholderFontSize fix
|
2014-09-03 23:38:44 +04:00 |
andyque
|
51e160beff
|
fix EditBox lua compile error
|
2014-09-02 17:37:55 +08:00 |
andyque
|
ffee7b27d4
|
fix linux and android compile error
|
2014-09-01 17:43:40 +08:00 |
andyque
|
85ce801fdd
|
remove ccscale9sprite , cceditBox
|
2014-09-01 17:06:22 +08:00 |
andyque
|
aef0f5e729
|
Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
|
2014-09-01 15:26:25 +08:00 |
andyque
|
043acb2fd4
|
rename webview to UIWebView
|
2014-08-29 11:28:28 +08: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 |
minggo
|
d3ce2acff6
|
Merge pull request #7892 from Dhilan007/v3-androidmk
Adjust android.mk for cocos2d and related module
|
2014-08-28 10:16:39 +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 |
Dhilan007
|
bef774a14a
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 22:54:28 +08:00 |
Dhilan007
|
9135236bb0
|
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
|
2014-08-27 21:15:57 +08:00 |
samuele3hu
|
3d5f8de346
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 20:58:32 +08:00 |
andyque
|
3d97ddc739
|
Merge branch 'v3' into addWebView
Conflicts:
cocos/ui/Android.mk
|
2014-08-27 14:08:16 +08:00 |
minggo
|
04bfbdd5a1
|
fix conflict
|
2014-08-27 13:50:01 +08:00 |
samuele3hu
|
3759648d3a
|
Remove the useless aneroid.mk files
|
2014-08-27 10:21:47 +08:00 |
samuele3hu
|
a5a706aa05
|
Remove the useless win32 project
|
2014-08-27 10:20:15 +08:00 |
andyque
|
4597de069d
|
improve test case and make program more robust
|
2014-08-27 08:02:22 +08:00 |
andyque
|
fc3a30b9ca
|
modify cmakeList.txt
|
2014-08-26 23:25:07 +08:00 |
andyque
|
9449152caf
|
finish WebView Tests
|
2014-08-26 22:03:55 +08:00 |
minggo
|
b9c51e6994
|
remove unneeded codes
|
2014-08-26 18:19:28 +08:00 |