Commit Graph

34361 Commits

Author SHA1 Message Date
Mikhail Shulepov ec664bc08b Added aliases for PixelFormat names 2016-02-12 17:25:11 +03:00
Mikhail Shulepov 112fceae81 Texture2D: RGB888 -> A8 conversion (white - full opacity, black - full transparency) 2016-02-12 17:23:56 +03:00
Zen 07051a0357 Let ScrollView swallow touch events by default. 2016-02-12 21:21:57 +08:00
zilongshanren eb55a0e603 Merge pull request #15041 from CocosRobot/update_lua_bindings_1455197914
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-11 21:44:10 +08:00
CocosRobot 89c0c801b0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-11 13:40:35 +00:00
zilongshanren 04d125b0dd Merge pull request #15040 from CocosRobot/update_cocosfiles_1455197769
[AUTO][ci skip]: updating cocos2dx_files.json
2016-02-11 21:40:24 +08:00
CocosRobot 5d1cc4aad2 [AUTO][ci skip]: updating cocos2dx_files.json 2016-02-11 13:36:10 +00:00
zilongshanren 4db0d2c47a Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
add Mac Editbox multiline  support.
2016-02-11 21:33:56 +08:00
Mikhail Shulepov 19e2434326 Scale9Sprite: allow to set custom GLProgram 2016-02-11 16:18:41 +03:00
Mikhail Shulepov 8ad49c1bbc SpriteFrameCache: take pixelFormat into account if specified 2016-02-11 15:47:23 +03:00
Ricardo Quesada 576458f4bd Merge pull request #15027 from ricardoquesada/renderer_merge_tri_quad_squashed
Renderer improvments: TriangleCommand and QuadCommand merged
2016-02-08 13:39:51 -08:00
Ricardo Quesada b3385823b3 Merge pull request #15025 from mogemimi/add-override-keywords
Add missing 'override' keywords
2016-02-08 11:26:53 -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
mogemimi bf1b9df495 Add missing 'override' keywords 2016-02-08 17:22:17 +09:00
pandamicro c03d2c57d7 Made console.log writable 2016-02-05 15:13:07 +08:00
zilongshanren de62924e60 Merge pull request #15018 from zilongshanren/tweakPageViewTurningEvent
tweak PageView page turning event time.
2016-02-04 17:12:49 +08:00
zilongshanren 417b2eba7c Merge pull request #15015 from mogemimi/remove-c-str-calls
Remove unnecessary c_str() calls
2016-02-04 16:18:14 +08:00
zilongshanren 805be977fe tweak PageView page turning event time. 2016-02-04 15:57:32 +08:00
zilongshanren 35b0112290 fix linux compile issue 2016-02-04 15:30:16 +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
mogemimi 44d2a161dc Remove unnecessary c_str() calls 2016-02-04 11:52:14 +09:00
Wenhai Lin 691e0d73f9 Merge pull request #15014 from WenhaiLin/v3-0203
Avoid creating temporary string objects
2016-02-03 23:46:45 +08:00
Wenhai Lin 4992037c5c Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
zilongshanren d8a4dc7cb0 Merge pull request #15011 from CocosRobot/update_lua_bindings_1454492874
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-03 18:01:39 +08:00
CocosRobot 330751a150 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-03 09:50:03 +00:00
zilongshanren 4f388d769a Merge pull request #15002 from WenhaiLin/v3-TargetedAction-donefix
Fixed TargetedAction::isDone always return false!
2016-02-03 17:44:26 +08:00
pandamicro 72be9a3966 Fix other issues 2016-02-02 23:39:18 +08:00
pandamicro 3c550853bc Fix restart game issue and windows crash issue 2016-02-02 23:38:37 +08:00
zilongshanren 7a9e0e7b71 Merge pull request #15003 from WenhaiLin/v3-0202-labelfix
Label:Fixed characters are displayed incorrectly with some specific font.
2016-02-02 17:56:43 +08:00
pandamicro 08056b7b02 Fix debugger issue 2016-02-02 16:45:17 +08:00
pandamicro fefd05e54d Fix Menu event get released issue 2016-02-02 16:44:32 +08:00
Wenhai Lin bae36b7a98 Label:Fixed characters are displayed incorrectly with some specific font. 2016-02-02 11:16:36 +08:00
Wenhai Lin eba594bb41 Fixed TargetedAction::isDone always return false! 2016-02-02 11:07:38 +08:00
zilongshanren 30a7141ea0 Merge pull request #14997 from CocosRobot/update_lua_bindings_1454308300
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-01 14:36:51 +08:00
CocosRobot 4ab9ffff4f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-01 06:34:11 +00:00
zilongshanren 2144c7a0e5 Merge pull request #14974 from mogemimi/fix-xcode-settings
Fix warnings when building projects for iOS and tvOS
2016-02-01 14:29:06 +08:00
zilongshanren 36668071bb Merge pull request #14986 from GuoLunHao/v3_version
update cocos2d-x's version to 3.11
2016-02-01 14:28:14 +08:00
zilongshanren ee31d2ad22 Merge pull request #14940 from mxenabled/stop_auto_scroll
Add ability to stop auto scrolling in ui::ScrollView and extension::ScrollView
2016-02-01 14:27:55 +08:00
lunhao.guo b2e5e480fe update cocos2d-x's version to 3.11 2016-01-29 14:49:05 +08:00
mogemimi 4ac4f1a5c7 Fix warnings when building projects for iOS and tvOS 2016-01-29 08:07:17 +09:00
zilongshanren ad756cf6bb Merge pull request #14983 from CocosRobot/update_lua_bindings_1453953583
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-28 13:31:43 +08:00
CocosRobot 346144742f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-28 04:01:53 +00:00
zilongshanren 41edaa8b32 Merge pull request #14975 from greekman99/master
Fixed subtle documentation issues
2016-01-28 11:55:56 +08:00
minggo e246390c42 Merge pull request #14978 from xpol/const-ref-args-for-file-utils-write-methods
Small refactor FileUtils.
2016-01-28 10:36:31 +08:00
pandamicro 01f41921d1 Fix enableDebugger issue 2016-01-28 01:55:10 +08:00
pandamicro e2568b3a6f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
Conflicts:
	tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
pandamicro de9b51c0cf Fix other GC issues 2016-01-28 01:03:50 +08:00
pandamicro 554523a201 Use JS::Heap instead of Mozilla::maybe to improve stability 2016-01-28 01:03:13 +08:00
zilongshanren b0d0a7a064 Merge pull request #14964 from zilongshanren/fix14909
fix pageview page turning event issue
2016-01-27 20:53:48 +08:00
zilongshanren 366407ca1c fix win32 compile issue 2016-01-27 20:21:32 +08:00