19caf2d276
Merge branch 'v3' into add-listview-cellreuse-tests
2016-03-01 16:40:07 +08:00
7ec4450fc0
add js ListView item reuse tests
2016-03-01 15:22:32 +08:00
552d7d0132
add vertical list cell reuse tests
2016-03-01 13:44:42 +08:00
b3b08271e6
improve Listview item demo
2016-03-01 10:37:48 +08:00
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
a839d5818e
add horizontal cell reuse ListView
2016-03-01 00:07:49 +08:00
6b4a0f808f
Add cocostudio localization editor export data parser and demo
2016-02-26 17:15:24 +08:00
92dca220ce
improve mac editbox
2016-02-25 11:05:18 +08:00
c26fe122ad
SpriteFrameCacheTest: test for PixelFormat
2016-02-12 19:06:16 +03:00
4db0d2c47a
Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
...
add Mac Editbox multiline support.
2016-02-11 21:33:56 +08:00
4a318c0048
Renderer improvments: TriangleCommand and QuadCommand merged
...
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
- QuadCommand is just a subclass of TriangleCommand (simpler)
- but statically it allocates indices internally (like any TriangleCommand) (more
memory, but not that much)
- adds more tests for SpritePolygon
- adds test for batching Tri + Quad command
- and fixes some other bugs
Squashed commit of the following:
commit cce893a9114da5dda91a895e4e661894f365e2c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 8 06:56:57 2016 -0800
QuadCommand: indices are static
thanks @Darinex
commit e5fd1c14e93d2f07b8266bfec03cf7206d348f59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:18:42 2016 -0800
little improvements in xcode proj management
commit 6cd29764e01ad300f4e89e62aa6b399f73e94f01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:05:52 2016 -0800
Renderer improvments: TriangleCommand and QuadCommand merged
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
and fixes some other bugs
Squashed commit of the following:
commit af7a209435c5f2430c31ab3ebcc7f45051eacb1a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:55:27 2016 -0800
adds test for batching quads and tris
commit 25816e3eaeffd4b0cfe5fa15e97ff84e9013b8be
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:40:15 2016 -0800
cleanup renderer
commit 7f9785056681756c865d603516c7e14c46040e82
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:34:48 2016 -0800
clean up docs
commit 92a8b679dd404e4ca2839d85e2bd925195b12996
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:18:52 2016 -0800
QuadCommand converted to Triangles command
commit 7e21ec12d3781f6964b4d639cfa4bdc79eb8ae80
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 16:17:29 2016 -0800
adds missing files... new test as well
commit d1bd4391785515bdc2e1bebbeb3f321f983b51f2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 14:35:41 2016 -0800
more tests for poly sprites
commit 5775a25b1046671bd0f5af4c5ab52b308b34bb39
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 00:30:13 2016 -0800
malloc instead of std::vector
commit 14a5d45cc978c55a182c03f181ca2bc603776561
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 21:40:46 2016 -0800
little optimization
commit 5667cb2b62416f8a439a54c3973d5841fbe1b68b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 19:13:13 2016 -0800
quad works as expected
commit 462aef05baa6586591882faa366839bead4be068
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 15:22:59 2016 -0800
works
commit c789e6c42811278563c7682b5620296ae8d84aeb
Merge: d6c3729 de62924
2016-02-08 11:25:37 -08:00
a93bc88d31
add Mac Editbox multiline support.
...
1. It also refactor the original logic and optimize the iOS EditBox implementation.
2016-02-04 14:21:07 +08:00
74e7bd2083
fix win32 compile error
2016-01-26 09:52:53 +08:00
25f78e490d
RichText with word wrapping working as expected
2016-01-21 21:44:45 -08:00
be7c8c7553
Merge pull request #14888 from xiaofeng11/v3_actiontimeline
...
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-21 15:35:30 +08:00
87434e2774
add scrollview bar parse for cocostudio in reader
2016-01-20 21:13:59 +08:00
e36d71a24c
adds Invalid test
...
UIRichText reports error on console when parsing invalid xml
2016-01-19 21:16:53 -08:00
27c8e5227d
Adds xml support in UIRichText
...
Supported tags:
- <small>: makes the font 20% smaller
- <big>: makes the font 25% bigger
- <img src="" />: to add an image
- <font face="path to font" size="size" color="#00ffaa">: font
attributes
- <i>: italics
- <b>: bold
- <u>: underline
- <del> strike-through
- </br>: new line
Also adds support for strikethrough, italics, bold and underlie to
`Label`
Contains tests for UIRichText and Label
Squashed commit of the following:
commit a0d6ae0513d40dbf414930210ab032a49d8984a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:39:21 2016 -0800
cleanup LabelTestNew
commit 0cf423af85d88a42fc1317207feeb3d05da7f8ab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:34:53 2016 -0800
adds maaaany tests
...and fixes width and height in <img src="">
commit e8ba6acd5d79bbc766d7aa02ef166e166c801d01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 19:41:37 2016 -0800
Label + URL working Ok
commit 36689e29ee3d77310e92264a09084cc06e30664c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 18:24:44 2016 -0800
adding this code just in case...
... should use a listener component instead
commit af03708950e74483b875d0baad593aa6ed242a04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 14 20:23:36 2016 -0800
URL node
plus <de><u> and <a img
commit e3a4930b012c0b3756752dac6ffb5ad43d24ae99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jan 13 18:42:18 2016 -0800
strikethrough and underline implemented
they support multiline and horizontal alignment as well
includes test
however vertical alignment might not work
commit 640ccf39f56e153db46785a61be7000e898174c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 18:14:57 2016 -0800
bug fixes
commit 5e41fb76e91c571639585a609a255eb41797a302
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 16:47:20 2016 -0800
adds italics and bold "disable test"
commit 202c5a45bb9c8ea160b9f6880ef858874e07814b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 14:40:13 2016 -0800
adds italics test
commit d1a8b421445053cc36860fc376f52692a3672dfe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jan 11 20:53:23 2016 -0800
italics is working ok
commit fdd02087fce920c27c2409301ec88685fe68085b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 8 17:18:56 2016 -0800
color, size and face working
commit c01bdef6b1d49f8805b69d4c162b74cd00c8f5b3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 7 19:02:16 2016 -0800
initial commit
2016-01-19 20:41:31 -08:00
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
dcef1e9d31
fix polygon sprite setflipped bug.
2015-07-31 15:49:44 +08:00
aed6b0719e
Merge pull request #13089 from yangws/issue_12692
...
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
ede9195d14
Merge pull request #13073 from super626/fixtest
...
Bug Fix
2015-07-31 09:58:14 +08:00
c9d23805e7
Merge pull request #12978 from yangws/issue_12249
...
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-31 09:54:38 +08:00
c0066f9afd
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
2015-07-30 20:25:57 +08:00
9b5c8d5d12
Merge pull request #12601 from super626/physics3d
...
3d physics collider
2015-07-30 18:19:23 +08:00
8d8c7fe14b
Complete AudioEngineTest
2015-07-30 17:14:08 +08:00
39721c6eb6
Merge pull request #13105 from fusijie/fix_10487
...
fix Sprite/Label/FastTMX auto-culling bug.
2015-07-30 17:12:37 +08:00
17c7848e62
fix FastTiledMap auto-culling bug.
2015-07-30 15:07:03 +08:00
f91a58c8ff
fix Label auto-culling bug.
2015-07-30 13:59:50 +08:00
c039c7a9bd
Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
...
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-30 11:29:48 +08:00
9972bfb98c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
...
# Conflicts:
# tests/js-tests/src/NativeTest/NativeTest.js
2015-07-29 21:01:56 +08:00
07fdea50de
Refine C++ test case
2015-07-29 20:47:38 +08:00
e1d4d22353
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-29 18:43:11 +08:00
a9f27865d3
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-29 16:30:07 +08:00
ad80c11235
sync render state
2015-07-29 10:35:37 +08:00
7e05538521
ADD SKELETON NEST TEST CASE
2015-07-29 10:23:03 +08:00
81842417c4
Merge pull request #13032 from xiaofeng11/v3
...
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
2015-07-29 09:54:43 +08:00
d2de5b1c85
add test case for bug: #13060 and #13005
2015-07-28 19:18:58 +08:00
66b21fb2a8
Merge pull request #12972 from yangws/issue_12145
...
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
2015-07-28 17:13:26 +08:00
bca6934786
Normalization function names
2015-07-28 14:05:56 +08:00
b92733c402
Add items as protected children.
2015-07-28 11:38:21 +08:00
3a58668d71
Merge pull request #12744 from fusijie/fix_pageturndown
...
Fix PageTurn3D
2015-07-28 11:35:15 +08:00
3cc039b063
Merge pull request #13036 from fusijie/fix_12505
...
fix shader-basic testcase 'center' uniform error.
2015-07-27 15:40:44 +08:00
f8de67a0c4
fix shader-basic testcase 'center' uniform error.
2015-07-27 14:18:17 +08:00
7f383f961a
Merge pull request #13026 from fusijie/fix_13025
...
fix 13025 wild pointer.
2015-07-27 13:38:38 +08:00
f410fcd737
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
2015-07-27 11:55:18 +08:00
bd0bdae530
Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine
...
Label:refine the implementation about text layout and support debug draw.
2015-07-27 11:10:31 +08:00
f2f425d19c
fix 13025 wild pointer.
2015-07-27 10:39:31 +08:00
a1e682ca65
Improves the test to reproduce issue 12996
2015-07-24 21:34:59 +08:00
647848e843
fix blur sprite shader on win8 universal.
2015-07-24 21:04:44 +08:00
bd0a57242b
refine blur shader test case.
2015-07-24 13:52:40 +08:00
d550dace35
fix blur shader compliant on win8 universal.
2015-07-24 12:47:38 +08:00
0b09fd5bcb
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
2015-07-24 11:38:09 +08:00
35040e7bb1
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-23 17:27:04 +08:00
012053e163
replace space to tab.
2015-07-23 17:04:08 +08:00
4b8248c015
Optimization of Custom Data.
...
replace ComExtensionData to ObjectExtensionData.
2015-07-23 16:30:23 +08:00
7255b5308b
config for mac
2015-07-23 15:13:14 +08:00
915cefa208
bone node
2015-07-23 11:51:49 +08:00
b2b9bad83d
improves the test to reproduce bug 12847
2015-07-22 15:08:36 -07:00
741163db40
Merge pull request #12938 from WenhaiLin/v3.8-deps70
...
Update deps for support FullType.
2015-07-22 15:42:13 +08:00
e0e5ae9d99
Merge pull request #12924 from liamcindy/SkyBox_3.7.1
...
update for Game3DNodeReader & UserCameraReader
2015-07-22 15:34:18 +08:00
bb9500769f
Merge pull request #12885 from zilongshanren/add-jumpToPage-api
...
Fix PageView scrollToPage bug and the curPageIndex bug
2015-07-22 15:01:57 +08:00
92e68cd9dc
add sprite frame flash line bug test case.
2015-07-22 13:42:10 +08:00
979a9be1f5
Add test case for test font supported by FullType.
2015-07-21 17:09:27 +08:00
85d4ce0d5a
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
641ff2abf4
Merge pull request #12914 from WenhaiLin/v3.8-label-bmfont-opacity
...
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 18:02:49 +08:00
63326c2826
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 11:10:17 +08:00
beda48124c
merge cocos
2015-07-17 17:54:00 +08:00
ef49e5a169
merge cocos
2015-07-17 17:43:32 +08:00
22ef262295
Merge pull request #12894 from zilongshanren/fixXcode5Warning
...
fix xcode 5.1.1 warnings
2015-07-17 17:33:13 +08:00
309b563c5b
Merge pull request #12896 from yangws/v3
...
[ci skip] Fix bug: the Back button in Node: UI->UIEditBoxTests click area has p…
2015-07-17 15:57:19 +08:00
f9e90f31f6
Fix bug: the Back button in Node: UI->UIEditBoxTests click area has positoin offset.
2015-07-17 15:52:58 +08:00
8c31d70211
fix xcode 5.1.1 warnings
2015-07-17 15:20:49 +08:00
d828c030cb
remove CCClippingRectangleNode transform error support.
2015-07-17 11:56:23 +08:00
89e5307f0c
Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color
...
Label:Fixed the color of letter will be overridden by fade action.
2015-07-17 11:29:58 +08:00
bf20145e35
animate3d callback and test
2015-07-17 11:08:27 +08:00
a6f8031af9
Label:support font that contains GB2312 char map.[except android]
2015-07-16 17:10:05 +08:00
96f6c44281
fix auto scrolling and curPageIdx issue
2015-07-16 16:50:47 +08:00
d5d5af5ac3
change ‘auto’ to ‘auto&&’
2015-07-16 14:08:59 +08:00
40f4e0b27b
Merge pull request #12864 from zilongshanren/add-jumpToPage-api
...
add setCurPageIndex API to PageView.
2015-07-16 13:56:05 +08:00
517221a0df
add jumpToPage API to PageView.
...
1. This commit also fix the default font size issue in ui::Button.
2015-07-16 11:33:57 +08:00
1c9a181c35
Label:Fixed the color of letter will be overridden by fade action.
2015-07-15 20:17:05 +08:00
282dc23bb2
modify interfaces of Animate3DCallback
2015-07-15 17:34:14 +08:00
99e504e668
Merge pull request #12854 from yangws/issue_11310
...
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 15:00:29 +08:00
2f31f6baa6
fixed Scale9Sprite gray state issue.
...
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.
This commit reset the shader state.
2015-07-15 14:35:13 +08:00
7a105ce1e1
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 12:09:08 +08:00
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
6c83e8d81c
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
2015-07-15 11:13:27 +08:00
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
0589c14302
Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
...
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-14 09:44:36 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
74227eaf16
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-13 22:44:40 +08:00
cdc7e5205b
Merge pull request #11995 from MAUSMAUSgames/v3
...
using Action::_tag as flag field
2015-07-13 22:19:03 +08:00
c151ba89e5
Merge pull request #12774 from WenhaiLin/v3-label-createfail
...
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-13 21:58:39 +08:00
db71e073dd
Merge pull request #12742 from WenhaiLin/v3-audioengine-preload
...
AudioEngine:support preload for audio
2015-07-13 17:06:17 +08:00
adfa6d4f0d
Add test case for issue 12775
2015-07-13 15:38:33 +08:00
5a16748273
optimize Animate3DCallback
...
add Animate3DCallbackTest
2015-07-13 11:43:13 +08:00
80dff7f1c4
Rollback pr12299
2015-07-13 11:32:25 +08:00
c167e249cd
Merge pull request #12790 from pandamicro/shaderNormal
...
Use shader with normal while creating mesh with normals
2015-07-12 21:47:05 +08:00
600568fdba
Migrate test case from #10692 @babcca
2015-07-12 11:33:22 +08:00
21a8a8d567
fix mirrored Effect3DOutline
2015-07-10 16:30:45 +08:00
c30ce38cb5
Merge pull request #12766 from super626/v3.7-release
...
Set default 3d animation quality to low
2015-07-10 15:35:22 +08:00
2d27091398
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
...
add write api in FileUtils
2015-07-10 15:13:21 +08:00
a1956e2210
fix issue#9310 issue#10151 issue#12551
2015-07-09 18:05:47 +08:00
10fe728eee
animation quality default to low, do not interpolation
2015-07-09 17:54:21 +08:00
e50fc4f184
merge code
2015-07-09 17:12:48 +08:00
41bc3a1900
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
...
Conflicts:
AUTHORS
2015-07-09 11:11:34 +08:00
c6ebaa19ec
add scene 3d test
2015-07-09 10:19:07 +08:00
02597eb369
Completed test case and comment.
2015-07-08 22:34:33 +08:00
34d1cc0b1d
refactory Effects test case.
2015-07-08 21:56:14 +08:00
4a9e9f3744
completed api.
2015-07-08 17:26:29 +08:00
155ac8c07e
Merge pull request #11583 from hannon235/v3-update-sio
...
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
2015-07-08 16:11:05 +08:00
260ce177d7
refine GridNode with rect.
2015-07-08 15:57:27 +08:00
b395ef06d8
AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1]
2015-07-08 10:48:20 +08:00
8429cc1d90
Update CCDrawNode bug test
2015-07-08 09:35:29 +08:00
581f1ab42b
Add test case
2015-07-07 15:41:54 +08:00
abee4a376a
add write api in FileUtils
...
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
2015-07-07 14:06:59 +08:00
f28fbdd0c4
Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
...
Add scroll bar feature into ScrollView
2015-07-07 13:56:09 +08:00
37674c3689
Add bug test to Mac & iOS cpp-test project
2015-07-07 11:17:08 +08:00
9a6ffd8904
Add bug test for PageView layout & CCNodeDraw::onDrawGLLine
2015-07-07 09:54:42 +08:00
6f3b977c1e
add UserDefault api deleteValueForKey
2015-07-06 17:01:17 +08:00
3ab4285960
Refactor code
2015-07-04 16:06:05 +09:00
ceeca575f3
Replace 'margin' of scroll bar with 'positionFromCorner'
2015-07-04 14:05:47 +09:00
60c32f6fb5
Refactor some codes
2015-07-04 09:56:53 +09:00
c093bb18e2
Add scroll bar manipulation methods into ScrollView
2015-07-04 09:56:52 +09:00
2cae17b462
Add scroll bar feature into ScrollView
2015-07-04 09:56:52 +09:00
99bad19cff
Merge pull request #12660 from pandamicro/merge-v3.7
...
Merge v3.7-release
2015-07-03 11:08:50 +08:00
48c99d2ac4
Merge pull request #12635 from yangws/v3_scene3dtest
...
Fix bug: spine animition can't show in Scene3DTest.
2015-07-03 11:04:23 +08:00
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
5b971ee93d
Merge pull request #12607 from neokim/add_radio_button_and_group
...
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
6550a9ccc2
Replace all tabs to 4 spaces to comply with the convention
2015-07-02 11:30:14 +09:00
4b2bff4674
Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case.
2015-07-02 11:28:14 +09:00
46d25a45a0
Merge branch 'v3_scene3d_fixspineani' into v3_scene3dtest
2015-07-02 10:27:25 +08:00
dc6e966501
[ci skip] remove a unnecessary CCLOG info.
2015-07-01 14:55:31 +08:00
d35bf2305f
add clipping test
2015-07-01 14:48:37 +08:00
276ed46c01
Fixbug : issue 8194.
2015-07-01 14:39:35 +08:00
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
3f05ad2b98
Replace all tabs to 4 spaces to comply with the convention
2015-06-30 20:31:31 +09:00
bed90606d3
Add RadioButton feature and a test case for it.
2015-06-30 18:50:13 +09:00
538daf5bce
add empty line
2015-06-30 14:19:58 +08:00
2ed5ee123e
improve collider
2015-06-30 14:16:05 +08:00
1105111fab
Merge v3 branch.
2015-06-30 11:59:56 +08:00
29cccf631e
Merge pull request #12550 from kompjoefriek/v3-vibrate
...
Vibrate support in v3
2015-06-30 10:28:59 +08:00
265c9b55e0
Merge pull request #12586 from fusijie/add-autoculling-bug-testcase
...
add auto culling test case.
2015-06-30 09:33:36 +08:00
0be9763a9c
add auto culling test case.
2015-06-29 17:25:13 +08:00
c997284825
Merge pull request #12352 from andyque/add-two-events-to-ui-slider
...
Improve ui::Slider
2015-06-29 17:01:27 +08:00
7befab0f7b
add Physics3DCollider
2015-06-29 10:26:09 +08:00
88aeaa36f4
Merge pull request #12534 from super626/skybox
...
Skybox improvement
2015-06-26 17:05:17 +08:00
d29c5643bc
Merge pull request #12559 from WenhaiLin/v3-37-crashfix
...
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` again after a auto-tested.
2015-06-26 12:51:07 +08:00
94c0c0c3fc
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` test case again after a auto-tested.
2015-06-26 12:02:15 +08:00
d2764918b9
Merge pull request #12545 from WenhaiLin/v3-37-removeUInclude
...
Remove unneeded include files and fixed warns.
2015-06-26 09:31:51 +08:00
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
1494f09f06
Remove unneeded include files and fixed warns.
2015-06-25 23:15:39 +08:00
516d45db62
update submodule
2015-06-25 20:16:43 +08:00
8f7b439dfe
add cocostudio 1.6 tests
2015-06-25 18:06:45 +08:00
63f948c822
modify skybox to projection space
2015-06-25 15:01:39 +08:00
117a72fa07
Merge pull request #12514 from WenhaiLin/v3-37-autotest-timeoutfix
...
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
2015-06-24 23:07:38 +08:00
f9db471026
Merge pull request #12495 from super626/v3
...
Fix terrain getIntersectionPoint
2015-06-24 18:36:52 +08:00
a7632a962f
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
2015-06-24 18:24:16 +08:00
0846dadbc3
Add a text label to Node3DReader Test, notice user there has no content to show
2015-06-24 14:58:14 +08:00
c3593c9d64
merge cocos
2015-06-23 18:29:39 +08:00
251c81d7be
Merge branch 'newcode' into v3
2015-06-23 18:25:41 +08:00
fca9b89a4c
Merge pull request #12480 from andyque/fix-rapidjson-assert-error
...
fix rapidjson assert error
2015-06-23 15:34:47 +08:00
70b709f4a8
fix rapidjson assert error
2015-06-23 13:54:11 +08:00
4823cc3bc2
Merge pull request #12476 from super626/fps
...
show fps in scene3d demo
2015-06-23 13:42:26 +08:00
d8a2695620
Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix
...
[cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
2015-06-23 13:36:36 +08:00
a433d57807
show fps
2015-06-23 11:56:50 +08:00
a68874d3cb
Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
2015-06-23 11:00:23 +08:00
931011809d
fixed unintended spaces in string
2015-06-23 10:38:43 +08:00
6bd46fcfcc
[ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App.
2015-06-20 17:07:11 +08:00
d32a317ea0
Label:Fixed line wrap error without space.
2015-06-19 13:39:19 +08:00
1989de7a04
fix terraintest and Terrain::getInstersectionPoint()
2015-06-18 12:20:44 +08:00
27bf636eab
Fix bug: spine animition can't show in Scene3DTest.
2015-06-18 11:45:17 +08:00
4187ea2241
fix Scene3D test
2015-06-18 10:17:46 +08:00
0e0c8cf72e
Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away.
2015-06-18 09:54:48 +08:00
aeeed0f4ab
Merge remote-tracking branch 'origin' into fix_spritepolygon
...
# Conflicts:
# external/config.json
2015-06-16 11:19:20 +08:00
b8826d9de4
improve the enum naming
2015-06-16 09:42:06 +08:00
b167ab3e78
StateBlock() is public
2015-06-15 17:43:37 -07:00
ca3da86da7
StateBlock::restore() is public
...
It is possible to restore to default state
2015-06-15 14:12:44 -07:00
c1108db31e
Improve ui::Slider
...
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
2015-06-15 18:31:21 +08:00
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
0216d05eee
Merge pull request #12102 from super626/navigation2
...
3D Navigation
2015-06-15 13:39:05 +08:00
97ef7974bb
create agent in the onEnter
2015-06-15 11:57:05 +08:00
a8cf72dc43
pass bits to invalidate
2015-06-12 17:14:09 -07:00
4278bf51b1
Adds RenderState::StateBlock::invalidate();
...
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
2015-06-12 16:47:08 -07:00
d9b0b2ca38
more fixes
2015-06-12 15:28:29 -07:00
9806c09b0e
Merge pull request #12299 from WenhaiLin/v3-label-cropped
...
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-12 21:33:09 +08:00
c01d1fe00a
Merge pull request #12310 from WenhaiLin/v3-particlefile-key
...
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
2015-06-12 16:44:12 +08:00
29c108bdef
Merge remote-tracking branch 'origin' into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-12 16:28:41 +08:00
4d97d5075b
Add test case for issue12310.
2015-06-12 15:39:57 +08:00
7a9b48bd83
Merge pull request #12214 from andyque/optimize-ui-memory-usage
...
Optimize ui memory usage
2015-06-12 10:11:21 +08:00
5aa31ea83a
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-11 17:16:44 +08:00
43555272d5
Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix
...
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
2015-06-11 16:34:45 +08:00
44c2b0d5ad
merge cocos
2015-06-11 15:54:42 +08:00
aff2f8c2c4
Fixed compile error.
2015-06-11 14:42:03 +08:00
1b20e463d8
Update the Lua binding about the Polygon and update the test case.
2015-06-11 14:38:38 +08:00
10352c40b2
Merge branch 'v3' into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
3e331128c6
file rename CCFrameBufferObject->CCFrameBuffer
2015-06-09 15:32:12 +08:00
562d4b9a78
fix on the windows.
2015-06-09 11:23:37 +08:00
9acab65e4f
rename FrameBufferObject->FrameBuffer
...
Move FrameBufferObject related class to experimental namespace
2015-06-09 10:59:43 +08:00
a67e570ef7
deleted more leftover comments, placed polygon test further down the tests
2015-06-08 15:40:18 +08:00
2650de030c
modified tests to show current epsilon
2015-06-08 15:08:16 +08:00
0808b6aff9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
cocos/2d/MarchingSquare.cpp
2015-06-08 13:59:26 +08:00
784f142f91
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
2015-06-08 11:06:02 +08:00
3e62dd0473
remove unused file and code.
2015-06-06 13:31:25 +08:00
56b7037c5f
optimize uislider memory usage
2015-06-05 17:16:10 +08:00
399ecfcb9f
Merge pull request #12176 from super626/fixphysics3d
...
rename syncToNode and syncToPhysics
2015-06-05 16:02:45 +08:00
6390f063fe
optimize UILoadingBar memory usage
2015-06-05 15:57:39 +08:00
d50c1823d4
merge cocos
2015-06-05 14:25:37 +08:00
a7141bab38
improve imageView memory usage
2015-06-05 14:19:05 +08:00
91ddb802e1
optimize ui::CheckBox memory consumption
2015-06-05 10:32:22 +08:00
5b572ab803
Polyinfo is no longer a pointer
2015-06-04 16:20:00 +08:00
0a51c9bd27
Finished AutoPolygon and Sprite
2015-06-04 15:43:31 +08:00
8d3d3a0348
1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.
2015-06-04 14:06:31 +08:00
8b5333a5c9
Merge branch 'newcode' into navigation2
2015-06-04 12:44:39 +08:00
73d815b0ab
rename syncToNode and syncToPhysics
2015-06-04 12:04:41 +08:00
ff81078062
fixes bug when calculating the dynamic values
2015-06-02 17:48:50 -07:00
6bcf325630
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:34 -04:00
fb10217e2b
[v3-update-sio] updates SocketIO tests and examples for using the SocketIO extension
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:33 -04:00
5f6f38616a
Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms
2015-06-02 17:05:05 -07:00
87a3a1844a
Adds support for Autobindings in Shader
...
...part of Material
2015-06-02 16:56:59 -07:00
3d4606921b
merge cocos
2015-06-02 14:27:31 +08:00
3c5326ba1f
removed spritePolygon, merge into sprite and draft of AutoPolygon
2015-06-02 10:10:09 +08:00
a0adf507c0
getTriangleList instead of load obj
2015-06-01 10:56:17 +08:00
494a7079d3
fixed test for Windows 10 CC_PLATFORM_WINRT
2015-05-29 09:35:53 -07:00
a16d51cad9
keyboard events now available in Windows Universal Apps
2015-05-29 08:15:04 -07:00
3d62805d04
Merge branch 'v3' into fix_spritepolygon
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/MarchingSquare.cpp
2015-05-29 18:10:41 +08:00
c782d63bef
add 3d navigation
2015-05-29 16:45:33 +08:00
8df4920f6e
fixed file name.
2015-05-29 15:03:36 +08:00
22ddf53539
Merge branch 'v3FrameBufferObject' into v3
2015-05-29 10:38:42 +08:00
df09bef567
use a different size to create fbo
2015-05-29 10:00:48 +08:00
2a71407501
fixed double to float conversion compiler warning
2015-05-28 15:00:49 -07:00
736de4e37c
fixed compiler warning for double to float conversion
2015-05-28 13:32:40 -07:00
7623ee390b
disable CURL and AssetsManager for Windows 10 UWP
2015-05-28 13:32:08 -07:00
727231a888
change test cases
2015-05-28 17:04:49 +08:00
847cba026c
added _flags to Action, change API to stopActionsByFlags
2015-05-28 09:52:49 +02:00
9ee4b4af1e
Merge branch 'v3' into v3-winrt-audio
2015-05-27 11:54:21 -07:00
74f0b3b436
add bmfont test
2015-05-27 16:58:52 +08:00
4cd5d479c0
Merge pull request #12028 from samuele3hu/v3_issue10302
...
issue #10302 : Remove duplicated test cases
2015-05-27 15:05:10 +08:00
4a1c5954a3
Merge pull request #12045 from andyque/v3
...
fix iOS 64bit implicit conversion error.
2015-05-27 15:04:41 +08:00
452248c0dd
fix iOS 64bit implicit conversion error.
2015-05-27 13:45:07 +08:00
fc8f556f98
Merge pull request #12027 from jianglong0156/modifyShaderSample
...
rename shader file name
2015-05-27 13:33:02 +08:00
471547e0b0
refactor FrameBufferObject to FrameBufferObject and RenderTarget
2015-05-27 11:40:12 +08:00
8105e9c714
Fix bug: terrain can't move to other position except origin point.
2015-05-26 17:51:26 +08:00
5b7cf14384
rename shader file name
2015-05-26 17:20:48 +08:00
ea75e222ba
issue #10302 : Remove duplicated test cases
2015-05-26 17:20:46 +08:00
c22a8e81ce
Merge branch 'v3' into v3FrameBufferObject
2015-05-25 16:56:22 +08:00
b2eb946c14
Added MP3 support
2015-05-23 19:13:12 -07:00
6d9f850e2c
use trianglescommand for sprite
2015-05-22 15:54:56 +08:00
d5d329b74f
Merge pull request #11946 from andyque/v3-final-android-9-patch-feature
...
add Android 9-patch image format support
2015-05-22 09:52:12 +08:00
10fb660fca
Merge pull request #11947 from dabingnn/v3_bugForCameraVisitingScene
...
add test case to reproduce the bug for visiting scene by multiple camera
2015-05-22 09:47:18 +08:00
7d0ca21167
use stringstream instead to to_string
2015-05-21 12:39:00 -07:00
8bb393f16f
use stringstream instead to to_string
2015-05-21 12:20:43 -07:00
52546112a5
added tests for saving cocos2d::Data buffers
2015-05-21 11:22:37 -07:00
2d147f0b97
[ci skip] and an empty line at the end of file
2015-05-21 17:12:35 +08:00
c202cad712
add test case to reproduce the bug for visiting scene by multiple camera
2015-05-21 16:57:13 +08:00
0352a7a3ea
add Android 9-patch image format support
...
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:16:09 2015 +0800
Add Android 9-patch format support.
Squashed commit of the following:
commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:08:05 2015 +0800
finish refactoring
commit 730bf817f833de56999c616779fc0279890e14bf
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 11:47:08 2015 +0800
refactoring 9-patch
commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 09:42:06 2015 +0800
refactor
commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 17:59:21 2015 +0800
fix lua and Android compile error
commit 2877538fb3a436f95400b2ad637ea147b9df81d7
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 11:32:43 2015 +0800
Add Android 9-patch image format support.
The 9-patch format is used for creating Scale9Sprite.
2015-05-21 16:04:37 +08:00
8432323450
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
2015-05-19 16:01:10 -07:00
aa027fbe0f
Properties fixes
...
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
2015-05-19 13:51:52 -07:00
514c8ae965
move sprite polygon logic to sprite polygon cache.
2015-05-19 11:25:53 +08:00
e0b3091dcf
Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio
...
Conflicts:
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-05-18 19:21:48 -07:00
f96e704f7d
Merge branch 'v3' into v3FrameBufferObject
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/cocos2d.h
cocos/renderer/CCGLProgramCache.cpp
2015-05-18 13:48:50 +08:00
8068a2c220
Merge pull request #11836 from dabingnn/v3_CameraMaskFor2DAnd3DRendering
...
V3 camera mask for2 d and3 d rendering
2015-05-18 13:32:26 +08:00
2db5a89b87
Added new audio engine with wav support
2015-05-15 18:17:52 -07:00
562c711cda
Update CocoStudioUIEditorTest for Lua and replace some deprecated functions.
2015-05-15 18:26:21 +08:00
c994f28914
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
2015-05-15 09:55:51 +08:00
973d169cd5
Merge pull request #11841 from xiaofeng11/v3
...
shorten csb file name in ccs-res
2015-05-15 09:33:31 +08:00
989848a358
fixes memory leak
...
improves performance a little bit
2015-05-14 17:24:27 -07:00
9f3284d62f
Merge pull request #11833 from super626/v3
...
getTriangleList to bundle and add terrain to 3d render queue
2015-05-14 18:16:27 +08:00
60190a1be6
changed csb names in ccs-res to shorter
2015-05-14 18:08:37 +08:00
8bdb8125a2
fix android compile error
2015-05-14 14:36:45 +08:00
84540c1ff4
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-14 11:55:10 +08:00
5b8b4fed50
multiply scale before construct physics
2015-05-14 10:44:08 +08:00
e6e0a1d15c
refactor: FrameBufferObject will contain an Texture2D instead of inheriting from Texture2D
2015-05-14 10:36:49 +08:00
e659373648
add getTriangleList to bundle
2015-05-14 10:30:20 +08:00
7732cd6e77
Merge pull request #11814 from super626/issue9767
...
add issue9767 test
2015-05-14 10:20:09 +08:00
3b60f67041
Merge pull request #11816 from fusijie/fix_spritepolygon
...
fix memory leakage.
2015-05-14 10:19:48 +08:00
fde5f8d63c
Adds better sample
...
adds clone support as well
2015-05-13 17:39:39 -07:00
e95de4de62
fixes mipmap issue with parsing Sampler
2015-05-13 10:24:32 -07:00
8311cf8920
Fix clearcolor overwrite bug
...
change test case for FrameBufferObject
2015-05-13 17:40:10 +08:00
c7acb9b83d
fix memory leakage.
2015-05-13 17:21:57 +08:00
6097b4ddd2
add clearAllFBOs function in FrameBufferObject
2015-05-13 17:17:54 +08:00
ec69a34c51
add issue9767 test
2015-05-13 16:16:45 +08:00
42514ee62f
FrameBufferObject works
2015-05-13 14:24:53 +08:00
c693573d77
more samples
...
and API fixes
2015-05-12 22:24:52 -07:00
a83c10fdbf
Merge pull request #11807 from ricardoquesada/material_vertexattrib
...
Adds support of VertexAttribBinding per Pass
2015-05-12 21:05:02 -07:00
d23ff0ea2c
Adds support of VertexAttribBinding per Pass
2015-05-12 19:58:09 -07:00
a587b28e38
Merge pull request #11792 from super626/v3
...
particle3d can not be seen when added to scene with terrain
2015-05-13 09:38:21 +08:00
9a479b59f8
Merge pull request #11800 from WenhaiLin/v3-pt-sprite
...
Fix the performance test of sprite
2015-05-13 09:37:27 +08:00
7af99d1991
Fix the performance test of sprite
2015-05-12 17:59:22 +08:00
1937431596
Material uses new file format
...
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
2015-05-11 21:31:33 -07:00
4d71175318
resove conflict
2015-05-12 12:12:29 +08:00
35940ba8ef
Merge branch 'v3_addClearforCamera' of github.com:dabingnn/cocos2d-x into v3_addClearforCamera
2015-05-12 10:08:12 +08:00
cc0b3ffd2e
Merge branch 'v3' into v3_addClearforCamera
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-12 09:49:15 +08:00
b5d932668c
Merge pull request #11778 from WenhaiLin/v3-per-test
...
Put back the test cases of performance.
2015-05-11 18:16:37 +08:00
1e1d14ec40
Remove unused variable.
2015-05-11 17:33:27 +08:00
22d04c7c39
Put back the test cases of performance.
2015-05-11 16:26:14 +08:00
761da2fd20
Scene3DTest ok.
2015-05-11 14:41:50 +08:00
f25c02f230
fix bugs of terrain
2015-05-11 12:02:32 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
3bf16dcc4d
Add skybox and partile 3d in Scene3DTest.
2015-05-08 18:28:12 +08:00
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
966f3b6a3f
Add terrain in Scene3DTest.
2015-05-08 11:46:27 +08:00
60aa223065
Add dialog in Scene3DTest.
2015-05-07 18:43:07 +08:00
1daca7fac9
Merge bug fix code.
2015-05-07 16:52:37 +08:00
a8f0ad9d68
Add Scene3DTest.
2015-05-07 16:22:30 +08:00
03bdb7055a
Fixed typo
2015-05-07 11:48:55 +08:00
fb112995d8
Merge pull request #11491 from milos1290/tween
...
Adding FloatAction to animate any property over time.
2015-05-07 09:34:44 +08:00
ba1e77d656
Merge pull request #11720 from WenhaiLin/v3-label-outline
...
Label:Fixed outline doesn't match with the characters exactly.
2015-05-07 09:30:37 +08:00
b1803d40db
Label:Fixed outline doesn't match with the characters exactly.
2015-05-06 17:17:30 +08:00
fe59b093b5
adds love to header files
2015-05-05 21:48:05 -07:00
074b335d83
Merge pull request #11711 from super626/texturecube
...
Make the skybox seamless
2015-05-06 10:17:40 +08:00
26bca75e0e
Merge pull request #11708 from ricardoquesada/no_exceptions
...
No throws in cocos2d-x code
2015-05-05 17:57:28 -07:00
10b71464a7
No throws in cocos2d-x code
2015-05-05 17:17:41 -07:00
90c9dffc1a
cleanup Material Code
...
- removes unused code
- removes experimental code
2015-05-05 15:59:41 -07:00
ce95bfe059
Squashed commit of the following:
...
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:46:57 2015 -0700
compiles on win32
commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:01:04 2015 -0700
compiles on windows!
commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 10:20:13 2015 -0700
windows fix
CALLBACK is defined in windows. Use CALLBACK_FN instead
commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466254a4b05671818b9a994fbd5f4e02199bf1cf177bbca1a95f0287b42fd3e38b425b2b65d5fa3dd54ddbdbc345548a160d7b409f20967f35a09c50c464c45fab648d1f0779d05
2015-05-05 13:07:32 -07:00
902c033838
Merge pull request #11683 from WenhaiLin/v3-label-i10576
...
Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.
2015-05-05 18:19:33 +08:00
701d5fa827
Merge pull request #11673 from vovkasm/dev/v3-cleanup
...
Fix warnings in v3.
2015-05-05 11:26:10 +08:00
a103d792f3
modify the texture.repeatParam to clamp to avoid warping artifacts of skybox
2015-05-04 17:43:42 +08:00
ed4c638663
Add test case for issue#10576
2015-05-04 10:09:14 +08:00
62cad07a81
Fix couple of unused entities in cpp-tests
2015-05-01 12:24:04 +03:00
0aecc15a25
Correct field initialization order in various places (Xcode warnings)
2015-05-01 12:19:30 +03:00
0e1338f6f8
Add test case for issue#10773
2015-04-30 16:11:59 +08:00
ce7e36f76e
Fixed warns and crash on Win32.
2015-04-28 20:10:56 +08:00
0343fd4061
Changing the name of the Action, adding more comments
2015-04-28 11:48:19 +02:00
2b245e0318
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
2015-04-28 15:19:52 +08:00
9d46c5413d
added performance test for SpritePolygon
2015-04-28 15:18:40 +08:00
7ddbc59c95
Merge pull request #11622 from MSOpenTech/v3.6-winrt-fix
...
Use TextBMFont when text is updated from slider for faster performance
2015-04-28 11:55:33 +08:00
4d7e6567ea
Use TextBMFont when text is updated from slider for faster performance
2015-04-27 19:48:15 -07:00
1ac0c8c0b1
Merge pull request #11616 from WenhaiLin/v3.6
...
TransitionsTests:Fixed Transition not work when switch between test cases
2015-04-28 09:35:45 +08:00
597d2289c0
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
2015-04-27 17:31:50 +08:00
a046f74c4d
fix anchor point bug
2015-04-27 17:30:38 +08:00
70a641e2b3
TransitionsTests:Fixed Transition not work when switch between test cases.
2015-04-27 17:22:20 +08:00
c9bacd58e8
Merge pull request #11591 from Wu-Hao/v3.6
...
V3.6
2015-04-27 14:22:21 +08:00
9f2ea5fbb9
fixed some SpritePolygon create, added more tests
2015-04-27 13:34:47 +08:00
0a8f533e80
Merge pull request #11590 from super626/v3
...
Animate3D Quality control
2015-04-27 10:58:10 +08:00
c1d10ffa1c
fixed poly2tri creation method, added testCase
2015-04-24 18:28:28 +08:00
5620da1adf
fixed anchor point issue, removed rect rotated property
2015-04-24 18:17:12 +08:00
0e318dd8dc
fixed UV issue, also taking account of contentScaleFactor, made test case better
2015-04-24 17:39:43 +08:00
59dc646c17
modify test
2015-04-24 14:12:24 +08:00
8e51a561b1
modify some about animate3D quality!
2015-04-24 11:49:28 +08:00
07349ff588
initial cpp test
2015-04-23 18:03:03 +08:00
8d9064b4e4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
...
Conflicts:
tests/cpp-tests/Classes/AppDelegate.cpp
2015-04-22 10:31:39 +08:00
47e2698986
Fix the cocos3.6beta0 bugs
2015-04-22 10:20:21 +08:00
6c7ecf0b18
removed CC_PLATFORM_WINRT messagebox code
2015-04-20 10:32:11 -07:00
aae82c24f9
removed CC_PLATFORM_WP8
2015-04-19 16:28:54 -07:00
a13c519882
Adding FloatAction to animate any property over time.
2015-04-18 14:35:14 +02:00
3c7d5afce2
Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix
...
Fix crash when play streamed MP4 file.
2015-04-16 18:16:28 +08:00
fc75f46abb
Fix crash when play streamed MP4 file.
2015-04-16 16:27:09 +08:00
8a9f420735
fix side effect of ui::button clone
2015-04-16 14:38:00 +08:00
zilongshanren