Neo Kim
|
4829a037f7
|
Fix #14440
|
2015-11-20 15:57:26 +09:00 |
zilongshanren
|
8c25749366
|
minor improvement
|
2015-11-20 10:54:05 +08:00 |
zilongshanren
|
386c734b25
|
Merge pull request #14423 from xpol/fixes-boring-warnings
Fixes boring deprecated warning.
|
2015-11-19 18:29:12 +08:00 |
pandamicro
|
dfe2fb1c29
|
Merge pull request #14433 from pandamicro/v3
Merged v3.8.1 into v3 and fix some issues
|
2015-11-19 18:20:10 +08:00 |
zilongshanren
|
19257d6120
|
Add Overflow feature char map font.
1. fix single line clamp.
|
2015-11-19 18:14:46 +08:00 |
pandamicro
|
21d0ff846c
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-11-19 17:20:42 +08:00 |
pandamicro
|
eccde9fe11
|
Fix PhysicsSprite not working with moveTo action issue
|
2015-11-19 17:17:59 +08:00 |
pandamicro
|
0893d7d4ff
|
Fix text color parser for TextField widget
|
2015-11-19 17:17:17 +08:00 |
pandamicro
|
ea372d7a91
|
Merge pull request #14432 from CocosRobot/update_cocosfiles_1447924073
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-11-19 17:12:19 +08:00 |
CocosRobot
|
74050b6595
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-11-19 09:07:54 +00:00 |
pandamicro
|
fbcf0680ae
|
Merge pull request #14430 from cocos2d/V3.9
V3.9
|
2015-11-19 17:06:07 +08:00 |
zilongshanren
|
ccdb2a75f9
|
Add Label Overflow and wrap option.
Squashed commit of the following:
commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 19 10:30:54 2015 +0800
add char map font test
commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 15:00:17 2015 +0800
system font overflow is not supported
commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 11:04:15 2015 +0800
add system font test
commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 17 10:29:35 2015 +0800
Finish resize height mode
commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 16 11:01:27 2015 +0800
fix wrap issue
commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date: Sat Nov 14 08:28:57 2015 +0800
horizontal shrink still has a issue
commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 11:42:34 2015 +0800
finish shrink without wrap
commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 10:09:46 2015 +0800
update shrink
commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 12 17:55:15 2015 +0800
refactor shrink logic
commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 18:25:34 2015 +0800
add resize overflow type
commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 11:49:51 2015 +0800
no wrap, shrink is working.
commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 10 16:16:27 2015 +0800
add overflow type to label.
1. optimize the testcase
commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:22:34 2015 +0800
finish bmfont wrap by char
commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:04:51 2015 +0800
finish bmfont wrap by word
commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 11:29:21 2015 +0800
add BMFont size support
commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 09:58:01 2015 +0800
add font size support for BMFONT
commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 16:36:27 2015 +0800
add toggle wrap option.
1. make hirozontal clamp working
commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 15:12:59 2015 +0800
tweak label layout
commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 5 11:11:02 2015 +0800
finish the test skeleton
commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 16:38:54 2015 +0800
add setFontSize api to label.
1. add new chinese-english bmfont
2. beautify base test
commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 11:27:18 2015 +0800
add label layout test skeleton
|
2015-11-19 16:06:13 +08:00 |
XiaoFeng
|
b6b35e0c74
|
Fix name space.
|
2015-11-19 15:47:36 +08:00 |
XiaoFeng
|
f4d317f1fd
|
Combine Studio change for get program file full path.
|
2015-11-19 15:21:14 +08:00 |
XiaoFeng
|
32f21ca5be
|
Binding ResouceData structure to js to fix auto compile error
|
2015-11-19 14:31:39 +08:00 |
肖峰
|
d0c3275281
|
Change version in change log
|
2015-11-19 13:33:05 +08:00 |
pandamicro
|
b8ebd51561
|
Merge pull request #14427 from CocosRobot/update_lua_bindings_1447902515
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-19 11:25:38 +08:00 |
CocosRobot
|
d5b07e5b60
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-19 03:14:03 +00:00 |
zilongshanren
|
7ea90c2d41
|
Merge pull request #14033 from m-yukio/feature/fixed-richtext
Support the new line element. Fixed a problem of UIRichText.
|
2015-11-19 11:05:08 +08:00 |
XiaoFeng
|
5369f9a84d
|
Add header file to make this pr can pass jenkins auto build
|
2015-11-19 10:14:27 +08:00 |
Jeff Wang
|
efeae1eae9
|
add a test case for pr 14327
|
2015-11-18 22:52:47 +08:00 |
Jeff Wang
|
9cbcd00798
|
some properties should be set
|
2015-11-18 22:47:26 +08:00 |
zilongshanren
|
27a5cdb295
|
Merge pull request #14421 from zilongshanren/fixIssue14332
Fix onEndEditing issue in script.
|
2015-11-18 18:13:33 +08:00 |
Xpol Wan
|
0b5a3465bc
|
Remove duplicated code by introduce a private doSetResponseCallback.
|
2015-11-18 17:52:24 +08:00 |
Xpol Wan
|
b33aa00109
|
Fixes boring deprecated warning.
I know I duplicated the code but there is no cpp for me to move body into.
|
2015-11-18 17:47:07 +08:00 |
zilongshanren
|
02b59f020e
|
Fix onEndEditing issue in script.
Issue: https://github.com/cocos2d/cocos2d-x/issues/14332
|
2015-11-18 15:05:13 +08:00 |
zilongshanren
|
bf08b5b16d
|
Merge pull request #14405 from CocosRobot/update_lua_bindings_1447730847
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-18 14:56:07 +08:00 |
zilongshanren
|
61614d64a3
|
Merge pull request #14408 from CocosRobot/update_lua_bindings_1447733106
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-18 14:55:55 +08:00 |
XiaoFeng
|
fb7b92915c
|
Combine Studio change for particle 3d
|
2015-11-18 14:34:14 +08:00 |
XiaoFeng
|
bb83fe4596
|
Combine Studio change for UI components
|
2015-11-18 13:38:29 +08:00 |
肖峰
|
2d97647177
|
update framework number
|
2015-11-18 10:55:10 +08:00 |
WenhaiLin
|
42fa33dc6e
|
AudioEngine[WIN32]:Fixed `FinishCallback` may not been invoked when the sound play completes.
|
2015-11-17 23:44:52 +08:00 |
XiaoFeng
|
50889c1c6c
|
Save _vertShader & _fragShader for PC platform only to decrease memory usage for mobile platform.
|
2015-11-17 14:29:56 +08:00 |
XiaoFeng
|
acd3b5cbc4
|
Combine Studio change for openGL related operation
|
2015-11-17 13:38:42 +08:00 |
CocosRobot
|
0794c7a43c
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-17 04:09:43 +00:00 |
zilongshanren
|
5d8cfa889c
|
Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview
Change PageView to derive from ListView
|
2015-11-17 12:02:10 +08:00 |
CocosRobot
|
ec86ea47a5
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-17 03:32:26 +00:00 |
zilongshanren
|
0b3a342222
|
Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets
Set focus for widgets
|
2015-11-17 11:24:27 +08:00 |
zilongshanren
|
097f7a34e0
|
Merge pull request #14379 from mogemimi/fix-deprecated-warnings
Fix deprecated warnings
|
2015-11-17 11:19:07 +08:00 |
pandamicro
|
c4f9804f5b
|
Merge pull request #14404 from CocosRobot/update_lua_bindings_1447728669
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-17 10:56:58 +08:00 |
pandamicro
|
efde3c3a0e
|
Merge pull request #14403 from pandamicro/v3
Fix issue in ComponentJS::~ComponentJS
|
2015-11-17 10:56:37 +08:00 |
CocosRobot
|
3ee2e7a490
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-17 02:56:26 +00:00 |
zilongshanren
|
a5b7674b4d
|
Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4
improve scale9sprite
|
2015-11-17 10:48:09 +08:00 |
pandamicro
|
c77ea57fb1
|
Merge pull request #14399 from xiaofeng11/v3_combine_mac32compatible
Combine Studio change for compatible with 32 bit Mac System
|
2015-11-17 10:44:40 +08:00 |
pandamicro
|
367a502fd4
|
Merge pull request #14395 from xiaofeng11/v3_combine_actionTimeLine
Combine Studio change for ActionTimeline
|
2015-11-17 10:43:12 +08:00 |
pandamicro
|
5bc73c6ede
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-11-17 10:42:05 +08:00 |
pandamicro
|
c990703b8b
|
Merge branch 'v3.8.1' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
CHANGELOG
CMakeLists.txt
cocos/cocos2d.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_cocos2d.js
docs/RELEASE_NOTES.md
external/config.json
templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
tools/simulator/frameworks/runtime-src/proj.win32/game.rc
|
2015-11-17 10:41:41 +08:00 |
XiaoFeng
|
e3c120eef4
|
Combine Studio change for compatible with 32 bit Mac System
|
2015-11-16 18:25:26 +08:00 |
XiaoFeng
|
e313f7be8b
|
Combine Studio change for ActionTimeline
|
2015-11-16 15:56:23 +08:00 |
XiaoFeng
|
eb644ee79f
|
Combine Studio change for 3d components
|
2015-11-16 15:05:43 +08:00 |