41c0881ab5
SpriteTest fix
...
* Image is Ref class, please new & release it. Don't allocate it on stack.
* Fixes complicated logic of getting string from file.
2016-01-15 00:55:10 +08:00
0f3cb16efd
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-14 16:16:37 +08:00
be6f9c0f03
Merge pull request #14882 from geron-cn/playableframe
...
add PlayableFrame
2016-01-14 09:42:17 +08:00
d589e44b0a
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
...
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
eab1de0f1e
format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885
2016-01-13 16:34:04 +08:00
e3c50caf11
add test case for PlayableFrame
2016-01-13 15:25:31 +08:00
e1d0d7f722
Merge pull request #14854 from zilongshanren/fixScale9GrayShader
...
fix scale9sprite gray state opacity issue.
2016-01-12 11:50:41 +08:00
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
7d943f200f
fix scale9sprite gray state opacity issue.
...
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 17:17:55 +08:00
2797277de8
Revert "fix scale9sprite gray state opacity issue."
2016-01-07 17:07:27 +08:00
1910f79b2f
fix scale9sprite gray state opacity issue.
...
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 15:26:14 +08:00
81428737c9
fix compilation errors
2016-01-05 09:51:37 +08:00
168e851cce
Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android.
2015-12-31 10:42:06 +08:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
707f08c557
Revert "fix setflip for batch sprite"
2015-12-23 09:54:04 -08:00
0d0534a2e1
Merge pull request #14697 from super626/v3.10-fixsprite
...
fix setflip for batch sprite
2015-12-23 09:53:24 -08:00
830eb3433f
Merge pull request #14786 from liamcindy/v3_ui_widget
...
fix uiWidget clipping error with Node
2015-12-23 18:57:15 +08:00
bcc2ed0e2a
update for scrollView test
2015-12-23 18:14:09 +08:00
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
82867b0073
Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click
...
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
2015-12-22 18:41:44 +08:00
064cd8d04f
Merge pull request #14722 from newnon/v3.10_webp_improvement
...
WebP loading improvements WebP loaded as premultiplied alpha if it has
2015-12-22 13:43:11 +08:00
09c139039f
add tmx with flipped spritebatch test
2015-12-21 10:00:15 +08:00
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
a342866083
Test for WebP with & without alpha
2015-12-20 14:22:04 +03:00
8bf7908e93
fix loadingbar direction changed error
2015-12-19 15:59:27 +08:00
b480e9191d
Merge pull request #14729 from newnon/v3.10_scale9sprite_cropped_spriteframes_support
...
Scale9Sprite cropped sprite frames support
2015-12-19 13:07:25 +08:00
593a619dc8
Merge pull request #14715 from liamcindy/v3_textureCache
...
update for 3D object render, revert old changes
2015-12-18 21:22:31 +08:00
e2f94a7a44
Merge pull request #14698 from super626/v3.10-fixshader
...
fix Shader-Sprite crash when shader can not compile
2015-12-17 23:22:09 -08:00
fb312a761c
update for 3D object render, revert old changes
2015-12-18 11:23:33 +08:00
714c01991e
Scale9Sprite test improvemets
2015-12-18 01:38:53 +03:00
98fe1d46cc
Scale9Sprite now fully support cropped sprite frames in both mode simple & slice
2015-12-18 00:32:59 +03:00
b079705dcd
Merge pull request #14702 from pandamicro/v3.10
...
Fix Downloader callback bug on iOS9
2015-12-17 01:05:10 +08:00
2881ce7c40
Merge pull request #14632 from liamcindy/UITest
...
update for ui resource test
2015-12-16 18:18:35 +08:00
7303895866
Improve error message for Downloader and add test case
2015-12-16 15:43:18 +08:00
b91882f150
Fixed label's letter can't be hide by `setVisible(false)`.
2015-12-16 14:59:33 +08:00
5e61e37d80
fix crash when shader can not compile
2015-12-16 13:54:43 +08:00
8e75cdcd42
SpriteOffsetAnchorRotation test: moved setup code from ctor to onEnter(), as ctor is called before onExit() of previous test case, which might mess up sprite frame cache
2015-12-15 14:14:09 +01:00
4dd3595b1e
added test with plist file containing anchor points
2015-12-14 16:17:41 +01:00
6318634887
Merge pull request #14641 from liamcindy/v3_ui_controlButton
...
fix controlButton test error
2015-12-14 19:47:41 +08:00
508d54ec3c
fix pageview child size
2015-12-14 15:29:02 +08:00
8c9b03112e
fix scale9sprite global zorder issue.
...
1. it also fix the positiong issue when call setScale9Enabled(false)
2015-12-14 10:09:06 +08:00
d75767bfc4
Merge pull request #14639 from liamcindy/v3_ui_text
...
update for text effect clone
2015-12-11 13:54:46 +08:00
f877f26bd2
update for controlButton
2015-12-11 11:56:58 +08:00
1a17e94e1c
update for scrollview test
2015-12-10 15:25:27 +08:00
136b2bd514
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into UITest
2015-12-10 14:53:43 +08:00
e92db43e14
update for text clone
2015-12-10 13:17:31 +08:00
c823821a08
fix controlButton test error
2015-12-10 10:36:00 +08:00
aedd48e74b
Merge pull request #14615 from xiaofeng11/v3_testBugFix
...
Remove default focus item from "Node:UI->1:GUI Dynamic Create Test->4:Focus Test"
2015-12-09 18:36:08 +08:00
bb515dce58
fix issue 12249
2015-12-09 17:15:09 +08:00
df2ebfbc9c
change uibutton nons9 to simple rendering mode
2015-12-09 14:21:26 +08:00
724e9b42a2
Remove default focus item from "Node:UI-->1:GUI Dynamic Create Test-->4:Focus Test"
2015-12-09 11:12:42 +08:00
73d0f8a46e
Bug fix & make test case more clear.
...
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
2015-12-07 18:36:28 +08:00
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
1171c6aaa1
Remove desktop only function, set ondraw serial function in DrawNode override able.
2015-12-04 14:55:54 +08:00
0e34a864b2
Merge pull request #14528 from xiaofeng11/v3_3dtouch
...
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-03 22:21:48 -08:00
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
2da192a1c2
Remove cocostudio header file from sprite and particle, and adjust tests
...
Fix compile error under iOS & Mac
2015-12-04 09:26:14 +08:00
f14688464f
spawn2 in the correct place
2015-12-03 12:18:33 -08:00
3646d1e9fc
Adds init(array) for Sequence and Spawn
...
it also makes the code cleaner.
this is needed for JS
2015-12-03 12:16:21 -08:00
73d00b9262
fix scale9sprite be culled unexpectedly
...
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
2015-12-03 17:53:02 +08:00
32b81a69f5
Add test for new API
...
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
2015-12-03 14:21:00 +08:00
bb23015f73
make sure attributes greater than 8 before use normal map
2015-12-02 12:03:31 +08:00
ebd5c1cca7
resolve conflict and fix checktexture bug
2015-12-02 11:26:05 +08:00
5dfc8f6a26
Remove default arguments
2015-12-02 11:02:27 +08:00
18666a9b41
Merge pull request #14393 from xiaofeng11/v3_combine_3d
...
Combine Studio change for 3d components
2015-12-02 09:47:12 +08:00
bb832f8d60
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-01 13:02:53 +08:00
096efe8744
rename print interface
2015-12-01 11:07:02 +08:00
34da2aabb2
fix compile error
2015-11-30 17:34:49 +08:00
6054dc0197
update for ui test
2015-11-30 16:17:13 +08:00
e0349ae975
update sprite 3d test
2015-11-30 14:48:19 +08:00
01e619f686
Merge pull request #14476 from cesarpachon/linuxAudioEngine
...
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudio…
2015-11-28 14:27:15 +08:00
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
0f8c3e0c1c
Merge pull request #14435 from zilongshanren/improve-label-layout-v2
...
Add Overflow to Label
2015-11-27 17:31:40 +08:00
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
b1490c96b6
Merge branch 'v3' into fixListViewClippingIssue
2015-11-25 18:25:40 +08:00
9241797acb
support normal mapping material
2015-11-25 10:45:03 +08:00
9c2130e88a
fix Layout and ClippingNode nested rendering issue
2015-11-24 18:01:50 +08:00
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
7676b1cb73
improve label layout logic
2015-11-23 17:47:30 +08:00
361daf7f5f
fix wrong indentation
2015-11-23 11:50:04 +08:00
12df5ae1cc
Fix wrong variable use for setPlaceholderFontName
...
1. fix editbox scale not affect native font size
2015-11-23 11:49:22 +08:00
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
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
19257d6120
Add Overflow feature char map font.
...
1. fix single line clamp.
2015-11-19 18:14:46 +08:00
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
efeae1eae9
add a test case for pr 14327
2015-11-18 22:52:47 +08:00
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
a5b7674b4d
Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4
...
improve scale9sprite
2015-11-17 10:48:09 +08:00
603d788fbf
PageView - Fix that page indicator was not working well in vertical page view.
2015-11-15 22:49:42 +09:00
d86d32fb09
constexpr for signature, garbage collection and compile-time error for unsupported argument types
2015-11-10 23:39:16 +03:00
9cbbd283c7
PageView - Deprecate the APIs related to custom scroll threshold.
2015-11-10 21:35:01 +09:00
23118cb587
fix missing include
2015-11-08 01:26:15 +03:00
ef89025d4b
fix missing include
2015-11-08 00:25:02 +03:00
80e8b58b53
easy jni
2015-11-07 23:57:05 +03:00
0c8aed8a1a
Remove redundancy code
2015-11-02 13:40:08 +08:00
3e2094981f
add scale9sprite rendering type test
2015-10-30 14:01:01 +08:00
f84c2de1e2
add sprite and scale9sprite batch test
2015-10-30 09:58:02 +08:00
1417534194
add rendering type to scale9sprite
2015-10-29 23:13:36 +08:00
543fff63fb
PageView - Add indicators to some test cases
2015-10-28 17:23:08 +09:00
abc309edb2
PageView - Replace the deprecated APIs with new ones.
2015-10-28 16:57:54 +09:00
b9a4449494
PageView - Add `handleReleaseLogic()` for page view.
2015-10-28 16:56:35 +09:00
97acf52cc8
PageView - Replace the legacy methods of `PageView` with the ones of `ListView`.
2015-10-28 16:56:34 +09:00
e567259826
PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`.
2015-10-28 16:56:34 +09:00
a09f2af14c
PageView - Trivial change on test code
2015-10-28 16:56:34 +09:00
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
73c0ce1a9a
Replace String::createWithFormat() with StringUtils::format()
2015-10-16 15:02:14 +09:00
efeb6a44fb
Merge pull request #14143 from MSOpenTech/v3-win10-curl
...
V3 win10 curl
2015-10-16 13:35:48 +08:00
e789ab97be
Merge pull request #14139 from super626/v3
...
fix obb performance test
2015-10-15 16:00:51 +08:00
3e3e47de10
added Win10 UWP curl support
2015-10-14 16:47:52 -07:00
85f40de424
fix obb performance test
2015-10-14 13:43:02 +08:00
767a4afb9f
Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1
2015-10-14 09:16:34 +08:00
f64105b3dc
Merge pull request #14047 from liamcindy/v3.9
...
update for light3d reader
2015-10-10 11:43:05 +08:00
c2571f950c
Merge pull request #14003 from zilongshanren/fixWebViewCallback
...
fix ui::WebView callback operate OpenGL issue.
2015-10-10 11:32:02 +08:00
79656ffe13
fixed typo, indentation
2015-09-29 16:50:14 +02:00
80ca579a01
added Sprite test case which loads PolygonInfo of sprite from plist file
2015-09-29 15:44:13 +02:00
8368762b37
update for light3D
2015-09-29 18:33:28 +08:00
744b7f54c9
Fix wrong debug check
2015-09-26 16:58:26 +02:00
bee52e378d
fix ui::WebView callback operate OpenGL issue.
...
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
2015-09-23 11:22:36 +08:00
1c40f7b61b
CCScrollView should override removeChild
...
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/8396
2015-09-21 11:35:11 +08:00
fa9afd6c2b
Merge pull request #13953 from himynameschris/fix-socketio
...
Fix socketio to work with servers v1.0+
2015-09-20 23:15:27 +08:00
f93cfac0f7
rename setAnimationEndCallFunc
2015-09-20 16:24:41 +08:00
0cfc33e4d3
format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770
2015-09-20 12:34:34 +08:00
e7c2436d85
fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings)
...
Signed-off-by: Chris Hannon <chris@channon.us>
2015-09-19 20:31:48 -04:00
6bf54a3eda
Merge pull request #13770 from geron-cn/v3
...
add Frame End Call Back and Animation Clip End Call Back
2015-09-19 00:24:21 +08:00
0cbc1e5f40
Merge pull request #13923 from WenhaiLin/v3-physics-refine
...
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
add24ccf95
Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug
...
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 21:43:42 +08:00
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
36d4f5564d
merge cocos
2015-09-18 14:08:33 +08:00
3f5df0ccc3
Merge pull request #13647 from super626/motionstreak3d
...
Motionstreak3d
2015-09-18 11:59:33 +08:00
eb480fb021
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 11:31:37 +08:00
6f1b04fd89
merge cocos
2015-09-18 09:37:26 +08:00
ded9a9e6d4
Merge pull request #13893 from yangws/downloader
...
Remove AssetsManager dependence with CRUL.
2015-09-17 22:18:56 +08:00
5eafc93d86
Remove AssetsManager dependence with CRUL.
2015-09-17 16:52:31 +08:00
1eeafed072
Merge pull request #13884 from yangws/v3
...
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 16:32:56 +08:00
5b99ada936
Merge pull request #13842 from yangws/issue_13818
...
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong
2015-09-17 16:23:25 +08:00
572ee3adb2
merge cocos
2015-09-17 14:24:01 +08:00
4b83240bed
Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 11:20:36 +08:00
1be5402050
Merge branch 'v3' into addiOSMultiline-support
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
2015-09-16 21:49:55 +08:00
0479cca364
Merge pull request #13832 from yangws/downloader
...
Restructure CCDownloader implement on iOS and Android don't use libcurl.
2015-09-16 14:01:28 +08:00
c85dc71846
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong.
2015-09-16 11:07:37 +08:00
ea538cd9da
merge cocos
2015-09-16 10:37:24 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
f2bee23696
Merge pull request #13789 from neokim/fix-13668
...
Fix for #13668
2015-09-15 18:28:24 +08:00
73d2c5d1b8
Merge pull request #13577 from fusijie/fix_13454
...
Fixed sprite debug draw.
2015-09-15 14:24:23 +08:00
556175df1e
add iOS EditBox multiline support
...
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.
Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
2015-09-15 13:52:39 +08:00
2fea4db9fc
fix ui::Button title location issue
2015-09-15 13:37:32 +08:00
ebf308d88c
Test case Downloader Test restructured.
2015-09-14 15:33:34 +08:00
3fff195c20
Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary.
2015-09-13 22:32:22 +09:00
96d6221daf
Merge pull request #13723 from neokim/add_scroll_to_item_and_magnetic_scroll_into_listview
...
Add scrolling to item and magnetic scroll into ListView
2015-09-11 17:48:40 +08:00
22b2f8b7b3
ListView - Change the order of test cases and fix for windows builds.
2015-09-11 16:00:53 +09:00
966e568051
add ActionTimeline Frame End Call Back and Animation Clip End Call Back
2015-09-10 18:29:09 +08:00
bd80eb6f46
CCDownloader-android implements Data Task Download.
2015-09-10 18:03:15 +08:00
6f06ea19ac
Merge branch 'v3' into performance-test
2015-09-10 16:06:36 +08:00
e3161eb127
Remove performance tests from cpp-tests project.
2015-09-10 16:01:56 +08:00
7e2fe05050
CCDownloader-android implements File Task Download.
2015-09-10 15:56:06 +08:00
d5fab0bd38
merge cocos
2015-09-10 10:44:09 +08:00
ff85173b4b
remove cached material switch test demo
2015-09-09 11:13:17 +08:00
e58c073186
ListView - Apply magnetic to inertia scroll.
2015-09-09 10:29:18 +09:00
ca3ea53ffd
ListView - Add enum for magnetic type and test cases for magnetic scroll.
2015-09-09 10:29:18 +09:00
d8fc04d109
ListView - Add 'scrollToItem' method and its test cases.
2015-09-09 10:29:18 +09:00
2599271410
ListView - Add APIs which return the closest item in specific position in current view.
2015-09-09 10:29:17 +09:00
f944750627
add material cache
2015-09-08 15:29:54 +08:00
2076071e8f
outline test using material file
2015-09-08 14:13:53 +08:00
a74e051b56
fix android back to foreground
2015-09-08 10:53:36 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
c3ac446f35
resolve conflict
2015-09-07 14:45:09 +08:00
3a078540a0
Modify CCDownloader-apple.mm support continuly download.
2015-09-07 10:08:28 +08:00
0afa2bdfc6
Modify CCDownloader-curl.cpp to support continue download.
2015-09-06 15:57:51 +08:00
ea580ed2ee
Restructure CCDownload Interface and implements with curl.
2015-09-02 18:26:42 +08:00
c0f40ad4a5
fix Android EditBox font size issue
2015-09-02 18:25:30 +08:00
cc6e2077f4
replace custom shaders by material files
...
add Sprite3DVertexColorTest
2015-09-02 16:30:24 +08:00
8499400514
motionstreak3d test demo
2015-09-01 10:39:31 +08:00
cf664800ac
refine #22483 : Restructure CCDownload Interface and implements on iOS.
2015-08-28 16:40:11 +08:00
d6045fdbea
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
2015-08-27 10:40:04 +08:00
5f527bfc1d
Fixed sprite debug draw.
2015-08-26 18:18:58 +08:00
dfed33f6f2
Adds `PrimitiveCommand` test
2015-08-25 15:07:03 -07:00
6cea66f932
fixed Scale9Sprite default capInset bug.
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13560
2015-08-25 23:31:34 +08:00
b6de58c21c
Merge pull request #13558 from WenhaiLin/v3.8-testcase-refine2
...
[cpp-tests]Refine test cases about label
2015-08-25 18:30:44 +08:00
d6ed3b417c
[cpp-tests]Refine test cases about label
2015-08-25 17:50:47 +08:00
19901c43ea
fix spriteblur crash foreground.
2015-08-25 14:39:17 +08:00
a6412e431d
[cpp-tests]Fixed title of test cases.
2015-08-25 10:28:18 +08:00
a7820c1eef
fix shaderTest draw twice.
2015-08-24 18:35:49 +08:00
350182c1aa
Refactor BackGround to Background
2015-08-21 10:43:59 +08:00
3e2001bdb1
Add CCCameraBackgroundBrush
...
including Color, Depth, SkyBox brushes
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
2015-08-21 10:43:59 +08:00
918d7ce5d6
Merge pull request #13480 from geron-cn/v3.8
...
add blendfunc Frame test case
2015-08-20 18:02:40 +08:00
f79d2c8a0a
Merge pull request #13483 from zilongshanren/fix-lua-ui-v3.8
...
[ci skip]add missing ui test in Lua
2015-08-20 15:28:25 +08:00
72496ae426
add missing ui test in Lua
2015-08-20 15:25:09 +08:00
ede4651b5e
add blendfunc Frame test case
2015-08-20 11:29:52 +08:00
31bc04a301
Merge pull request #13455 from MSOpenTech/v3-win10
...
Windows 10 UWP and WP8.1 app certification fixes
2015-08-19 13:36:29 +08:00
5dd6d94c17
Test cases:improve small problems.
2015-08-18 22:19:24 +08:00
9259696847
disable Downloader test for Win10 UWP. No CURL support yet
2015-08-17 18:37:54 -07:00
aeca6ae024
DownloaderAsyncTest:Fixed crash cause by double-click `start download` button.
2015-08-17 10:16:04 +08:00
7047e0fbdb
Merge branch 'v3' into downloader_decouple_squash
2015-08-13 11:07:49 -07:00
20729e16ae
Merge pull request #13349 from yangws/v3
...
Fix bug: timer dt time error when interval = 0.
2015-08-13 17:02:55 +08:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
295dcde2a8
Modify test case SchedulerPauseResumeAll and SchedulerPauseResumeAllUser.
2015-08-13 14:38:51 +08:00
d333d24177
Fix bug: timer dt time error when interval = 0.
2015-08-13 12:55:07 +08:00
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
f78ebf5843
Merge pull request #13312 from super626/animate3d
...
Modify CCLOG to cocos2d::log
2015-08-12 13:57:31 +08:00
25d4f9fccc
Merge pull request #13326 from yangws/bug_22060
...
fix bug: #22060 cpp-tests Scheduler -> Pause/Resume All User test cas…
2015-08-12 13:34:32 +08:00
9159b21c9a
fix bug: #22060 cpp-tests Scheduler -> Pause/Resume All User test case not correct.
2015-08-12 11:37:15 +08:00
3d65700400
Merge pull request #13295 from fusijie/refine_testcase_retro_pos
...
fix retro effect pos bug.
2015-08-12 10:45:14 +08:00
dfc17edb27
Merge pull request #13291 from dabingnn/v3_FixShaderTestCrash
...
fix shader test crash on android device
2015-08-12 10:40:14 +08:00
dbd0b6dd86
Merge pull request #13272 from yangws/bug_21800
...
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
2015-08-12 10:25:30 +08:00
5fb0135bc2
Merge pull request #13297 from yangws/bug_21861
...
Fix bug: #21861 cpp-tests->Node:Sprite->Testing Sprite BatchNode's ef…
2015-08-11 15:55:26 +08:00
47ecb246b8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into bug_21906
2015-08-11 14:24:02 +08:00
7b04dbca88
modify CCLOG to cocos2d::log
2015-08-11 11:54:08 +08:00
d0a5c02399
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-10 17:58:49 +08:00
0d1dfbc440
Fix bug: #21861 cpp-tests->Node:Sprite->Testing Sprite BatchNode's effect not correct.
2015-08-10 17:07:46 +08:00
d848da0e7d
change max parsing count to 5000
2015-08-10 16:41:16 +08:00
4965a9a11c
fix retro effect pos bug.
2015-08-10 16:32:24 +08:00
ea9d6e7997
refine test case to be more testing friendly
2015-08-10 16:12:15 +08:00
b7c624805e
fix material parsing crash on WP8.1 because memory exhausted
2015-08-10 15:51:26 +08:00
0dee83b154
fix shader test crash
2015-08-10 14:40:54 +08:00
acc5754f5e
Merge pull request #13269 from WenhaiLin/v3.8-audioengine-addtestcase
...
Add test case for issue 11143.
2015-08-10 11:39:53 +08:00
f6569f24f4
Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix
...
Re-implement Editbox on Android platform.
2015-08-09 10:25:19 +08:00
e825160750
Merge pull request #13266 from super626/fixtest
...
Fix Sprite3D test background to foreground bug
2015-08-08 19:44:41 +08:00
395b6cb91f
Merge pull request #13263 from super626/v3
...
avoid to trigger touch event multiple times
2015-08-08 17:58:41 +08:00
6644b06643
Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix
...
Fixed minor problems in test cases.
2015-08-08 12:04:30 +08:00
4575587cf7
Fix cocostudio 3d test crash on mobile platform
2015-08-08 11:57:40 +08:00
744fd74b3b
make skeleton's debugdraw contorls all subbone's debug draw
2015-08-08 00:39:01 +08:00
772dab2002
Fixed minor problems in test cases.
2015-08-07 23:08:49 +08:00
4fe7c6de2a
Revert "remove unused code"
2015-08-07 20:21:24 +08:00
5293dcb5bb
Merge pull request #13274 from super626/animate3d
...
remove unused code
2015-08-07 20:05:14 +08:00
d74245bfa9
remove unused code
2015-08-07 18:03:50 +08:00
354f64ec51
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response.
2015-08-07 17:36:35 +08:00
a35e89225e
Re-implement Editbox on Android platform.
...
This PR also fixed issue:
https://github.com/cocos2d/cocos2d-x/issues/9572
For the new EditBox:
1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.
When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.
2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.
3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
2015-08-07 17:27:15 +08:00
5c33f2f6ed
Add test case for issue 11143.
2015-08-07 16:50:54 +08:00
544c96385a
fix background to foreground
2015-08-07 16:16:43 +08:00
d744554a4b
avoid to trigger touch event multiple times
2015-08-07 15:09:01 +08:00
211dde38e9
Fix improper touch intercept event propagation.
...
When the container widget is disabled, it shouldn't intercept touch.
https://github.com/cocos2d/cocos2d-x/issues/8316
2015-08-06 22:50:53 +08:00
a0a34deb78
Merge pull request #13242 from WenhaiLin/v3.8-cpptests-freeze
...
CppTests: Avoid freeze when the program crashed on Android.
2015-08-06 15:03:30 +08:00
ffda8ace82
CppTests: Avoid freeze when the program crashed on Android.
2015-08-06 13:50:15 +08:00
41afa9695c
Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost
...
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-06 11:01:35 +08:00
e81d5af12d
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-05 23:46:41 +08:00
05e88ad279
Merge pull request #13211 from fusijie/v3
...
[ci skip]fixed title.
2015-08-05 16:59:37 +08:00
6072cf9a9d
[ci skip]fixed title.
2015-08-05 15:47:59 +08:00
2c220092e6
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 14:12:02 +08:00
25cb0d2896
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# web
2015-08-03 19:47:56 +08:00
4b7b85f113
Merge pull request #12889 from fusijie/fix_clippingRectangle_bug
...
remove CCClippingRectangleNode transform error support.
2015-08-03 18:01:01 +08:00
d00e54ad8a
remove comment in test case
2015-08-03 16:55:55 +08:00
b13fddb18e
Merge pull request #13162 from super626/v3
...
Terrain: Add light map support
2015-08-03 15:37:42 +08:00
0de2a3b33d
add terrain test with light map
2015-08-03 14:02:46 +08:00
702e667143
Merge pull request #13152 from zilongshanren/addVerticalPageView
...
add PageView vertical scroll support
2015-08-03 13:00:48 +08:00
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# 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
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
00a3d572d1
Merge pull request #12899 from super626/v3
...
Animate3D Callback and Bug fix
2015-08-01 18:24:05 +08:00
5f34c1f072
add PageView vertical scroll support
2015-08-01 18:18:46 +08:00
3bdc7e4e1e
Merge pull request #13138 from fusijie/fix_spritepolygon_setflip
...
fix polygon sprite setFlipped bug.
2015-08-01 09:59:25 +08:00
James Chen