Commit Graph

34402 Commits

Author SHA1 Message Date
zilongshanren 6781c96fe0 Merge pull request #14661 from zilongshanren/v3.10
fix scale9sprite global zorder issue.
2015-12-14 13:56:29 +08:00
pandamicro 662c7fbec5 Made API consistent with old version 2015-12-14 13:55:17 +08:00
pandamicro cbce4d37c3 Merge pull request #14671 from ricardoquesada/more_js_fixes
More js fixes
2015-12-14 13:41:59 +08:00
zilongshanren 96db089b64 Merge pull request #14665 from zilongshanren/fixMemoryLeak
fix memory leaks of stencileStateManager
2015-12-14 13:34:17 +08:00
pandamicro 330b588215 Fix evalString doesn't return result issue 2015-12-14 13:13:54 +08:00
pandamicro 41218a65e7 Merge pull request #14668 from pandamicro/v3
Sync v3 and Fix win32 js project crash issue
2015-12-14 13:12:42 +08:00
zilongshanren 838bd242ce fix #12249 2015-12-14 11:53:09 +08:00
zhangcheng 436db6e932 Fix #24347
JSTest(web)-->UI Test-->UIFocus-->UIFocusTestVertical displays focus first.
2015-12-14 11:20:26 +08:00
zilongshanren 3e64e09e69 fix memory leaks of stencileStateManager 2015-12-14 10:40:09 +08:00
xiaofeng11 1c53920a13 Merge pull request #14660 from chengstory/#24345
Fix #24345
2015-12-14 10:38:13 +08:00
XiaoFeng 4815ec8b9a Update version number to v3.10 2015-12-14 10:32:29 +08:00
pandamicro 445442c964 Upgrade spider monkey to solve win32 js project crash issue 2015-12-14 10:27:11 +08:00
zilongshanren 0f5aac5754 fix typo 2015-12-14 10:14:39 +08:00
zilongshanren 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
XiaoYang d904246aa8 Merge pull request #14613 from super626/v3
fix 3d model bug
2015-12-14 10:04:25 +08:00
Elviss Strazdins fc84306bcb Always update design resolution 2015-12-14 01:20:38 +02:00
Elviss Strazdins 4b33d730de Calculate frame size with zoom factor 2015-12-14 00:53:46 +02:00
Elviss Strazdins 718422c1d9 Set frame size on window resize 2015-12-14 00:20:29 +02:00
zilongshanren b87e638f26 Merge pull request #14656 from zilongshanren/v3.10
fix bmfont size initialize error
2015-12-13 22:22:05 +08:00
zilongshanren b1d700ad33 fix bmfont size error 2015-12-13 13:59:42 +08:00
pandamicro 1935e2a89b Merge pull request #14655 from CocosRobot/update_lua_bindings_1449976044
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-13 11:12:35 +08:00
CocosRobot 0473dd88fc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-13 03:12:14 +00:00
pandamicro a80ca25d63 Merge pull request #14576 from mogemimi/fix-deprecation-warns-particle3d
Fix deprecation warnings in PU
2015-12-13 11:09:47 +08:00
pandamicro 2f4867c2af Merge pull request #14415 from mogemimi/fix-mismatch-include-guards
Fix inconsistent header include guards
2015-12-13 11:04:18 +08:00
pandamicro 07077f5c36 Merge pull request #14650 from mogemimi/fix-typo-extensions
Fix typos in documentation and comments
2015-12-13 11:03:24 +08:00
pandamicro 2ef0197534 Merge pull request #14643 from GuoLunHao/v3.10
fix compile error and link error on ios/Mac platform
2015-12-12 23:46:32 +08:00
pandamicro ee75603e74 Merge pull request #14642 from GuoLunHao/v3.10_setup
add quiet option for Cocos Toolkit
2015-12-12 23:45:21 +08:00
mogemimi 07673f71cd Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
mogemimi 8df13ad6f9 Replace non-ASCII characters in comments 2015-12-12 21:04:23 +09:00
mogemimi d27f50aaf2 Fix typos in documentation and comments 2015-12-12 21:04:22 +09:00
mogemimi 3bb9a37393 Fix deprecation warnings in PU 2015-12-12 17:50:32 +09:00
Ricardo Quesada c5058aa2f9 more conversions 2015-12-11 17:18:20 -08:00
Ricardo Quesada 47911e0c24 more js fixes
fixes in how ref count is measured
opengl bindings converted to new API
2015-12-11 15:18:09 -08:00
Ricardo Quesada 7e72a7110c Merge pull request #14651 from CocosRobot/update_lua_bindings_1449856025
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-11 09:56:08 -08:00
CocosRobot 71f9ead981 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-11 17:52:29 +00:00
Ricardo Quesada 8878992a79 Merge pull request #14645 from ricardoquesada/js_fixes
Squashed commit of the following:
2015-12-11 09:42:53 -08:00
Ricardo Quesada fd321530e5 restores autobindings 2015-12-11 08:59:35 -08:00
xiaofeng11 08c98a2f63 Merge pull request #14648 from xiaofeng11/v3.10
Synchronize js parsers modification from html5 version
2015-12-11 19:25:24 +08:00
XiaoFeng 49d03d9de1 Synchronize js parsers modification from html5 version 2015-12-11 18:22:02 +08:00
Ricardo Quesada 8b2dfb1a4b Mooooores fixes
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
2015-12-10 22:15:44 -08:00
zilongshanren a9f404c200 Update CHANGELOG 2015-12-11 13:56:29 +08:00
zilongshanren d75767bfc4 Merge pull request #14639 from liamcindy/v3_ui_text
update for text effect clone
2015-12-11 13:54:46 +08:00
Liam 4c5c6e6d9b update for code format 2015-12-11 12:04:54 +08:00
Liam f877f26bd2 update for controlButton 2015-12-11 11:56:58 +08:00
zilongshanren 6f3721a68c Merge pull request #14638 from liamcindy/v3_ui_scrollView
fix scrollview render error
2015-12-11 10:55:17 +08:00
Ricardo Quesada c034303ad8 Adds MemoryModelTest 2015-12-10 18:22:10 -08:00
Ricardo Quesada 96d391ea30 Squashed commit of the following:
commit aff4e27200a77db60b13ea30c2457558e5f53059
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 17:58:41 2015 -0800

    compiles with new GC model

commit 1fa69cd71231d56371cd45a378e50a1888308b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 17:41:15 2015 -0800

    Animation3D works Ok

commit d439969caf7e6fe83a74e37d078c4361a08cb816
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 13:39:50 2015 -0800

    Sprite3d create: converted to new API

commit aabe449e4a968fad882c44df9be787eb7c3bfcec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 13:27:33 2015 -0800

    ouch...

commit 688ab610a8cb7607bc3c51b8ca01d800ef3c9794
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Dec 10 13:12:25 2015 -0800

    Spawn/Sequence init* were not bound

    Fixed. Now JS Scheduler Test works Ok
2015-12-10 18:02:55 -08:00
Ricardo Quesada 2420c942c3 Merge pull request #14617 from chengstory/#24345
Fix #24345
2015-12-10 09:19:30 -08:00
lunhao.guo fe5314d927 add quiet option for Cocos Toolkit 2015-12-10 17:20:43 +08:00
GuoLunHao 5872745593 fix compile error and link error on ios/Mac platform 2015-12-10 16:43:01 +08:00