zilongshanren
|
0f8c3e0c1c
|
Merge pull request #14435 from zilongshanren/improve-label-layout-v2
Add Overflow to Label
|
2015-11-27 17:31:40 +08:00 |
XiaoFeng
|
71871bacf9
|
Add aabb dirty mark when load from file
|
2015-11-27 15:53:26 +08:00 |
肖峰
|
f0cc8e7f25
|
Fix keyboard won't dismiss on iOS issue
|
2015-11-27 15:44:35 +08:00 |
肖峰
|
8b631f5c9f
|
Fix compile failed on mobile platform
|
2015-11-27 15:19:50 +08:00 |
XiaoFeng
|
2d28b78e41
|
Add 3 missing class export
Change clearShader logic.
|
2015-11-27 14:58:18 +08:00 |
pandamicro
|
e13e0cb886
|
Fix getJSObject issues
|
2015-11-27 14:54:25 +08:00 |
Xpol Wan
|
d6ddb365b6
|
Remove boring logs in cocos studio supporting module.
They are helpless for debugging, we should use break points for debugging.
|
2015-11-27 14:43:25 +08:00 |
songchengjiang
|
b55f040ec6
|
fix macro definition error
|
2015-11-27 14:23:17 +08:00 |
minggo
|
2a877ff234
|
Merge pull request #14429 from xiaofeng11/v3_combine_misc
Combine Studio change for get program file full path.
|
2015-11-27 14:15:37 +08:00 |
XiaoFeng
|
8e4276469c
|
Add comment to new function
|
2015-11-27 14:08:27 +08:00 |
XiaoFeng
|
a61fe711e2
|
Update
|
2015-11-27 14:01:43 +08:00 |
songchengjiang
|
642e19baef
|
unify (No)Normal Mapping shaders
|
2015-11-27 13:15:33 +08:00 |
XiaoFeng
|
ec1d76b15e
|
Fix compile error
|
2015-11-27 13:08:22 +08:00 |
XiaoFeng
|
9e50c010e9
|
Fix win8.1 project compile error
|
2015-11-27 11:49:35 +08:00 |
XiaoYang
|
92d7ccfbca
|
Merge pull request #14471 from super626/v3
release default fbo
|
2015-11-27 11:33:07 +08:00 |
cesarpachon
|
40f6f76030
|
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries
|
2015-11-26 22:22:05 -05:00 |
Neo Kim
|
3f9b40c093
|
Fix #14440
|
2015-11-26 22:22:04 -05:00 |
Xpol Wan
|
520aa9d351
|
Remove duplicated code by introduce a private doSetResponseCallback.
|
2015-11-26 22:22:04 -05:00 |
Xpol Wan
|
4bedfa4f14
|
Fixes boring deprecated warning.
I know I duplicated the code but there is no cpp for me to move body into.
|
2015-11-26 22:22:04 -05:00 |
pandamicro
|
1ee7b11e31
|
Refactor jsb_new_proxy and jsb_get_js_proxy with RootedObject
|
2015-11-27 10:20:51 +08:00 |
pandamicro
|
8320c2f702
|
Use rooted object for js_proxy new and get
|
2015-11-27 10:19:13 +08:00 |
pandamicro
|
d23ffe4fc7
|
Fix some issue of js_type_class usage
|
2015-11-27 10:16:11 +08:00 |
songchengjiang
|
fc4c3ec650
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-11-27 09:34:31 +08:00 |
pandamicro
|
73c3a5dcf5
|
Activate DEBUG to test
|
2015-11-27 01:35:07 +08:00 |
pandamicro
|
ae2b75c8be
|
Fix issues causing by temporary RootedObject passed as function parameters
|
2015-11-27 01:35:06 +08:00 |
zilongshanren
|
c50d686319
|
Merge pull request #14493 from xiaofeng11/v3_button
Fix button texture loaded mark has set to wrong value bug
|
2015-11-26 21:45:47 +08:00 |
XiaoFeng
|
d69453fa54
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine
|
2015-11-26 19:04:13 +08:00 |
XiaoFeng
|
24dc9f3392
|
update code as comment
|
2015-11-26 17:39:57 +08:00 |
XiaoFeng
|
58dd27efd3
|
add missing return type
|
2015-11-26 17:33:45 +08:00 |
XiaoFeng
|
f5f09133e6
|
Change ASSERT to safety mode
|
2015-11-26 16:49:01 +08:00 |
XiaoFeng
|
108d145bf0
|
Add missing luaval and color3b conversion function export
|
2015-11-26 15:08:49 +08:00 |
XiaoFeng
|
52f696945d
|
Remove condition MACRO and remove ASSERT in Sprite::initWithFile function
Remove CameraFlag define for Cocos Studio only
|
2015-11-26 14:47:37 +08:00 |
CocosRobot
|
51cfbca523
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-26 06:02:24 +00:00 |
zilongshanren
|
c3604aa865
|
Merge pull request #14470 from zilongshanren/fixListViewClippingIssue
Fix list view clipping issue
|
2015-11-26 13:51:51 +08:00 |
XiaoFeng
|
d744c167b7
|
Fix button texture loaded mark has set to wrong value bug
|
2015-11-26 13:49:32 +08:00 |
zilongshanren
|
5221f8a6fc
|
improve the code by code review suggestions.
|
2015-11-26 12:03:18 +08:00 |
zilongshanren
|
44d8aec4c9
|
Merge pull request #14484 from xiaofeng11/v3_fix
Change component resource load logic
|
2015-11-26 09:49:40 +08:00 |
XiaoFeng
|
397fa809da
|
Add default line width to create function
|
2015-11-26 09:32:57 +08:00 |
CocosRobot
|
da9e8548a0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-25 17:29:11 +00:00 |
XiaoFeng
|
9ec451ca31
|
Update CCDrawNode, remove condition MACRO
|
2015-11-25 23:26:57 +08:00 |
XiaoFeng
|
928dc3ab1f
|
Add lua value conversion function for cocos studio
|
2015-11-25 23:03:25 +08:00 |
XiaoFeng
|
145943068f
|
Add missing function export
|
2015-11-25 22:35:02 +08:00 |
XiaoFeng
|
9811d6efcf
|
Combine studio change for LuaBinding, jsb and simulator
|
2015-11-25 21:52:44 +08:00 |
XiaoFeng
|
eb47d28266
|
Change component resource load logic, won't dependent on sprite edit in other studio combine PR
|
2015-11-25 20:07:50 +08:00 |
zilongshanren
|
584a5d7407
|
fix alphaThreshold undefined issue
|
2015-11-25 18:27:38 +08:00 |
zilongshanren
|
b1490c96b6
|
Merge branch 'v3' into fixListViewClippingIssue
|
2015-11-25 18:25:40 +08:00 |
CocosRobot
|
06c7b94440
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-25 09:28:43 +00:00 |
zilongshanren
|
b0d88a552a
|
Merge pull request #14419 from xiaofeng11/v3_combine_ui
Combine Studio change for UI components
|
2015-11-25 17:19:54 +08:00 |
pandamicro
|
c202834312
|
Clean up manual bindings code, remove JS_THIS_OBJECT and JS_SET_RVAL
|
2015-11-25 14:33:43 +08:00 |
pandamicro
|
69b2b5720b
|
Use JS::PersistentRooted instead of JS::Heap to prevent delegates and wrappers internal js object from GC
More elegant and secured way, potential crashes exists in previous implementation
|
2015-11-25 14:32:19 +08:00 |
zilongshanren
|
03046d6fbd
|
change the default alphaThreshold
|
2015-11-25 14:31:32 +08:00 |
zilongshanren
|
759c0bbf31
|
rename CCStencilBitsManager to StencilStateManager
|
2015-11-25 14:24:27 +08:00 |
pandamicro
|
be2a3077c2
|
Remove useless manual bindings for addEventListener functions in UI
|
2015-11-25 14:15:45 +08:00 |
zilongshanren
|
5fef088695
|
refactor stencil state management code
|
2015-11-25 14:14:17 +08:00 |
pandamicro
|
23f27534f6
|
Solve a possible memory leak in HttpRequest
|
2015-11-25 14:03:56 +08:00 |
XiaoFeng
|
09606e96cd
|
Add comment for new function
|
2015-11-25 11:33:24 +08:00 |
XiaoFeng
|
d0cd640ac8
|
Update
|
2015-11-25 11:15:17 +08:00 |
songchengjiang
|
9241797acb
|
support normal mapping material
|
2015-11-25 10:45:03 +08:00 |
XiaoYang
|
4ba6279a98
|
Merge pull request #14469 from super626/terrain
fix bug: Terrain::getIntersectionPoint when there is offset
|
2015-11-25 09:53:47 +08:00 |
XiaoFeng
|
c0f7ecfcde
|
User GetModuleFileNameW in all condition, it is more safe than _get_wpgmptr
|
2015-11-25 09:49:19 +08:00 |
zilongshanren
|
866c992f41
|
add cocos2d namespace
|
2015-11-24 21:41:45 +08:00 |
zilongshanren
|
3cc3325df8
|
Merge pull request #14414 from WenhaiLin/v3-win32-audiofix
AudioEngine[WIN32]:Fixed `FinishCallback` may not been invoked when the sound play completes.
|
2015-11-24 21:08:46 +08:00 |
XiaoFeng
|
27f6d6a6ba
|
Remove condition macro check.
|
2015-11-24 19:17:38 +08:00 |
XiaoFeng
|
722f20c4b6
|
Update implement remove condition macro check.
|
2015-11-24 18:29:58 +08:00 |
yangxiao
|
aa38dfba89
|
release default fbo
|
2015-11-24 18:11:16 +08:00 |
zilongshanren
|
9c2130e88a
|
fix Layout and ClippingNode nested rendering issue
|
2015-11-24 18:01:50 +08:00 |
pandamicro
|
930405d52c
|
Remove useless manual bindings for MenuItems
|
2015-11-24 16:32:02 +08:00 |
yangxiao
|
1ac82fa273
|
fix terrain ray trace bug when there is offset
|
2015-11-24 15:13:52 +08:00 |
CocosRobot
|
ded045ae26
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-24 07:01:07 +00:00 |
pandamicro
|
378cfa35b6
|
Merge pull request #14394 from super626/v3
Terrain: char* to string
|
2015-11-24 14:53:00 +08:00 |
zilongshanren
|
8d1f1a9933
|
Merge pull request #14457 from zilongshanren/testEditBoxScaleSize
Fix edit box setPlaceholderFontName and scale font size issue
|
2015-11-24 11:33:52 +08:00 |
zilongshanren
|
7676b1cb73
|
improve label layout logic
|
2015-11-23 17:47:30 +08:00 |
yangxiao
|
e8d853934b
|
terrain lua bindings
|
2015-11-23 14:33:39 +08:00 |
François Dupayrat
|
12df5ae1cc
|
Fix wrong variable use for setPlaceholderFontName
1. fix editbox scale not affect native font size
|
2015-11-23 11:49:22 +08:00 |
XiaoFeng
|
23d8b63fca
|
update header file to fix studio UI js binding compile error
|
2015-11-23 11:41:42 +08:00 |
zilongshanren
|
689c0f4af3
|
Merge pull request #14327 from wohaaitinciu/editbox-win32
Fix a fatal bug in EditBox implement for platform win32
|
2015-11-23 11:35:40 +08:00 |
zilongshanren
|
9328a7c1d0
|
fix scalesprite opacity issue.
Ref: https://github.com/cocos2d/cocos2d-x/issues/14436
|
2015-11-20 17:35:29 +08:00 |
zilongshanren
|
7ee82f20fc
|
fix getLetter crash issue.
1. make vertical clamp works in non-wrap mode.
2. make the lineHeight and letterSprite scale work correct.
|
2015-11-20 16:39:48 +08:00 |
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 |
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
|
0893d7d4ff
|
Fix text color parser for TextField widget
|
2015-11-19 17:17:17 +08: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 |
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
|
9cbcd00798
|
some properties should be set
|
2015-11-18 22:47:26 +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 |
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 |
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
|
5bc73c6ede
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-11-17 10:42:05 +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 |
pandamicro
|
974bdba154
|
Fix issue in ComponentJS::~ComponentJS
|
2015-11-16 11:50:48 +08:00 |
XiaoFeng
|
d47a79c0e4
|
Remove cocos studio limitation for new functions
|
2015-11-16 11:08:20 +08:00 |
Neo Kim
|
b99b3d1112
|
Remove `CC_DLL` in front of `createSpriteFromBase64()` in ccUtils.h to avoid compilation error on windows platform
|
2015-11-15 23:02:43 +09:00 |
Neo Kim
|
603d788fbf
|
PageView - Fix that page indicator was not working well in vertical page view.
|
2015-11-15 22:49:42 +09:00 |
Neo Kim
|
b0ae23d567
|
PageView - Add more comments
|
2015-11-15 22:49:42 +09:00 |
Neo Kim
|
ad134a6363
|
PageView - Fix that the indicator's direction is not appropriate when `PageView::setDirection()` is called before `PageView::setIndicatorEnabled(true)`.
|
2015-11-15 22:49:42 +09:00 |
mogemimi
|
9ec1e2069a
|
Fix deprecated warnings
|
2015-11-13 14:38:48 +09:00 |
XiaoFeng
|
140eaf7b6c
|
Fix function name in cpp file
|
2015-11-13 09:09:02 +08:00 |
XiaoFeng
|
4c8066e39f
|
Normalize function names.
|
2015-11-12 18:23:56 +08:00 |
yangxiao
|
39a6f1e8f1
|
char* to string
|
2015-11-12 18:08:29 +08:00 |
XiaoFeng
|
1546a062a1
|
Update
|
2015-11-12 10:57:22 +08:00 |
XiaoFeng
|
c40a2a3301
|
Combine Studio change for 2d components
|
2015-11-12 09:49:49 +08:00 |
CocosRobot
|
4ccc6ce5de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-11 06:53:45 +00:00 |
pandamicro
|
8695fbe711
|
Merge pull request #14172 from njh0602/somefix2
Add virtual keyword.
|
2015-11-11 14:17:27 +08:00 |
pandamicro
|
6fc7aca423
|
Merge pull request #14153 from Fraggle/patch-1
PMA Handling issue
|
2015-11-11 14:14:22 +08:00 |
pandamicro
|
ac06c9f8bb
|
Merge pull request #14260 from pyrosphere/add-app-version
Added Application::getVersion() to get the app version.
|
2015-11-11 14:13:42 +08:00 |
pandamicro
|
3963e8a774
|
Merge pull request #14333 from nhuanvd/cocos2dxactivity_bugfix
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
|
2015-11-11 14:10:24 +08:00 |
pandamicro
|
5ff7cac4ae
|
Merge pull request #14298 from TheCodez/patch-1
Fix #14298
|
2015-11-11 14:04:40 +08:00 |
Neo Kim
|
94637bef2f
|
PageView - Change to keep some of the original API names because it makes more sense.
|
2015-11-10 21:35:01 +09:00 |
Neo Kim
|
9cbbd283c7
|
PageView - Deprecate the APIs related to custom scroll threshold.
|
2015-11-10 21:35:01 +09:00 |
Neo Kim
|
049607b5d8
|
Replace tab indents to 4 spaces.
|
2015-11-10 21:03:51 +09:00 |
XiaoFeng
|
1f0c498bcb
|
Fixed actionNode position error bug
|
2015-11-09 19:45:17 +08:00 |
pandamicro
|
c08b4a0f9d
|
Merge pull request #14343 from super626/v3
fix cull face for render queue
|
2015-11-09 12:51:39 +08:00 |
yangxiao
|
9d2fca6d34
|
fix cull face for render queue
|
2015-11-09 10:42:12 +08:00 |
XiaoFeng
|
c0c35c603e
|
Update version number & RELEASE_NOTES.md, prepare 3.9 release
|
2015-11-06 18:38:09 +08:00 |
Nhuan Vu Duc
|
fec8a5db02
|
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
|
2015-11-06 13:05:40 +07:00 |
zhangcheng
|
8183d34b68
|
revert old timelineParser-2.x.js and add "||false" to it.
|
2015-11-06 12:50:36 +08:00 |
zhangcheng
|
76ed15591f
|
Update web submodule to latest.
|
2015-11-06 11:56:45 +08:00 |
pandamicro
|
81cb13a159
|
Merge pull request #14328 from xiaofeng11/v3
Fix "TextureCache Test" in js-test crash under Android
|
2015-11-06 10:56:31 +08:00 |
XiaoFeng
|
139d8b5310
|
Remove unused code
|
2015-11-06 10:10:09 +08:00 |
XiaoFeng
|
1a56668cd3
|
Fix "TextureCache Test" in js-test crash under Android
|
2015-11-06 09:49:19 +08:00 |
Jeff Wang
|
c1a64e9243
|
new implementation of EditBoxImpl-win32
|
2015-11-06 02:14:34 +08:00 |
yangxiao
|
3016bf696a
|
fix updateVerticesForLOD
|
2015-11-05 15:18:46 +08:00 |
CocosRobot
|
f7803cba19
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-04 11:09:49 +00:00 |
mogemimi
|
a31cce9a80
|
Fix minor grammar and typo in documentation
|
2015-11-04 17:14:00 +09:00 |
pandamicro
|
7d93b419fd
|
Merge pull request #14303 from xiaofeng11/v3_fix
Fix ComponentTest in la-test can not load lua file under iOS & Android
|
2015-11-04 13:52:14 +08:00 |
pandamicro
|
e13c9a8d8d
|
Merge pull request #14313 from super626/v3
Function genMaterial keeps old state block
|
2015-11-04 13:45:36 +08:00 |
yangxiao
|
16a79ed9df
|
function genMaterial keeps old state block
|
2015-11-04 11:10:28 +08:00 |
Dale Stammen
|
dfe56769a1
|
added missing Light3DReader files
|
2015-11-03 08:04:55 -08:00 |
pandamicro
|
4d0098c6be
|
Merge pull request #14299 from mogemimi/fix-docs-typo
Fix typos in documentation
|
2015-11-03 18:12:21 +08:00 |
XiaoFeng
|
3223a97b26
|
Fix ComponentTest in la-test can not load lua file under iOS & Android
|
2015-11-03 15:49:46 +08:00 |
liamcindy
|
872141d547
|
update for light3d reader
|
2015-11-03 13:34:21 +08:00 |
mogemimi
|
8f632365c3
|
Fix typos in documentation
|
2015-11-03 04:43:44 +09:00 |
Michael Kösel
|
4f89828625
|
Removed PhysicsBody::update from PhysicsWorld
|
2015-11-02 14:18:21 +01:00 |
namhyeonuk
|
7fe2b87574
|
CREATE_FUNC macro NULL -> nullptr
|
2015-10-31 20:18:39 +09:00 |
Filipe Lemos
|
61ce3e8a03
|
Fixed warnings about missing override in CCApplication for iOS/Mac
|
2015-10-30 10:02:07 +00:00 |
pandamicro
|
c80f523637
|
Merge pull request #14269 from pandamicro/v3
[ci skip]Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
|
2015-10-30 17:20:58 +08:00 |
pandamicro
|
246eab11a1
|
Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
|
2015-10-30 17:19:21 +08:00 |
zilongshanren
|
3e2094981f
|
add scale9sprite rendering type test
|
2015-10-30 14:01:01 +08:00 |
pandamicro
|
b58e656620
|
Merge pull request #14264 from super626/v3
Fix: Mesh::setGLProgramState may modify state block
|
2015-10-30 10:11:23 +08:00 |
zilongshanren
|
f84c2de1e2
|
add sprite and scale9sprite batch test
|
2015-10-30 09:58:02 +08:00 |
Filipe Lemos
|
11fc969ecb
|
Fixed inconsistency in getVersion() when no version is available on Android
|
2015-10-29 17:14:32 +00:00 |
zilongshanren
|
1417534194
|
add rendering type to scale9sprite
|
2015-10-29 23:13:36 +08:00 |
zilongshanren
|
7c82f9fe88
|
cache slice sprite calculation
|
2015-10-29 21:53:58 +08:00 |
Filipe Lemos
|
9aa1f7138d
|
Added override keyword to getVersion
|
2015-10-29 08:36:03 +00:00 |
zilongshanren
|
9a14ad5b14
|
fix a small bug related to non slice anchorPoint
|
2015-10-29 14:27:27 +08:00 |
yangxiao
|
11f5e6cf96
|
setGLProgramState should not modify state block
|
2015-10-29 14:22:13 +08:00 |
yangxiao
|
16d9cf1af9
|
setStateBlock implement
|
2015-10-29 14:21:25 +08:00 |
pandamicro
|
c0ecf7f7aa
|
Merge pull request #14262 from liamcindy/3.9_light_js
update for light3d js reader
|
2015-10-29 13:52:33 +08:00 |
pandamicro
|
617f5265f1
|
Merge pull request #14256 from pandamicro/v3
Use generational gc friendly API in JSTouchDelegate
|
2015-10-29 12:34:42 +08:00 |
zilongshanren
|
ccf4cb5a74
|
improve scale9sprite
|
2015-10-29 10:41:58 +08:00 |
pandamicro
|
ac54c9b7de
|
Merge pull request #14261 from liamcindy/3.9_light
update for light3d reader
|
2015-10-29 10:08:32 +08:00 |
unknown
|
f2f6d25408
|
update for light3d js reader
|
2015-10-29 10:04:56 +08:00 |
unknown
|
917edbcf62
|
update for light3d reader
|
2015-10-29 09:53:54 +08:00 |
Filipe Lemos
|
04fa7a8902
|
Added Application::getVersion() to get the app version.
|
2015-10-28 17:57:57 +00:00 |
Neo Kim
|
e59b7b74be
|
PageView - Add `scrollToItem()` having only one parameter.
|
2015-10-28 16:57:54 +09:00 |
Neo Kim
|
69b794d284
|
PageView - Remove `_indicatorEnabled` flag. Null `_indicator` means that it is disabled.
|
2015-10-28 16:57:53 +09:00 |
Neo Kim
|
9ed617c978
|
PageView - Add API descriptions
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
b72e4118f0
|
PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
e3fcd6722a
|
PageViewIndicator - Add some getter and setters.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
8abd1ab600
|
PageView - The indicator should be created before `ListView::init()`
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
2d2d17172c
|
PageViewIndicator - Fix that indexes were upside down in vertical view.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
1897051664
|
PageView - Add `setDirection()` and `setIndicatorEnabled()` methods.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
eefdffc032
|
PageViewIndicator - Add `setDirection()` method.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
368a3048c4
|
PageView - Add `setIndicatorPosition()`.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
fc0fe976f7
|
PageView - Complete `handleReleaseLogic()` method.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
b19ed5a3b5
|
ScrollView - Change `moveInnerContainer()` to virtual method.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
b3f33de071
|
ListView - Change `calculateItemDestination()` to a class method.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
c684016ee6
|
PageView - Implementing page view indicator
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
4dbfb79110
|
Add `onItemListChanged()`method.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
0ee09fcfce
|
PageView - Implement the page indicator
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
30e2e46f20
|
PageView - Add `PageViewIndicator` which indicates current page among total pages.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
76acb91861
|
Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
a2bc0d4859
|
ScrollViewBar - Change wording in comment.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
b9a4449494
|
PageView - Add `handleReleaseLogic()` for page view.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
46c0a43105
|
ScrollView - Use a vector in `scrollChildren()` instead of two floats.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
84d0625b93
|
ScrollView - Remove redundant codes.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
5de6aa78ec
|
ScrollView - Remove the return value of `scrollChildren()`.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
30d39af5fa
|
Refactor `jumpTo` methods to use `moveInnerContainer()`.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
e67250e162
|
ScrollView - Create `moveInnerContainer()` to replace `moveChildren()` and `moveChildrenToPosition()`. All move related logic will be integrated into one.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
97acf52cc8
|
PageView - Replace the legacy methods of `PageView` with the ones of `ListView`.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
e567259826
|
PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`.
|
2015-10-28 16:56:34 +09:00 |
pandamicro
|
7d832b0753
|
Merge pull request #14238 from pandamicro/v3
Add cc.Director.EVENT_BEFORE_UPDATE
|
2015-10-28 15:50:37 +08:00 |
pandamicro
|
06b828250a
|
Merge pull request #14241 from yuyangame/patch-1
fix cc.game.config['showFPS'] bug
|
2015-10-28 15:48:21 +08:00 |
pandamicro
|
893edbaf24
|
Merge pull request #14246 from WenhaiLin/v3.9
Fixed text may display of incomplete when Label create with system font on Mac.
|
2015-10-28 15:47:45 +08:00 |
pandamicro
|
b6b9364a84
|
Merge pull request #14232 from xiaofeng11/v3
Fix FadeOutDownTilesTest won't show last tile
|
2015-10-28 15:44:28 +08:00 |
WenhaiLin
|
7b758fd780
|
Fixed text may display of incomplete when Label create with system font on Mac.
|
2015-10-28 12:06:58 +08:00 |
pandamicro
|
68d75a519a
|
Use generational gc friendly API in JSTouchDelegate
|
2015-10-28 11:55:28 +08:00 |
CocosRobot
|
09cbc2145d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-28 03:29:16 +00:00 |
Kvial
|
27773b6f1a
|
fix cc.game.config['showFPS'] bug
```javascript
//project.json
{
...
'showFPS' : false,
...
}
```
```javascript
//CCBoot.js
...
config[CONFIG_KEY.showFPS] = config[CONFIG_KEY.showFPS] || true;// this property will be set to true
...
```
|
2015-10-27 20:36:05 +08:00 |
XiaoFeng
|
6029635493
|
Remove comment out codes
|
2015-10-27 18:43:51 +08:00 |
pandamicro
|
616eae2b6d
|
Add cc.Director.EVENT_BEFORE_UPDATE
|
2015-10-27 17:32:57 +08:00 |
pandamicro
|
535c4bcd1d
|
Merge pull request #14236 from CocosRobot/update_lua_bindings_1445937846
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-27 17:31:43 +08:00 |
CocosRobot
|
35f7f3cb2f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-27 09:29:42 +00:00 |
pandamicro
|
aa9f0d5bd5
|
Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
|
2015-10-27 17:28:22 +08:00 |
pandamicro
|
d2d60e36d2
|
Merge pull request #14222 from TheCodez/fix_memoryleak
Fix memory leak in Enhance-API
|
2015-10-27 17:22:11 +08:00 |
pandamicro
|
c491ddf1e8
|
Merge pull request #14235 from pandamicro/v3
Fix cc.DrawNode.drawPoly
|
2015-10-27 17:19:50 +08:00 |
pandamicro
|
a3c2904e7f
|
Fix cc.DrawNode.drawPoly
|
2015-10-27 16:46:25 +08:00 |
XiaoFeng
|
f374df408e
|
Fix FadeOutDownTilesTest won't show last tile
|
2015-10-27 14:41:31 +08:00 |
Joachim Grill
|
94ab41ceb3
|
use "const string &" in SpriteFrameCache
|
2015-10-26 09:36:01 +01:00 |
XiaoFeng
|
036585ef95
|
Fix ActionManagerEx some times crash when reload action frames.
|
2015-10-26 10:38:17 +08:00 |
CocosRobot
|
5760e43387
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-26 01:45:38 +00:00 |
Michael Kösel
|
561b15e260
|
Fix memory leak in Enhance-API
|
2015-10-24 14:26:59 +02:00 |
mogemimi
|
9df30d2454
|
Fix typos in documentation
|
2015-10-23 16:59:51 +09:00 |
pandamicro
|
ade1d0ef8d
|
Merge pull request #14214 from pandamicro/spriteframecache
Fixed memory leak in CCSpriteFrameCacheHelper
|
2015-10-23 09:29:37 +08:00 |
fuyifan
|
5065a542f7
|
fix the issue #14113
|
2015-10-23 00:00:18 +08:00 |
pandamicro
|
530321fe70
|
#14124 Improved JSCallbackWrapper with generational GC and fix the issue
|
2015-10-22 17:00:57 +08:00 |
pandamicro
|
175f4c02ad
|
Merge pull request #14197 from xiaofeng11/v3_xf
Fix CCDownloader-curl will crash in js-test & Fix broken image link in TextureCacheTest.js
|
2015-10-22 14:45:20 +08:00 |
pandamicro
|
0a6360eee0
|
Merge pull request #14196 from geron-cn/v3
AnchorPointFrame animation performance diffrent
|
2015-10-22 14:37:26 +08:00 |
XiaoFeng
|
6beb982665
|
Adjust code execute order, used a simple and safe way to avoid access fail bug.
|
2015-10-22 14:36:26 +08:00 |
pandamicro
|
65fafef044
|
Merge pull request #14209 from pandamicro/v3
Disable bitcode for all targets
|
2015-10-22 12:55:25 +08:00 |
pandamicro
|
4633a93631
|
Disable bitcode for all targets
|
2015-10-22 12:18:51 +08:00 |
pandamicro
|
05b277752c
|
Merge pull request #14105 from WenhaiLin/v3.9-rc
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system not enough memory"
|
2015-10-22 10:36:02 +08:00 |
pandamicro
|
a7e5946b7d
|
Merge pull request #14154 from Dimon4eg/fix-crash-in-web-view-on-android
Fix crash in web view on android
|
2015-10-22 10:35:00 +08:00 |
pandamicro
|
f98d0cc115
|
Merge pull request #14166 from webcrawler/my_fix_branch
remove duplicate include
|
2015-10-22 10:33:05 +08:00 |
pandamicro
|
6925e423e3
|
Merge pull request #14204 from mogemimi/fix-naming-typos
Fix naming typos
|
2015-10-22 10:25:07 +08:00 |
pandamicro
|
f2898ecf30
|
Merge pull request #14207 from super626/terrain
fix shader on pc
|
2015-10-22 10:10:10 +08:00 |
yangxiao
|
cca25f5b5c
|
fix shader on pc
|
2015-10-22 09:29:12 +08:00 |
pandamicro
|
d3664b9616
|
#14128 Fix cc.loader.getRes crash caused by null type
|
2015-10-22 01:16:56 +08:00 |
pandamicro
|
43c19fd1e7
|
Merge pull request #14205 from pandamicro/v3
Fix Scheduler API inconsistency
|
2015-10-21 22:11:16 +08:00 |
pandamicro
|
9eeda122e9
|
Fix Scheduler API inconsistency
|
2015-10-21 22:10:48 +08:00 |
dimon4eg
|
27d5ad920e
|
Update comment
|
2015-10-21 16:55:45 +03:00 |
dimon4eg
|
7e43e28ca2
|
Fix crash in java code only
|
2015-10-21 16:55:25 +03:00 |
dimon4eg
|
82bcbb0325
|
Revert: Fix crash in web view on android
|
2015-10-21 16:54:41 +03:00 |
pandamicro
|
558ac3cfa0
|
Made CC_CONSTRUCTOR_ACCESS public only when script binding is enabled
|
2015-10-21 16:05:31 +08:00 |
mogemimi
|
4012dd8455
|
Fix naming typos
|
2015-10-21 15:56:47 +09:00 |