Commit Graph

1929 Commits

Author SHA1 Message Date
肖峰 6b4a0f808f Add cocostudio localization editor export data parser and demo 2016-02-26 17:15:24 +08:00
zilongshanren 92dca220ce improve mac editbox 2016-02-25 11:05:18 +08:00
zilongshanren 4db0d2c47a Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
add Mac Editbox multiline  support.
2016-02-11 21:33:56 +08:00
Ricardo Quesada 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
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 4 14:08:49 2016 -0800

        Merge branch 'v3' into uniform_matrix_auto

    commit d6c37297954af752ebf42ec5f71e5e2fe28c9cc2
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 4 13:54:07 2016 -0800

        works ok...

    commit 45c288631989ea735cc31ec5aa683d9d41aacab3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 4 12:58:34 2016 -0800

        quad works!

    commit 7137cff51df09adee7129738cea2b69da090756e
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Feb 3 16:19:34 2016 -0800

        more optimizations... WIP... doesn't work yet

    commit a8324c1a9acb6b82102e05eee6e5e5f341306c7b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 2 21:59:42 2016 -0800

        compiles in release mode

        more tests... better threshold

    commit 884ffc756e7520fcbb9252260181538ec81b8368
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 2 17:21:32 2016 -0800

        initial uniform_auto_matrix commit

        Changes the CC_matrix uniform in runtime depending on whether the command can be batched or not.

        Lot of things missing, though... like performance tests.
2016-02-08 11:25:37 -08:00
zilongshanren 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
zilongshanren 74e7bd2083 fix win32 compile error 2016-01-26 09:52:53 +08:00
Ricardo Quesada 25f78e490d RichText with word wrapping working as expected 2016-01-21 21:44:45 -08:00
zilongshanren 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
geron-cn 87434e2774 add scrollview bar parse for cocostudio in reader 2016-01-20 21:13:59 +08:00
Ricardo Quesada e36d71a24c adds Invalid test
UIRichText reports error on console when parsing invalid xml
2016-01-19 21:16:53 -08:00
Ricardo Quesada 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
James Chen 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
XiaoFeng 0f3cb16efd Fix when add two ActionTimeLine object in one node, play state is wrong 2016-01-14 16:16:37 +08:00
xiaofeng11 be6f9c0f03 Merge pull request #14882 from geron-cn/playableframe
add PlayableFrame
2016-01-14 09:42:17 +08:00
Ricardo Quesada 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
geron-cn eab1de0f1e format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885 2016-01-13 16:34:04 +08:00
geron-cn e3c50caf11 add test case for PlayableFrame 2016-01-13 15:25:31 +08:00
zilongshanren e1d0d7f722 Merge pull request #14854 from zilongshanren/fixScale9GrayShader
fix scale9sprite gray state opacity issue.
2016-01-12 11:50:41 +08:00
zilongshanren 161be986af Merge pull request #14340 from fnz/easyjni
easy jni
2016-01-12 11:50:16 +08:00
XiaoFeng 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
zilongshanren 7d943f200f fix scale9sprite gray state opacity issue.
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 17:17:55 +08:00
zilongshanren 2797277de8 Revert "fix scale9sprite gray state opacity issue." 2016-01-07 17:07:27 +08:00
zilongshanren 1910f79b2f fix scale9sprite gray state opacity issue.
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 15:26:14 +08:00
zilongshanren 81428737c9 fix compilation errors 2016-01-05 09:51:37 +08:00
Wenhai Lin 168e851cce Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android. 2015-12-31 10:42:06 +08:00
Ricardo Quesada 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
Ricardo Quesada 707f08c557 Revert "fix setflip for batch sprite" 2015-12-23 09:54:04 -08:00
Ricardo Quesada 0d0534a2e1 Merge pull request #14697 from super626/v3.10-fixsprite
fix setflip for batch sprite
2015-12-23 09:53:24 -08:00
zilongshanren 830eb3433f Merge pull request #14786 from liamcindy/v3_ui_widget
fix uiWidget clipping error with Node
2015-12-23 18:57:15 +08:00
Liam bcc2ed0e2a update for scrollView test 2015-12-23 18:14:09 +08:00
mogemimi b0c4adcbd0 Fix method name spelling in AutoPolygon 2015-12-23 19:07:03 +09:00
XiaoFeng 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
zilongshanren 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
yangxiao 09c139039f add tmx with flipped spritebatch test 2015-12-21 10:00:15 +08:00
pandamicro 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
Sergey a342866083 Test for WebP with & without alpha 2015-12-20 14:22:04 +03:00
Liam 8bf7908e93 fix loadingbar direction changed error 2015-12-19 15:59:27 +08:00
zilongshanren 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
XiaoYang 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
Ricardo Quesada 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
Liam fb312a761c update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00
Sergey 714c01991e Scale9Sprite test improvemets 2015-12-18 01:38:53 +03:00
Sergey 98fe1d46cc Scale9Sprite now fully support cropped sprite frames in both mode simple & slice 2015-12-18 00:32:59 +03:00
pandamicro b079705dcd Merge pull request #14702 from pandamicro/v3.10
Fix Downloader callback bug on iOS9
2015-12-17 01:05:10 +08:00
zilongshanren 2881ce7c40 Merge pull request #14632 from liamcindy/UITest
update for ui resource test
2015-12-16 18:18:35 +08:00
pandamicro 7303895866 Improve error message for Downloader and add test case 2015-12-16 15:43:18 +08:00
Wenhai Lin b91882f150 Fixed label's letter can't be hide by `setVisible(false)`. 2015-12-16 14:59:33 +08:00
yangxiao 5e61e37d80 fix crash when shader can not compile 2015-12-16 13:54:43 +08:00
Joachim Grill 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
Joachim Grill 4dd3595b1e added test with plist file containing anchor points 2015-12-14 16:17:41 +01:00