bfb97739e2
Detect Apple platforms correctly.
2016-03-16 13:15:41 +08:00
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
8541dead20
Cursor support for text field
2016-03-14 18:09:04 +03:00
980d5fec68
GLProgram for ImageView
2016-03-14 17:05:39 +03:00
0d67d5d533
fix unneeded define that breaks some libraries to build on windows
2016-03-14 16:58:01 +03:00
b7779180b1
fix annoying "callBackName cannot be found" log
2016-03-14 12:11:23 +02:00
98cbc6c359
remove unnecessary scope operator
2016-03-14 18:33:58 +09:00
06ac05259b
More fix to compile libjscocos2dx as dll under win32
2016-03-14 12:06:14 +08:00
5c1a272178
Remove comment // S_FALSE is succeeded
2016-03-13 19:30:13 +03:00
4769890d4e
Fix calculation of outLength
...
The order of integer arithmetic is important, the original code fail to
calculate the length correctly, e.g. inLength 20 for base64Encode should
output 28, not 30. It is fixed and simplified with this commit.
2016-03-12 15:42:52 +08:00
16edf90f70
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-11 14:40:00 +00:00
1409adc07a
Merge pull request #15205 from mogemimi/fix-mojibake-and-typo
...
Fix typos in the documentation
2016-03-11 22:33:31 +08:00
5a3a4c356f
Merge pull request #15195 from perminovVS/textfiled-support-cursor-v1.2
...
Textfiled support cursor v1.2
2016-03-11 22:32:55 +08:00
fa7d9c7163
Remarks zilongshanren
...
Copy constructor remove from StringUTF8
StringUTF8::set change to StringUTF8::replace
TextFieldTTF::setCursorUse change to TextFieldTTF::setCursorEnabled
TextFieldTTF::_cursorUsechange to TextFieldTTF::_cursorEnabled
2016-03-11 15:09:50 +03:00
0424ab2db5
Merge pull request #15222 from xiaofeng11/v3_depsUpdate
...
update deps
2016-03-11 16:20:09 +08:00
3acea03924
Update deps lib and chipmunk manual binding to support both libcocos2dx and libjscocos2dx compiled as dll file under win32 system
2016-03-11 15:44:28 +08:00
7b338c2f4c
Merge pull request #15223 from geron-cn/v3bugfixs
...
fix bug: eventframe can be enter one time when event time has a single frame.
It's OK, merged
2016-03-11 13:34:21 +08:00
b3ee96ebd2
fix bug: https://github.com/cocos2d/cocos2d-x/issues/15084
2016-03-11 12:56:58 +08:00
9477bfd801
Merge pull request #15135 from dumganhar/ws-close-fix
...
Closes websocket connection by dispatching a 'resetDirector' event.
2016-03-10 17:39:47 -08:00
582835b670
Fix typos in the documentation
2016-03-11 00:34:32 +09:00
7824acc34e
fix scrollview bugs:
...
- fix bar's position not right after size changed
- fix bar setAutoHideEnabled some time not right
2016-03-10 18:06:20 +08:00
0bd9d1638d
Squashed commit of the following:
...
commit 976d28b4d1c71576799ecd4d7cc51e39f3d15b2d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 9 18:58:17 2016 +0800
avoid warning
commit 1c0ad1a56262bdb37f76badc7b40925e413999f3
Merge: 4604c47 b9b3049f2c9994b5a44bc46f2e8ca6b02fc
2016-03-09 19:08:18 +08:00
b9b3049acb
Merge pull request #15213 from FrostPolaris/v3
...
Fix the bug that TextField may be set with a multi-line localized text.
It's OK, merged.
2016-03-09 18:34:03 +08:00
849a2ee544
Merge pull request #15215 from minggo/firefox-remote-debug
...
[ci skip]fix a bug that will miss packets
2016-03-09 16:59:03 +08:00
e44f4d8d61
fix a typo
2016-03-09 16:07:57 +08:00
8079c55d88
fix bug that will lost incoming packets
2016-03-09 16:03:55 +08:00
8f9233be00
Fix the bug that TextField may be set with a multi-line localized text.
2016-03-09 09:31:34 +08:00
7011c3a7e4
GLProgram replaceDefines correct and other feature
2016-03-07 17:05:20 +03:00
3e16236a95
WICImageLoader incorrect use S_FALSE constant
2016-03-07 15:48:49 +03:00
8c8c741213
Wrong log message if use tga image
2016-03-07 15:41:20 +03:00
2a201a5c4e
WinRT support key repeat and implement dispatchControlKey
2016-03-07 14:43:44 +03:00
8eec628e04
Desktop implement dispatchControlKey
...
And fix bag control char for OSX onGLFWCharCallback
glow send on CharCallback character control key unicode.
2016-03-07 14:33:59 +03:00
6bc36912ae
TextFieldTTF support cursor
...
If TextField active(focused input text) show text cursor( default '|',
change TextFieldTTF::setCursorChar ).
Show/Hide interval CURSOR_TIME_SHOW_HIDE
Change position text cursor control key: KEY_HOME, KEY_END,
KEY_LEFT_ARROW, KEY_RIGHT_ARROW
CC_PLATFORM_MAC, CC_PLATFORM_WIN32, CC_PLATFORM_LINUX default use
cursor( For change state TextFieldTTF::setCursorUse )
Text cursor worked only on LabelType::TTF
2016-03-07 14:22:03 +03:00
b3b047e9ad
Label '\b' - Next char not change x position
...
Add TextFormatter for easy use '\n', '\r', '\b'
2016-03-07 14:07:36 +03:00
f2a5a5ef6b
StringUTF8 - Utf8 sequence
...
Store each utf8 chars as std::string, for easily manipulated
2016-03-07 13:59:53 +03:00
21cd5d08f7
Merge pull request #15177 from ricardoquesada/cmake_fixes
...
"cocos new" fixes for cmake
2016-03-04 12:38:13 -08:00
6a31f43a27
compiles on Mac. adds missing libs and files
2016-03-04 10:47:19 -08:00
e31c918264
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-04 08:14:39 +00:00
7c56f0bc2c
Merge pull request #15181 from geron-cn/uitabcontrol
...
add tab control to js/lua binding generate
2016-03-04 16:08:04 +08:00
9ba5dffb4c
add tab control to js/lua binding generate
2016-03-04 13:35:41 +08:00
e46e392ff5
Merge pull request #15175 from FrostPolaris/v3_localizeManage
...
Add language localization support for Button, Text, TextField and TextBMFont.
It's OK, merged
2016-03-04 11:43:47 +08:00
e6d2bfd014
Merge pull request #15145 from grwhitehead/fontatlas_fix
...
three related bug fixes in FontAtlas::prepareLetterDefinitions
2016-03-04 11:36:36 +08:00
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
b5a44bc2f4
Merge pull request #15170 from geron-cn/uitabcontrol
...
add TabControl TabHeader to tolua
2016-03-04 10:26:06 +08:00
46f2e8c8b6
rename deactiveTabItem
2016-03-03 18:09:07 +08:00
a6b02fcc5b
Merge pull request #15168 from CocosRobot/update_lua_bindings_1456991724
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-03 16:01:27 +08:00
169a81c6ea
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-03 07:57:25 +00:00
93b7e4396b
Merge pull request #15150 from mogemimi/fix-incorrect-header-include
...
Fix compile error on case-sensitive filesystems
2016-03-03 15:53:38 +08:00
e2d31c1c63
Merge pull request #15157 from mogemimi/fix-block-comment
...
Fix compiler warning: "/* within block comment"
2016-03-03 15:53:22 +08:00
0489fd76e8
1.Change the interface in LocalizationManager.
...
2.Add new args of localization in simulator.
2016-03-03 15:49:50 +08:00
18a419a732
Merge pull request #15153 from minggo/firefox-remote-debug
...
[ci skip]add a function to get object name
2016-03-03 15:23:49 +08:00
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed6bf55ed
2016-03-03 14:17:48 +08:00
3a87ee46c6
Fix compiler warning: "/* within block comment"
2016-03-03 10:44:51 +09:00
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
2016-03-02 16:51:54 -08:00
f8580959f8
add a function to get object name
2016-03-02 15:51:29 +08:00
11f3f95a2c
Fix compile error on case-sensitive filesystems
2016-03-02 15:47:42 +09:00
859aadd5e9
Revert "[ci skip][AUTO]: updating luabinding & jsbinding automatically"
2016-03-02 14:10:40 +08:00
6e0887b2c9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-02 03:38:29 +00:00
dbfb4c793c
Merge pull request #15132 from mogemimi/remove-const-from-return
...
Remove unnecessary const from return types
2016-03-02 11:31:56 +08:00
1420ea2cbc
three related bug fixes in FontAtlas::prepareLetterDefinitions
2016-03-01 16:06:45 -08:00
4e4558e509
Modify the interface of localization manager.
2016-03-01 14:27:12 +08:00
4dcbf4c263
Merge pull request #15133 from cocos2d/walzer-patch-1
...
Fix typos in CCRenderTexture.cpp comments
2016-03-01 09:30:07 +08:00
56fa8fa759
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-03-01 00:27:33 +00:00
5c8d35e484
removes dead code
2016-02-29 14:02:21 -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
48e7d70d9d
Removes unused include in CCDirector.cpp
2016-02-29 18:58:17 +08:00
037051d9c4
Closes websocket connection by dispatching a 'resetDirector' event.
2016-02-29 18:55:51 +08:00
fe917e00fc
Add language localization support for Button, Text, TextField and TextBMFont.
2016-02-29 18:00:14 +08:00
1fbef195a3
Fix typos in CCRenderTexture.cpp commnets
...
Qualcomm Andreno GPU -> Adreno GPU
2016-02-29 16:22:56 +08:00
2a8d84e7f9
Remove unnecessary const from return types
2016-02-29 16:48:07 +09:00
6b4a0f808f
Add cocostudio localization editor export data parser and demo
2016-02-26 17:15:24 +08:00
78c99e33e9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-26 02:11:26 +00:00
5de611b4b5
Fix typo of function name in AsyncTaskPool
2016-02-26 00:22:46 +09:00
e991282ed8
Merge pull request #15109 from dongtaohan/v3
...
exported api for Cocos Studio.
2016-02-25 14:35:57 +08:00
9a11556f4b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-25 06:01:49 +00:00
c3eeb7c6b9
Merge pull request #15113 from zilongshanren/improve-node-api-docs
...
improve the api doc for node.
2016-02-25 13:56:23 +08:00
c56835d743
improve the api doc for node.
...
fixes https://github.com/cocos2d/cocos2d-x/issues/15100
2016-02-25 11:43:36 +08:00
92dca220ce
improve mac editbox
2016-02-25 11:05:18 +08:00
34b1c1bc18
exported js_get_type_from_native for cocos2d::Node type.
2016-02-25 09:47:19 +08:00
7955721cb9
exported api.
2016-02-25 09:46:34 +08:00
f1d8a28b96
Add FlatBuffers serialize function for language data used in Cocos Studio.
2016-02-24 14:59:37 +08:00
fda721fae2
Add "id" for parser object
...
Add "id" for parser object
2016-02-23 14:07:04 +08:00
ce8f85f33e
set music volume control as default
2016-02-22 11:43:01 +03:00
37db8407f1
Merge pull request #14867 from dumganhar/refactor-websocket
...
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-02-21 06:59:59 -08:00
7607382440
Merge pull request #15094 from pandamicro/v3
...
Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2016-02-21 20:58:21 +08:00
6e8c46d0be
Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2016-02-21 20:20:32 +08:00
d28acbf2fe
Merge pull request #13906 from perminovVS/unzopen-use-getsuitablefopen
...
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
2016-02-19 15:36:06 +08:00
5072e11bac
Merge pull request #15069 from chengstory/FixRealBoolValueError
...
Fix value type error when read value of bool type from .plist file.
2016-02-19 14:07:29 +08:00
dbb10d73e1
Merge pull request #15051 from Shulepov/fix_drawing_in_incorrect_app_states_iOS
...
Fix drawing in incorrect app states on iOS
2016-02-19 14:00:37 +08:00
b2fd4b0c32
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-19 02:19:55 +00:00
9a65b0c7a1
Merge pull request #15065 from mogemimi/add-missing-reference-types
...
Add missing reference-return types
2016-02-19 10:14:07 +08:00
3a2900494f
Merge pull request #15080 from njh0602/somefix
...
fix return value
2016-02-19 10:09:55 +08:00
1d9e688707
Fix typos in documentation
2016-02-18 16:16:36 +09:00
4e501149a3
Fix lua-test link error under linux
2016-02-18 10:53:33 +08:00
79c69d77d6
fix return value
2016-02-18 11:23:54 +09:00
8280f06c1f
Add missing reference-return types
2016-02-18 05:10:42 +09:00
0cb94cc373
Merge branch 'v3_libwebsockets' of https://github.com/xiaofeng11/cocos2d-x into refactor-websocket
2016-02-17 14:56:57 +08:00
7d43e35741
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket
2016-02-17 14:56:32 +08:00
4d7186f5bd
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-16 09:07:51 +00:00
2b1511096e
Fix ValueVector read type error.
2016-02-16 17:01:54 +08:00
53cbc2d32b
Fix value type error when read value of bool type from .plist file.
2016-02-16 16:50:54 +08:00
ca836aa5cb
Merge pull request #15067 from pandamicro/v3
...
Fix C++ project crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro
2016-02-16 16:27:00 +08:00
1030151047
Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro
2016-02-16 13:43:11 +08:00
9d8d003ac8
Merge pull request #15039 from Shulepov/scale9sprite_shaders_support
...
Scale9Sprite: allow to set custom shaders (fix #12753 )
2016-02-15 21:24:14 +08:00
ca7fa1ecd2
Merge pull request #15048 from aardvarkk/binaryfontfix
...
Bitmap font sizes are not loaded from binary .fnt files.
2016-02-15 21:17:04 +08:00
c1013d153a
Merge pull request #15061 from xiaofeng11/v3
...
make UIEditBox code compatible with 32bit MacOSX project
2016-02-15 21:16:49 +08:00
cb60561053
Merge pull request #15060 from pandamicro/v3
...
Cleanup log for New memory model
2016-02-15 17:59:28 +08:00
57badc99aa
make UIEditBox code compatible with 32bit project
2016-02-15 17:38:54 +08:00
6e7c9ab8db
Cleanup log
2016-02-15 17:19:37 +08:00
94c62bed53
Remove ScriptingCore::retainCount
2016-02-15 16:32:00 +08:00
bbf89cf016
Fix director restart issue
2016-02-15 16:30:32 +08:00
4c1c238f74
Fix format string warnings
2016-02-15 01:41:08 +09:00
f1f0a7130f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-14 06:53:19 +00:00
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
39e7759e77
Fix LuaEngine compilation issue
2016-02-14 10:18:27 +08:00
85fc074e29
libwebsockets have been compiled as static lib, remove libwebsockets.dll from win10 & win8.1 project
2016-02-14 10:07:00 +08:00
c6bfe24d5b
Merge commit 'refs/pull/14867/head' of https://github.com/cocos2d/cocos2d-x into v3_libwebsockets
2016-02-14 10:05:31 +08:00
6bbfc846da
Update bindings generator and Activate new memory model by default
2016-02-14 09:48:29 +08:00
014f8e107f
fix: ensure calling opengl only when app is active
2016-02-13 11:17:55 +03:00
ab17455b18
fix: ensure drawing in main thread (layoutSubviews may be called in web thread due to banners)
2016-02-13 11:16:35 +03:00
1dbac01659
Bitmap font sizes are not loaded from binary .fnt files.
...
This problem causes bitmap fonts based on .fnt files to not appear at all, and no error is thrown.
Fixes #15042 .
2016-02-12 14:21:18 -05:00
15f0aaa598
Texture2D::getStringForFormat - added missed formats
2016-02-12 19:04:30 +03:00
ec664bc08b
Added aliases for PixelFormat names
2016-02-12 17:25:11 +03:00
112fceae81
Texture2D: RGB888 -> A8 conversion (white - full opacity, black - full transparency)
2016-02-12 17:23:56 +03:00
89c0c801b0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-11 13:40:35 +00:00
4db0d2c47a
Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
...
add Mac Editbox multiline support.
2016-02-11 21:33:56 +08:00
19e2434326
Scale9Sprite: allow to set custom GLProgram
2016-02-11 16:18:41 +03:00
8ad49c1bbc
SpriteFrameCache: take pixelFormat into account if specified
2016-02-11 15:47:23 +03:00
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
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
bf1b9df495
Add missing 'override' keywords
2016-02-08 17:22:17 +09:00
c03d2c57d7
Made console.log writable
2016-02-05 15:13:07 +08:00
de62924e60
Merge pull request #15018 from zilongshanren/tweakPageViewTurningEvent
...
tweak PageView page turning event time.
2016-02-04 17:12:49 +08:00
805be977fe
tweak PageView page turning event time.
2016-02-04 15:57:32 +08:00
35b0112290
fix linux compile issue
2016-02-04 15:30:16 +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
44d2a161dc
Remove unnecessary c_str() calls
2016-02-04 11:52:14 +09:00
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
330751a150
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-03 09:50:03 +00:00
4f388d769a
Merge pull request #15002 from WenhaiLin/v3-TargetedAction-donefix
...
Fixed TargetedAction::isDone always return false!
2016-02-03 17:44:26 +08:00
72be9a3966
Fix other issues
2016-02-02 23:39:18 +08:00
3c550853bc
Fix restart game issue and windows crash issue
2016-02-02 23:38:37 +08:00
08056b7b02
Fix debugger issue
2016-02-02 16:45:17 +08:00
fefd05e54d
Fix Menu event get released issue
2016-02-02 16:44:32 +08:00
bae36b7a98
Label:Fixed characters are displayed incorrectly with some specific font.
2016-02-02 11:16:36 +08:00
eba594bb41
Fixed TargetedAction::isDone always return false!
2016-02-02 11:07:38 +08:00
4ab9ffff4f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-02-01 06:34:11 +00:00
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
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
b2e5e480fe
update cocos2d-x's version to 3.11
2016-01-29 14:49:05 +08:00
346144742f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-28 04:01:53 +00:00
41edaa8b32
Merge pull request #14975 from greekman99/master
...
Fixed subtle documentation issues
2016-01-28 11:55:56 +08:00
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
01f41921d1
Fix enableDebugger issue
2016-01-28 01:55:10 +08:00
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
de9b51c0cf
Fix other GC issues
2016-01-28 01:03:50 +08:00
554523a201
Use JS::Heap instead of Mozilla::maybe to improve stability
2016-01-28 01:03:13 +08:00
b0d0a7a064
Merge pull request #14964 from zilongshanren/fix14909
...
fix pageview page turning event issue
2016-01-27 20:53:48 +08:00
366407ca1c
fix win32 compile issue
2016-01-27 20:21:32 +08:00
56e5cf2101
Fixes indent.
2016-01-27 13:43:55 +08:00
d8bf7fa767
Remove unnecessary memory copy when saving string.
2016-01-27 13:40:19 +08:00
ea9dda052b
Better name for data to be saved.
2016-01-27 13:39:31 +08:00
f3aef10d33
Should be const reference for data/string args to be written.
2016-01-27 11:22:46 +08:00
bd4615795e
fixed documentation for better reading clarity
2016-01-27 11:42:25 +10:00
93987c7848
Remove PersistentRooted as much as possible and use pure JS references
2016-01-26 19:33:35 +08:00
c89df2f243
Merge remote-tracking branch 'upstream/v3'
2016-01-26 20:52:55 +10:00
83a6fd36ce
Merge pull request #14971 from mogemimi/use-string-instead-of-chars
...
Replace char* with std::string in HttpRequest
2016-01-26 09:59:23 +08:00
f853a43e04
Merge pull request #14970 from mxenabled/steerlink/cleanup_obsolete_win32
...
Remove obsolete Win32 references.
2016-01-26 09:58:32 +08:00
7dd7dfede7
Replace char* with std::string in HttpRequest
2016-01-26 05:13:18 +09:00
60d640442f
Remove obsolete Win32 references.
2016-01-25 12:23:53 -07:00
bc44769b8b
add more deprecated functions
2016-01-25 18:14:48 +08:00
00ad5bd620
fix jsb deprecated constants
2016-01-25 15:40:51 +08:00
b43764fc92
fix lua deprecated function bindings
2016-01-25 14:48:17 +08:00
341575aa4c
1. We should define `std::string ret` in where we really need it. According to my test on android platform the function returns at `return "";`, which makes the `ret` unnecessary.
...
2. `charsWritten` is not used, we should either delete it or use it. Because we don't check the bytes written, I think we can just delete it.
3. We don't need (logLength+1) space for `logBytes`, because `logBytes` returned by calling glGetShaderInfoLog(shader, logLength, nullptr, logBytes) takes `logLength` bytes at most, including the ending null character, i.e. `(strlen(logBytes) + 1 == logLength)` always yield true. According to the offical opengles sdk docs: https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetShaderInfoLog.xml .
and
https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetShaderiv.xml
4. We don't need `logBytes[logLength] = '\0';`, because `logBytes` returned is already null-terminated.
2016-01-25 12:22:30 +08:00
dbf5b2c4a5
fix pageview page turning event issue
2016-01-25 11:53:40 +08:00
d6cedb88ec
Remove JS::Persistent and move js object reference into JS scope
2016-01-24 19:47:26 +08:00
0daa846020
Improve gc test case and add cycle reference tests
...
t
Improve gc test case and add action cycle reference test
2016-01-24 19:47:24 +08:00
6644781698
Merge remote-tracking branch 'upstream/v3'
2016-01-23 21:06:33 +10:00
039286f814
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-22 14:25:59 +00:00
fccbcdef69
Merge pull request #14947 from ricardoquesada/rich_text_word_wrap
...
RichText with word wrapping working as expected
2016-01-22 06:20:25 -08:00
7582518424
default is word-wrap
2016-01-22 06:20:01 -08:00
28a3f78c65
Adds missing <mutex>, <memory> include files in WebSocket.h
2016-01-22 18:10:24 +08:00
b73b16d425
Adds isDestroy std::share_ptr variable to dectect whether websocket instance was destroyed.
2016-01-22 17:43:30 +08:00
c3e0edde06
'closed' state has to be set before quit websocket thread.
2016-01-22 16:10:49 +08:00
a64a789308
_readyState must be set to State::CLOSED and _delegate->onClose(this) must be invoked at the end of WebSocket::close.
2016-01-22 15:20:43 +08:00
ed9ed6c92f
Don't change the behavior of WebSocket::close method. WebSocket::close is an synchronous method before, adds a WebSocket::closeAsync method for asynchronous closing.
2016-01-22 14:22:33 +08:00
57d218421e
Merge remote-tracking branch 'upstream/v3'
2016-01-22 16:02:07 +10:00
25f78e490d
RichText with word wrapping working as expected
2016-01-21 21:44:45 -08:00
c4df3ccd10
please ignore just a test
2016-01-22 11:05:43 +10:00
c75cfcbbfa
Export WICImageLoader form DLL
2016-01-21 15:35:51 -07:00
37b0d7c217
Mark equals() functions as const
2016-01-22 06:09:27 +09:00
ace1e9d563
Fixed variable rename to _autoScrollTotalTime
2016-01-21 11:18:52 -07: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
ec2d29ed16
Merge pull request #14930 from ricardoquesada/rich_text_fixes
...
adds JS tests for RichText
2016-01-20 22:47:35 -08:00
015994da37
Merge pull request #14926 from geron-cn/scroll_bar
...
add scrollview bar parse for cocostudio in reader
2016-01-21 13:09:34 +08:00
7b405b29bc
fix code indent
2016-01-21 11:33:13 +08:00
4c11432781
fixed bold
2016-01-20 19:08:31 -08:00
841ad8ae99
Merge pull request #14716 from newnon/v3.10_editbox_ios_mac_fix
...
fix font for EditBox in iOS & Mac
2016-01-21 11:05:12 +08:00
d9af70f913
Merge pull request #14600 from enhhh/enh_v3
...
We should not intercept touch event if scrollview's _direction is NONE
2016-01-21 10:58:20 +08:00
790c7b4b79
Merge pull request #14891 from mogemimi/fix-extra-tokens-warning
...
Fix warning: extra tokens at end of #ifdef directive
2016-01-21 10:51:01 +08:00
4d128a83f4
Merge pull request #14659 from elvman/resizable_window
...
Resizable window
2016-01-21 10:49:33 +08:00
8fda08abcd
Merge pull request #14755 from mogemimi/fix-redefinition-warning
...
Fix OpenGL macro redefinition warning in JS bindings/Mac
2016-01-21 10:46:58 +08:00
2ed4965b6d
Merge pull request #14751 from newnon/v3_get_version_windows
...
getVersion win32 implementation
2016-01-21 10:42:19 +08:00
60d273e31b
underline and strikethrough working ok on system fonts
2016-01-20 18:41:59 -08:00
2fbf4c1539
Merge pull request #14932 from CocosRobot/update_lua_bindings_1453343722
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-21 10:41:00 +08:00
4dab20b715
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-21 02:37:23 +00:00
fd0ed05f18
Merge pull request #14902 from mogemimi/update-docs-to-v3
...
Update docs to reflect latest API changes
2016-01-21 10:35:27 +08:00
e1e87c0205
Merge pull request #14914 from steerlink/font_family
...
Add ability to get the font family
2016-01-21 10:34:13 +08:00
c642014d1e
Merge pull request #14927 from mogemimi/fix-unsigned-comparison-warn
...
Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF()
2016-01-21 10:32:56 +08:00
061c6c7c6f
Merge pull request #14907 from neokim/feature/scroll_view_touch_total_time_threshold
...
Add a setter for touch total time threshold in ScrollView
2016-01-21 10:31:31 +08:00
be6fd6a2ee
format code indent
2016-01-21 10:27:37 +08:00
7735a75651
adds JS tests for RichText
2016-01-20 17:59:13 -08:00
6fdefeb7a7
Make ui::ScrollView::scrollTo* functions virtual
...
This mirrors the "jumpTo*" functions, which are already virtual
2016-01-20 17:07:22 -07:00
c8ecab84a3
Add stopAutoScroll() to ui::ScrollView
...
Immediately stops inner container scroll initiated by any of the "scrollTo*" member functions
2016-01-20 17:05:52 -07:00
9c5eecacc7
Update docs to reflect latest API changes
2016-01-21 01:08:32 +09:00
639bf3f682
Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF()
2016-01-20 23:59:45 +09:00
73793a8317
Fix macro redefinition warning in JS bindings/Mac
2016-01-20 23:17:24 +09:00
87434e2774
add scrollview bar parse for cocostudio in reader
2016-01-20 21:13:59 +08:00
44acbbfeb6
Merge pull request #14921 from CocosRobot/update_lua_bindings_1453285144
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-20 18:24:28 +08:00
74f9f3fd0e
Merge pull request #14905 from WenhaiLin/v3-remove-CocosPlayClient
...
Remove CocosPlayClient
2016-01-20 18:24:16 +08:00
b340e48cb1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-20 10:21:41 +00:00
a10e2d2309
Merge pull request #14915 from MSOpenTech/v3-winrt-fix
...
v3 added missing getFileSize() method for winrt
2016-01-20 18:16:06 +08:00
e36d71a24c
adds Invalid test
...
UIRichText reports error on console when parsing invalid xml
2016-01-19 21:16:53 -08:00
86e8f7d0b3
oops... removing debugging code
2016-01-19 20:46:57 -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
39ab445f7d
Merge pull request #14904 from pandamicro/v3
...
[ci skip]Add more test case to jsb memory test
2016-01-20 11:43:49 +08:00
a64be12646
added missing getFileSize() method for winrt
2016-01-19 12:36:10 -08:00
535dfdac27
Fix warning.
2016-01-19 11:47:18 -07:00
41d7a27485
Implement getFontFamily().
2016-01-19 11:43:35 -07:00
df2aae0498
Add a setter for touch total time threshold in ScrollView
2016-01-18 19:25:08 +09:00
718d2c690b
Remove CocosPlayClient
2016-01-18 17:58:04 +08:00
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
f8016978ff
Fix an improper macro syntax for windows platform
2016-01-18 14:28:39 +08:00
b14a3730ca
Fix warning: extra tokens at end of #ifdef directive
2016-01-17 03:17:00 +09:00
8bc9f712ea
Merge pull request #14895 from minggo/firefox-remote-debug
...
web console supports for JSB projects
2016-01-15 21:27:27 +08:00
5f9bd06bee
support webconsole
2016-01-15 18:05:59 +08:00
e062ade514
make require() returns the value of last statement
2016-01-15 18:02:11 +08:00
2640396822
Merge pull request #14890 from minggo/firefox-remote-debug
...
can use new firefox version to debug cocos2d-x jsb projects
2016-01-15 12:48:46 +08:00
299a56d52e
can use new firefox version to debug cocos2d-x jsb projects
2016-01-15 11:39:17 +08:00
b04e4754d7
Refactor CCBundle3D, remove wrong use of getDataFromFile. _jsonBuffer is std::string, _binaryBuffer is Data instance now.
2016-01-15 00:55:10 +08:00
057db2444c
Removes unused code in Material::initWithFile.
2016-01-15 00:55:10 +08:00
e7ed79f655
const Data -> const Data& for function argument, performance improvement.
2016-01-15 00:55:10 +08:00
7e0a1344ca
The fix for BMFontConfiguration::parseConfigFile reads string file.
...
'strchr' finds a char until it gets a '\0', if 'contents' self doesn't end with '\0',
'strchr' will search '\n' out of 'contents' 's buffer size, it will trigger potential and random crashes since
lineLength may bigger than 512 and 'memcpy(line, contents + parseCount, lineLength);' will cause stack buffer overflow.
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
9c86d1f0f1
Merge pull request #14880 from mogemimi/fix-minor-typo
...
Fix typos in comments and documentation
2016-01-14 09:58:29 +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
f0066d03d7
whitespace cleanup.
2016-01-13 21:15:48 +08:00
dacd51c839
More function name renames. createThread -> createWebSocket, quitSubThread -> quitWebSocketThread.
2016-01-13 21:15:48 +08:00
649ed67371
Removes lws_get_internal_extensions, adds permessage-deflate extension.
2016-01-13 21:15:48 +08:00
fc38857e6b
LWS_SEND_BUFFER_PRE_PADDING -> LWS_PRE
2016-01-13 21:15:48 +08:00
5d1e98340e
Updates WebSocket::onSocketCallback & WebSocketTest.js
2016-01-13 21:15:48 +08:00
2b5fde79e0
Comment fix & function name fix for WsThreadHelper:
...
sendMessageToUIThread -> sendMessageToCocosThread
sendMessageToSubThread -> sendMessageToWebSocketThread
joinSubThread -> joinWebSocketThread
2016-01-13 21:15:48 +08:00
763559cd1e
Invoking WebSocket::closeAllConnection while reseting Director.
2016-01-13 21:15:48 +08:00
d122784ad4
Adds WebSocket::closeAllConnections() method.
2016-01-13 21:15:48 +08:00
f9e8ae0f09
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-01-13 21:14:38 +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
0babe85947
add PlayableFrame
2016-01-12 17:21:01 +08:00
18a793792e
Fix typos in comments and documentation
2016-01-12 13:27:06 +09:00
cd7671088f
Merge pull request #14712 from xpol/fix-include-for-compile-under-crystax-ndk
...
crystax-ndk-10.3.0 needs <stdint.h> to be included in cocos/ui/UIWebViewImpl-android.h.
2016-01-12 11:56:43 +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
cf6fc000e7
Merge pull request #14709 from kcisoul/v3
...
Fix #14428 CCRenderTexture does not work properly on some devices wh…
2016-01-12 11:35:00 +08:00
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09: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
dc785f63ea
garbage collect when transition is finished
2016-01-07 10:52:03 -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
963efe78fe
fix iOS downloader crash when storage path contains spaces
2016-01-07 16:58:16 +09: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
ddb142e211
ouch... doesn't crash on pure C++ projects
2016-01-06 11:16:55 -08:00
0fcfb359d2
Fix more js parser font setting error
2016-01-06 20:42:27 +08:00
d82b6b6f1c
Fix js parser use resource path name for font name when font name is blank in BMFontLoader and ButtonLoader
2016-01-06 19:36:32 +08:00
b45e96f77e
fix indent issue
2016-01-05 10:20:05 +08:00
100a119181
add overFlow enum to jsb and lua.
...
1. change clamp to 1 and shrink to 2
2016-01-04 21:43:37 +08:00
69eed4b99c
Updated comment
2016-01-04 11:19:40 +01: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
efbbdb1f58
Merge pull request #14813 from xiaofeng11/v3.10_xf_fix
...
Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK
2015-12-30 13:51:41 +08:00
b92b67edad
moves macro definition to `ccConfig.h`
2015-12-29 17:36:02 -08:00
7cd80cb669
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-29 17:36:02 -08:00
77aa3871b6
fixes compilation issues on tvOS
2015-12-29 12:30:00 -08:00
6ea389f475
Merge pull request #14815 from pandamicro/v3.10
...
Made require overwritable
2015-12-29 22:06:00 +08:00
daac6ceb08
Made require overwritable
2015-12-29 21:28:30 +08:00
770f3d7f8e
Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK
2015-12-29 18:31:20 +08:00
b6d1edc8e7
Merge branch 'tvos_support' of github.com:ricardoquesada/cocos2d-x into tvos_support
2015-12-28 16:43:01 -08:00
666a6c6f88
adds missing scheme files
2015-12-28 16:42:44 -08:00
492389fd5b
Update CCPlatformConfig.h
2015-12-28 16:03:48 -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
69a6406661
Merge pull request #14805 from pandamicro/v3.10
...
Fix JSB issues on win32
2015-12-25 20:06:47 +08:00
fe1336bdc7
Fix chipmunk cpSpaceAddCollisionHandler issue on argument parsing
2015-12-25 19:08:33 +08:00
2ce866c4ba
Fix jsb_ref_rebind issue on win32 (mystery GC crash)
2015-12-25 19:08:32 +08:00
eea1c814df
Merge pull request #14803 from super626/v3.10
...
Fix NavMeshDebugDraw bug on iphone5s
2015-12-25 18:41:42 +08:00
50d16c13df
remove unused code
2015-12-25 17:54:58 +08:00
d61ec5bb08
Merge pull request #14804 from xiaofeng11/v3.10
...
Fix variable type mismatch.
2015-12-25 17:53:08 +08:00
728682d68e
Fix variable type mismatch.
2015-12-25 17:18:15 +08:00
b219828d69
Merge pull request #14801 from xiaofeng11/v3.10
...
Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10
2015-12-25 16:14:27 +08:00
20e2b4acbd
fix NavMeshDebugDraw on iphone5s
2015-12-25 16:02:03 +08:00
c92b563c28
fix layout backimage size error with neweset scale9sprite
2015-12-25 14:11:56 +08:00
dea99211fb
Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10
2015-12-25 11:44:11 +08:00
d005bd18b7
remove error logic
2015-12-24 14:39:15 +08:00
434c79ae90
Merge pull request #14793 from super626/fixsprite2
...
It already been reviewed and compile by jenkins in https://github.com/cocos2d/cocos2d-x/pull/14697 .
We need merge it to V3.10 to file TMX render bug.
2015-12-24 09:40: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
dea1ef1290
Merge pull request #14790 from pandamicro/v3.10
...
Fixed WebSocket JSB crash issue
2015-12-24 01:37:17 +08:00
acf03c06d5
Fixed WebSocket JSB crash issue
2015-12-23 23:28:14 +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
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
0cac519e5c
fix uiWidget clipping error with Node
2015-12-23 16:05:52 +08:00
851d288d0b
Merge pull request #14781 from zilongshanren/rollbackSlider
...
Rollback slider and loadingbar in non scale9 mode
2015-12-23 15:04:55 +08:00
2a2f184449
refine code with DRY.
2015-12-23 14:43:25 +08:00
847094ec7d
ui::loadingBar -> add flip logic back
2015-12-23 14:34:36 +08:00
3fd8f36a90
Limit force GC in menu item only work in lua-binding
2015-12-23 12:30:59 +08:00
d4a5d0da44
rollback uislider
2015-12-22 20:03:56 +08:00
ab77e8c520
Revert "loading bar use new scale9 feature"
...
This reverts commit a671bf7ce9
2015-12-22 19:53:24 +08: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
954a54f7bb
Merge pull request #14770 from pandamicro/v3.10
...
Fix VS crash issue caused by unsupported macro syntax
2015-12-22 09:42:24 +08:00
a91a669972
Fix VS crash issue caused by unsupported macro syntax
...
piece of shit...
2015-12-21 22:44:59 +08:00
30f3096c92
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-21 11:36:07 +00:00
98a6558018
add interface for BMFont
2015-12-21 18:49:46 +08:00
68e166568e
fix some minor typos in the comments
...
change spelling from "a item" to "an item", "a event" to "an event", "a index" to "an index" in cocos/ui/UIListView.h
2015-12-21 14:26:50 +08:00
8d8ac60625
Merge pull request #14761 from pandamicro/v3.10
...
Correct return type to adopt GC Rooting API
2015-12-21 11:46:59 +08:00
616f5c0a01
Correct return type to adopt GC Rooting API
2015-12-21 11:07:40 +08:00
4e36e24993
Correct return type to adopt GC Rooting API
2015-12-21 10:42:54 +08:00
aac1558b75
Fix typos in documentation, comments and strings
2015-12-21 08:22:41 +09:00
81918f51ea
Fix event handle function issue with compartment
...
and Fix a crash issue caused by malformed js usage
2015-12-21 00:16:17 +08:00
8d712a4c45
Expose CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2015-12-21 00:16:17 +08:00
34c7331b99
Issue fixes for new memory model
2015-12-21 00:16:17 +08:00
6a6407f711
Pass native references to script scope
2015-12-21 00:16:16 +08:00
8ddaf310ef
Update manual bindings to use the new memory model
2015-12-21 00:16:16 +08:00
e1bc6640f4
Implement full GC relied memory model
2015-12-21 00:14:51 +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
1071f63ac7
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-12-20 22:45:51 +08:00
bac68bd0b8
getVersion win32 implementation
2015-12-20 00:09:45 +03:00
f747075a83
Merge pull request #14748 from pandamicro/v3.10
...
Temporary disable forceGC on win32
2015-12-19 23:27:12 +08:00
8f836162aa
Temporary disable forceGC on win32
2015-12-19 22:45:57 +08:00
386b850871
Fix issue in MenuItem init usage
2015-12-19 22:45:22 +08:00
ae48253da6
Fix UI addEventListener issue
2015-12-19 22:44:25 +08:00
ffbac99dc5
fix script samples error with controlButton
2015-12-19 22:22:41 +08:00
0f90f74df9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-19 09:12:27 +00:00
94ee0734a5
Merge pull request #14721 from newnon/v3.10_slider_missprint
...
slider misprint fix
2015-12-19 17:06:26 +08:00
4fda883c3b
Merge pull request #14742 from xiaofeng11/v3.10
...
Fix TextField won't show security text when first time set password enable
2015-12-19 17:01:43 +08:00
795637c0c5
Merge pull request #14743 from liamcindy/v3_ui_LoadingBar
...
fix loadingbar direction changed error
2015-12-19 16:59:42 +08:00
8bf7908e93
fix loadingbar direction changed error
2015-12-19 15:59:27 +08:00
d8817f3cbb
Fix TextField won't show security text when first time set password enable
2015-12-19 15:44:39 +08:00
6481a0f3c1
Merge pull request #14740 from xiaofeng11/v3.10
...
Bug Fix & h5 engine ref update
2015-12-19 14:13:37 +08:00
a139221618
Synchronize parser match modify from h5 engine
...
Update h5 engine ref
2015-12-19 13:56:12 +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
8d967982cd
Merge pull request #14723 from newnon/v3.10_web_socket_crash_fix
...
fix web socket crash
2015-12-19 10:11:58 +08:00
9e6657d6b2
fix scale9error error
2015-12-18 22:40:12 +03:00
12ece31121
Mark the old functions as CC_DEPRECATED_ATTRIBUTE
2015-12-19 01:21:56 +09:00
689ee1081a
Fix spelling of function name
2015-12-19 01:07:08 +09:00
b5141a28bd
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-18 13:28:14 +00: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
2ee5c88f9a
Merge pull request #14733 from xiaofeng11/v3.10
...
Update h5 sub-module ref
2015-12-18 19:06:59 +08:00
278bbb77c5
CCFileUtils-apple.mm Grammatical errors
...
`termniate` -> `terminate`
2015-12-18 17:34:52 +08:00
a13a0c35d3
Update h5 sub-module ref
...
Synchronize studio parser match change from h5 modify
2015-12-18 15:40:21 +08:00
eb72760b85
Merge pull request #14726 from xiaofeng11/v3.10
...
Fix TextField missing default password style text setting
2015-12-18 14:42:21 +08:00
4d9beb9d77
Merge pull request #14699 from WenhaiLin/v3-new-nothrow
...
Adds `std::nothrow` to the `new` statements
2015-12-18 14:38:28 +08:00
2a6cec25fa
Merge pull request #14701 from WenhaiLin/v3-label-letterfix
...
Fixed label's letter can't be hide by `setVisible(false)`.
2015-12-18 11:41:51 +08:00
fb312a761c
update for 3D object render, revert old changes
2015-12-18 11:23:33 +08:00
d3898991af
fix some logical error
2015-12-18 11:03:23 +09:00
1e8a0e0acc
Merge pull request #14719 from newnon/v3.10_fix_android_include
...
fix include in cocos network module
2015-12-18 09:53:09 +08:00
98fe1d46cc
Scale9Sprite now fully support cropped sprite frames in both mode simple & slice
2015-12-18 00:32:59 +03:00
6c08dd920e
Fix TextField missing default password style text setting
2015-12-17 18:29:23 +08:00
b30553e933
WebP loading improvements WebP loaded as premultiplied alpha if it have alpha
2015-12-17 12:07:56 +03:00
3e049f8049
slider misprint fix
2015-12-17 12:06:39 +03:00
89f4a1208b
fix font for EditBox in iOS & Mac
2015-12-17 12:02:39 +03:00
b4f762befa
fix include in cocos network module
2015-12-17 11:50:54 +03:00
a172cce874
fix web socket crash
2015-12-17 11:48:25 +03:00
9e77fb0834
fix build fail error
2015-12-17 16:24:29 +09:00
8a39c1a06a
Windows/osx/linux build fail bug fixed
2015-12-17 15:40:16 +09:00
41d4a41920
crystax-ndk-10.3.0 needs <stdint.h> to be included here.
2015-12-17 12:08:14 +08:00
d943381c65
Update spidermonkey_specifics.h
...
updated docstrings
2015-12-16 20:03:09 -08:00
1ba3f2badb
minor fixes
2015-12-16 17:47:50 -08:00
f023d5a378
no more uthash
...
Instead of using two uthash entires, it uses two unordered_map entries.
Benefits are:
easier to debug. I can inspect the contents of the unorderd_map with the
debugger
less memory. I don't need to allocate two proxies. I only allocate one
proxy and I added it into both maps
If also fixes an important bug when unrooting objects. Unroot was
cleaning the heap object. So now proxy adds a _jsobj, which is a raw
pointer. Needed under certain cases.
2015-12-16 17:37:44 -08:00
afc50be1ed
Fix #14428 CCRenderTexture does not work properly on some devices which does not support "GL_OES_packed_depth_stencil".
2015-12-17 10:34:51 +09:00
b079705dcd
Merge pull request #14702 from pandamicro/v3.10
...
Fix Downloader callback bug on iOS9
2015-12-17 01:05:10 +08:00
58902f0711
Fix issue in URLSession:task:didCompleteWithError:
2015-12-16 21:19:46 +08:00
ffcf45ef78
Improved solution for Downloader status code issue on iOS 9
2015-12-16 17:45:40 +08:00
66b0a0e9b1
Adds `std::nothrow` to the `new` statements
2015-12-16 17:06:56 +08:00
89c620eb4b
Merge pull request #14696 from WenhaiLin/v3-labelfix
...
Improved robustness in release mode
2015-12-16 17:00:45 +08:00
a8a9c8ec92
Merge pull request #14694 from ricardoquesada/v3_10_js_fixes
...
ccvector_to / ccmap_to converted to new API
2015-12-16 16:34:51 +08:00
7303895866
Improve error message for Downloader and add test case
2015-12-16 15:43:18 +08:00
05da27338a
Merge branch 'fix/ios9_downloader_bug' of github.com:cezheng/cocos2d-x into v3.10
2015-12-16 15:24:42 +08:00
dfdc202171
refine
2015-12-16 15:08:48 +08:00
b91882f150
Fixed label's letter can't be hide by `setVisible(false)`.
2015-12-16 14:59:33 +08:00
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
74b480c1b6
fix setflip for batch sprite
2015-12-16 13:45:37 +08:00
e5952ad440
Improved robustness in release mode
2015-12-16 11:53:59 +08:00
eb8e755362
removes logs
2015-12-15 18:21:44 -08:00
43a573f4fd
ccvector_to / ccmap_to converted to new API
...
and more fixes
2015-12-15 17:37:48 -08:00
7d72f66f5b
add 'js_module_register.cpp' and 'lua_module_register.cpp' in Compile Sources on iOS Targets' Build Phases
2015-12-15 21:00:24 +08:00
98079b49e8
updated javascript bindings
2015-12-15 11:18:32 +01:00
ba45e2df33
updated lua bindings; updated file format description
2015-12-15 10:56:10 +01:00
727d857c88
Merge pull request #14674 from super626/tilemap
...
fix fast tilemap blend function
2015-12-15 17:23:53 +08:00
8cb2ec6187
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-15 04:31:50 +00:00
6e20c3cc4f
Merge pull request #14681 from pandamicro/v3.10
...
Fix ComponentJS proxy management issue in JSB
2015-12-15 12:26:12 +08:00
6d58fc05d9
Fix Downloader callback bug on iOS9
...
On iOS 9 when server returns a response with HTTP status 403 caused the
downloader to callback successfully and saving the error message to the
storage path. This commit adds a check on the HTTP status code and
do failure callback if status code is 4xx or 5xx.
2015-12-15 13:16:24 +09:00
64276bd664
Fix ComponentJS proxy management issue in JSB
2015-12-15 11:48:44 +08:00
280a8e9d9c
Merge pull request #14663 from xiaofeng11/v3.10
...
Update all version number to v3.10
2015-12-15 10:48:51 +08:00
46b926a18e
added missing _USRJSSTATIC preprocessor define for ARM builds
2015-12-14 14:55:33 -08:00
18aec7e942
Fix deprecation warning in FontFNT
2015-12-15 02:25:32 +09:00
4dd3595b1e
added test with plist file containing anchor points
2015-12-14 16:17:41 +01:00
033b9aabf0
read sprite anchor point from plist file
2015-12-14 15:42:18 +01:00
0e7a02d025
Merge pull request #14670 from pandamicro/v3
...
Fix evalString doesn't return result issue
2015-12-14 17:26:34 +08:00
bc29bde5ae
Merge pull request #14653 from liamcindy/v3_ui_pageView
...
update pageview to support adjust child size
2015-12-14 17:00:58 +08:00
b6ec4c9c5d
fix fast tilemap blend function
2015-12-14 16:51:53 +08:00
eee7726f5f
fix setflip for batch sprite
2015-12-14 15:35:26 +08:00
508d54ec3c
fix pageview child size
2015-12-14 15:29:02 +08:00
23bf815cfa
Fix 3d touch compile error in lower version Xcode
2015-12-14 14:26:52 +08:00
0dd4433104
Merge pull request #14669 from zilongshanren/fixCustomSize
...
fix #12249
2015-12-14 13:56:50 +08:00
6781c96fe0
Merge pull request #14661 from zilongshanren/v3.10
...
fix scale9sprite global zorder issue.
2015-12-14 13:56:29 +08:00
662c7fbec5
Made API consistent with old version
2015-12-14 13:55:17 +08:00
cbce4d37c3
Merge pull request #14671 from ricardoquesada/more_js_fixes
...
More js fixes
2015-12-14 13:41:59 +08:00
96db089b64
Merge pull request #14665 from zilongshanren/fixMemoryLeak
...
fix memory leaks of stencileStateManager
2015-12-14 13:34:17 +08:00
330b588215
Fix evalString doesn't return result issue
2015-12-14 13:13:54 +08:00
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
838bd242ce
fix #12249
2015-12-14 11:53:09 +08:00
3e64e09e69
fix memory leaks of stencileStateManager
2015-12-14 10:40:09 +08:00
1c53920a13
Merge pull request #14660 from chengstory/#24345
...
Fix #24345
2015-12-14 10:38:13 +08:00
4815ec8b9a
Update version number to v3.10
2015-12-14 10:32:29 +08:00
445442c964
Upgrade spider monkey to solve win32 js project crash issue
2015-12-14 10:27:11 +08:00
0f5aac5754
fix typo
2015-12-14 10:14:39 +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
d904246aa8
Merge pull request #14613 from super626/v3
...
fix 3d model bug
2015-12-14 10:04:25 +08:00
fc84306bcb
Always update design resolution
2015-12-14 01:20:38 +02:00
4b33d730de
Calculate frame size with zoom factor
2015-12-14 00:53:46 +02:00
718422c1d9
Set frame size on window resize
2015-12-14 00:20:29 +02:00
b1d700ad33
fix bmfont size error
2015-12-13 13:59:42 +08:00
0473dd88fc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-13 03:12:14 +00:00
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
07673f71cd
Fix inconsistent header include guards
2015-12-12 21:05:22 +09:00
c5058aa2f9
more conversions
2015-12-11 17:18:20 -08:00
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
71f9ead981
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-11 17:52:29 +00:00
fd321530e5
restores autobindings
2015-12-11 08:59:35 -08:00
49d03d9de1
Synchronize js parsers modification from html5 version
2015-12-11 18:22:02 +08:00
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
d75767bfc4
Merge pull request #14639 from liamcindy/v3_ui_text
...
update for text effect clone
2015-12-11 13:54:46 +08:00
4c5c6e6d9b
update for code format
2015-12-11 12:04:54 +08:00
6f3721a68c
Merge pull request #14638 from liamcindy/v3_ui_scrollView
...
fix scrollview render error
2015-12-11 10:55:17 +08:00
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
2420c942c3
Merge pull request #14617 from chengstory/#24345
...
Fix #24345
2015-12-10 09:19:30 -08:00
5872745593
fix compile error and link error on ios/Mac platform
2015-12-10 16:43:01 +08:00
8c2b4c78db
fix scrollview render error
2015-12-10 13:37:07 +08:00
e92db43e14
update for text clone
2015-12-10 13:17:31 +08:00
aa66e3a97c
Merge pull request #14629 from MSOpenTech/v3-winrt-3.10
...
V3.10 winrt updates
2015-12-10 10:05:23 +08:00
cb22de5a09
Merge pull request #14590 from pandemosth/issue_14589
...
Fixes #14589 allocation issue with remote images
2015-12-10 10:04:29 +08:00
6727719cb7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-10 01:47:27 +00:00
ceac1d9d6a
Merge pull request #14626 from dumganhar/v3
...
Bug fix for shouldStartLoading method, should return value from JS
2015-12-10 09:36:28 +08:00
35c855a565
updated dll name to v3.10
2015-12-09 17:33:14 -08:00
ea2354932c
Merge pull request #14614 from mogemimi/fix-doc-and-comment-typo
...
Fix typo in documentation and comments
2015-12-09 14:08:57 -05:00
65eb5fa4ba
Bug fix for shouldStartLoading method, should return value from JS, also fix that webview callback is already in Cocos Thread, don't need to post to cocos thread for running again.
2015-12-09 22:40:57 +08:00
936ff936e2
Merge pull request #14621 from GuoLunHao/v3
...
fix the link error and compile error in windows and android platform
2015-12-09 20:25:15 +08:00
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
666281754d
Merge pull request #14616 from zilongshanren/fixLoadingBarScale9Rendering
...
Refactoring Scale9 ui widgets to use the latest RenderingType feature.
2015-12-09 18:34:57 +08:00
bb515dce58
fix issue 12249
2015-12-09 17:15:09 +08:00
2a806a82c6
Fix #24345
...
TMX Iso Zorder and TMX Ortho Zorder rendering error in TestCPP.
2015-12-09 15:07:58 +08:00
e37e1909f2
don't remove optimize code for capInsets
2015-12-09 15:00:41 +08:00
df44b164ef
change layout scale9 rendering type to simple
2015-12-09 14:38:53 +08:00
4c99bdf04f
change imageview non-s9 to simple rendering type
2015-12-09 14:26:12 +08:00
df2ebfbc9c
change uibutton nons9 to simple rendering mode
2015-12-09 14:21:26 +08:00
2251b52929
Merge pull request #14611 from ricardoquesada/js_get_or_create_jsobject
...
js_get_or_create_jsobject() and other stuff
2015-12-08 20:48:58 -08:00
96ee343884
fixes for windows
2015-12-08 20:07:13 -08:00
9fd5985581
add simple rendering mode to slider
2015-12-09 11:32:52 +08:00
a671bf7ce9
loading bar use new scale9 feature
2015-12-09 10:41:31 +08:00
f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
ea5dacedd0
Merge pull request #14608 from xiaofeng11/v3_310fix
...
Bug fix & make test case more clear.
2015-12-08 18:05:36 +08:00
6e1f38fdc4
fxi model bug
2015-12-08 16:32:06 +08:00
e675657cae
improved docstrings
2015-12-07 19:14:10 -08:00
13dc967b03
js_get_or_create_jsobject() and other stuff
...
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()
Squashed commit of the following:
commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:04:24 2015 -0800
logging added (and commented)
will be useful in the future
commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:00:09 2015 -0800
new js_get_or_create_jsobject<T>
Specializes Template on cocos2d::Ref.
When Ref, it calls the `jsb_ref` functions
commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 13:31:52 2015 -0800
singletons converted
commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 12:20:07 2015 -0800
getDescendants() converted
2015-12-07 19:05:23 -08:00
5ef1c92420
Merge pull request #14609 from zilongshanren/fixLabelClampIssue
...
fix horizontal clamp and shrink issue
2015-12-07 19:45:19 +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
6f7e5a5c06
Merge pull request #14607 from liamcindy/v3_issuseRevert
...
revert error changes
2015-12-07 18:16:49 +08:00
6c17ef4baf
fix horizontal clamp and shrink issue
2015-12-07 18:13:03 +08:00
15072a6dd3
revert error changes
2015-12-07 16:21:12 +08:00
462796d2dd
Bug fix for ActionNode in CocosStudio, please don't use weak reference.
2015-12-07 15:06:50 +08:00
7e803cbd0a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-07 03:30:43 +00:00
c9d32a83b8
Merge pull request #14597 from mogemimi/fix-api-spelling
...
Fix misspelled APIs in v3.10
2015-12-07 11:07:13 +08:00
a318e31222
We should not intercept touch event if scrollview's _direction is NONE
2015-12-06 22:51:22 +08:00
d02f4afd4a
using new bindings templates
...
ignores createInstance() from ui
2015-12-05 22:26:54 -08:00
c7640c8aaf
Replace 'resoucedata' with 'resourcedata' in JS Binding
2015-12-05 18:59:54 +09:00
745f54b421
Replace 'ResouceData' with 'ResourceData'
2015-12-05 18:59:54 +09:00
09c6e5d2f7
Replace 'Disabeld' with 'Disabled'
2015-12-05 18:59:54 +09:00
aebfefd7a8
Merge branch 'v3' into js_more_conversions
2015-12-04 19:01:20 -08:00
cd8631ef09
sfunction "create" uses new optimized code
...
...although this code should never be called
2015-12-04 18:42:31 -08:00
54ac5d8d2e
fix allocation issue with remote images
2015-12-05 10:10:58 +11:00
d371ec2c8a
Merge pull request #14585 from CocosRobot/update_lua_bindings_1449222153
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 17:53:46 +08:00
51acfa8908
Merge pull request #14581 from xiaofeng11/v3_xf
...
Add missing lua engine export declaration.
2015-12-04 17:51:38 +08:00
d5e54bdb81
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 09:48:13 +00:00
6ff2586f26
Merge pull request #14574 from super626/v3
...
Fix Sprite3D::setMaterial when multiple meshes exist
2015-12-04 17:38:56 +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
8f9ea8a87e
Add missing lua engine export declaration.
2015-12-04 15:23:59 +08:00
71217fd393
Fix indent
2015-12-04 15:14:47 +08:00
d09eae92f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 07:13:02 +00:00
f6c2758801
Merge pull request #14409 from xiaofeng11/v3_combine_opengl
...
Combine Studio change for openGL related operation
2015-12-03 23:03:40 -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
8d546828f4
fix Sprite3D::setMaterial
2015-12-04 10:54:43 +08:00
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
fd2d616aed
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-04 02:03:46 +00:00
01644cb46e
Merge pull request #14569 from mogemimi/fix-docs-typo
...
Fix typos in documentation
2015-12-04 09:55:30 +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
49882ed91c
js_cocos2dx_CCGLProgram_createWithString converted to new JSAPI
2015-12-03 15:49:56 -08:00
b87975096e
GLProgram converted to new JSAPI
2015-12-03 15:47:39 -08:00
67948ff8c8
adds jsb_ref_get_or_create_jsobject()
...
kind of replaces js_get_or_create_jsobject for Ref objets.
Benefits: friendly with the new JS API
takes less space (no template)
2015-12-03 15:40:52 -08:00
37b4c3fe6a
CallFuncN converted to new JS API
2015-12-03 15:24:37 -08:00
013f5b8d33
layerMultiplex converted to new JS API
2015-12-03 15:15:47 -08:00
3100cba5a1
Animation ported to JS
2015-12-03 15:02:39 -08:00
cc6e72fe7c
MenuToggleItem converted
2015-12-03 14:54:38 -08:00
e5032dccc0
rootObject/unrootObject working again
2015-12-03 14:49:23 -08:00
bd943c5415
Sequence/Spawn converted to use new API
2015-12-03 13:56:00 -08:00
3edadc035b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-03 21:34:13 +00: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
d0ce2473a1
Merge pull request #14499 from xiaofeng11/v3_combine_safety
...
Change ASSERT to safety mode
2015-12-04 00:04:36 +08:00
be213bf306
Fix typos in documentation
2015-12-03 21:03:00 +09:00
ea42c09243
Merge pull request #14566 from zilongshanren/fixIssue14564
...
fix scale9sprite be culled unexpectedly
2015-12-03 19:17:40 +08:00
c304348c34
Merge pull request #14565 from pandamicro/v3
...
Add js test case for fix, improve template
2015-12-03 18:48:34 +08:00
91909081da
Merge pull request #14542 from pandemosth/issue_14539
...
Fix for Issue 14539
2015-12-03 18:47:17 +08:00
e23432c6fa
Merge pull request #14530 from cezheng/fix/downloader_bug_ios_android
...
Fix Downloader bug iOS & Android
2015-12-03 18:46:43 +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
4cc4dd3a9f
Fix Rooting API usage issue in cocos2d_specifics
2015-12-03 16:48:25 +08:00
07bc48c1b8
revert glprogram
2015-12-03 16:29:02 +08:00
b1fd2277d8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-03 07:53:26 +00:00
d0cd5ee9ab
Merge pull request #14562 from ricardoquesada/js_fixes
...
JS bindings fixes for Menu, Sprite and Label
2015-12-03 15:44:01 +08:00
70b9183ddb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
tools/bindings-generator
2015-12-03 14:35:36 +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
9deee44965
Merge pull request #14548 from mogemimi/fix-deprecation-warning
...
Fix deprecation warning in SkeletonRenderer
2015-12-03 13:18:15 +08:00
58e4d3c487
JS Menu fixes
2015-12-02 17:30:54 -08:00
48523572b7
label JS fixes
2015-12-02 17:23:23 -08:00
6e50cf883f
Sprite::create() using new API...
...
...also code easier to understand
2015-12-02 16:45:28 -08:00
c321d35a9a
Squashed commit of the following:
...
commit 000a025fb4027c26bf05f7296e2d1fbbf21abe6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Dec 2 10:38:27 2015 -0800
updated submodule
commit b5f45a62b48493f05d75aea865158c371241973d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 19:21:34 2015 -0800
ooops... thanks Panda
commit 85f0b9c01d5281970f748b6460107bc0ca82cdf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 18:19:16 2015 -0800
better macro name for GC. Thanks panda
commit e42ad74a664dd2b85cbf4463a6fef8f6abc06664
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 17:10:32 2015 -0800
RepeatForever, Repeat and Speed converted
commit 3a8130ffc06301c91c836539736bbae456f05b4d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 14:31:32 2015 -0800
cherry-picking changes to disable retain/release from GC
commit 3ed6e00dc2d9d46248d9374a1f9874cd0b2ba67d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 12:31:04 2015 -0800
fixes autorelease issues on rebind
commit b65f5f6b16c1542c28b04d66377a27233c6cf214
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 12:23:33 2015 -0800
my JS changes... again
2015-12-02 14:45:13 -08:00
d4233dd63a
Fix deprecation warning in SkeletonRenderer
2015-12-03 00:09:47 +09:00
3fc0d327bf
Merge pull request #14544 from CocosRobot/update_lua_bindings_1449037532
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 18:27:03 +08:00
706e005c3d
Merge pull request #14543 from zilongshanren/fixLabelOverflowShrink
...
fix label clamp when scaled with bmfont
2015-12-02 18:26:46 +08:00
a804c67a12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
2015-12-02 15:07:58 +08:00
edd786e7f6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 06:30:18 +00:00
867664197e
Merge pull request #14526 from super626/v3
...
3D Normal Map Support
2015-12-02 14:22:20 +08:00
ed55d41858
fix label clamp when scaled with bmfont
2015-12-02 13:48:20 +08:00
ef931b61af
correct typo in method name of doDestroy
2015-12-02 15:23:05 +11:00
528a94d36f
fixes a crash in destructor of CCDownloader-apple when completing a data download
2015-12-02 15:21:42 +11:00
151e7a7a53
CCDownloader-apple : call onTaskFinish when the download session completes for a data task
2015-12-02 15:16:00 +11: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
70dd2af5d5
Merge pull request #14518 from mogemimi/fix-memory-leak-texture-cache
...
Fix memory leak when initWithImage() failed
2015-12-02 10:20:04 +08:00
0c67171b9d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-02 02:05:32 +00: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
e5d57b4fa2
update binding-generator sub module & code
2015-12-01 22:30:36 +08:00
54e13c3acd
update comment
2015-12-01 17:47:34 +08:00
ecf94a3dc4
Add a buffer queue to iOS Downloader
...
Upon calling NSURLSessionDownloadTask's resume, the task's timeout
countdown starts. When the AssetManagerEx starts downloading, it creates
all the tasks all at once and just `resume` upon creation. When the
number of asset files is very large, later tasks tend to end up in
'request timed out -1001' error before they can even start downloading.
This commit adds a buffer queue to prevent all the NSURLSessionTasks to
start all at once.
2015-12-01 17:24:26 +09:00
d174a98afa
Add a buffer queue for Android Downloader to prevent out of memory
...
When the AssetManagerEx start downloading, it used to create all the
download tasks all at once. When the app has a large number of asset
files, it is likely to crash due to out of memory when creating
threads for each of the download tasks. This commit adds a buffer
queue to the downloader to use the `countOfMaxProcessingTasks`
property from hints, preventing all the tasks from starting all at once.
2015-12-01 16:25:50 +09:00
ea077c5141
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
...
Conflicts:
cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +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
e891b03eee
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-01 04:32:19 +00:00
81f590e52a
Merge pull request #14478 from pandamicro/v3
...
Improved JS bindings with more secured memory management
2015-12-01 12:24:21 +08:00
d539e6c797
Fix memory leak when initWithImage() failed
2015-12-01 12:48:54 +09:00
23f03bc65f
update comment
2015-12-01 10:47:25 +08:00
11f1bd6e28
builtin material normal map support
2015-12-01 10:37:53 +08:00
a89976dead
Add enum value for no key
2015-12-01 03:01:42 +02:00
423726995c
Merge pull request #23 from liamcindy/pull_14393
...
update sprite 3d test
2015-11-30 16:56:33 +08:00
17bdfb4050
Fix android compilation issue
2015-11-30 15:20:57 +08:00
4d379ed9bd
revert ccplane
2015-11-30 14:53:37 +08:00
e0349ae975
update sprite 3d test
2015-11-30 14:48:19 +08:00
cbbfc69ad4
Add missing studio change for Director::drawScene
2015-11-30 11:19:02 +08:00
60624b8fd5
fix Keyboard fails to hide on iOS.
...
ticket: https://github.com/cocos2d/cocos2d-x/issues/14477
2015-11-28 15:37:58 +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
fdd3bacde1
Merge pull request #14509 from pmaloman/v3_Wrong_assert_in_ComponentContainer
...
Fixed assert statement. Added name to physic component.
2015-11-28 13:33:38 +08:00
89ef6da5b5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/2d/CCFontFNT.h
2015-11-28 12:48:55 +08:00
2571b87bda
Merge pull request #14505 from xiaofeng11/v3_iOSFix
...
Fix keyboard won't dismiss on iOS issue
2015-11-28 11:41:41 +08:00
43c68aa16b
Fix Chipmunk bindings issue
2015-11-27 22:38:16 +08:00
6e0525156b
no message
2015-11-27 23:33:20 +10:00
ca5ef5795e
fixes to local storage
2015-11-27 14:28:26 +03:00
150d907636
Add missing changes to Particle 3d
2015-11-27 19:01:30 +08:00
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
5c9084fd7d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-27 09:41:59 +00:00
0f8c3e0c1c
Merge pull request #14435 from zilongshanren/improve-label-layout-v2
...
Add Overflow to Label
2015-11-27 17:31:40 +08:00
c4b995fe59
updates to JniHelper, refactoring of existing JNI calls
2015-11-27 12:00:33 +03:00
71871bacf9
Add aabb dirty mark when load from file
2015-11-27 15:53:26 +08:00
f0cc8e7f25
Fix keyboard won't dismiss on iOS issue
2015-11-27 15:44:35 +08:00
8b631f5c9f
Fix compile failed on mobile platform
2015-11-27 15:19:50 +08:00
2d28b78e41
Add 3 missing class export
...
Change clearShader logic.
2015-11-27 14:58:18 +08:00
e13e0cb886
Fix getJSObject issues
2015-11-27 14:54:25 +08:00
d6ddb365b6
Remove boring logs in cocos studio supporting module.
...
They are helpless for debugging, we should use break points for debugging.
2015-11-27 14:43:25 +08:00
b55f040ec6
fix macro definition error
2015-11-27 14:23:17 +08:00
2a877ff234
Merge pull request #14429 from xiaofeng11/v3_combine_misc
...
Combine Studio change for get program file full path.
2015-11-27 14:15:37 +08:00
8e4276469c
Add comment to new function
2015-11-27 14:08:27 +08:00
a61fe711e2
Update
2015-11-27 14:01:43 +08:00
642e19baef
unify (No)Normal Mapping shaders
2015-11-27 13:15:33 +08:00
ec1d76b15e
Fix compile error
2015-11-27 13:08:22 +08:00
9e50c010e9
Fix win8.1 project compile error
2015-11-27 11:49:35 +08:00
92d7ccfbca
Merge pull request #14471 from super626/v3
...
release default fbo
2015-11-27 11:33:07 +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
3f9b40c093
Fix #14440
2015-11-26 22:22:04 -05:00
520aa9d351
Remove duplicated code by introduce a private doSetResponseCallback.
2015-11-26 22:22:04 -05:00
4bedfa4f14
Fixes boring deprecated warning.
...
I know I duplicated the code but there is no cpp for me to move body into.
2015-11-26 22:22:04 -05:00
1ee7b11e31
Refactor jsb_new_proxy and jsb_get_js_proxy with RootedObject
2015-11-27 10:20:51 +08:00
8320c2f702
Use rooted object for js_proxy new and get
2015-11-27 10:19:13 +08:00
d23ffe4fc7
Fix some issue of js_type_class usage
2015-11-27 10:16:11 +08:00
fc4c3ec650
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2015-11-27 09:34:31 +08:00
73c3a5dcf5
Activate DEBUG to test
2015-11-27 01:35:07 +08:00
ae2b75c8be
Fix issues causing by temporary RootedObject passed as function parameters
2015-11-27 01:35:06 +08:00
c50d686319
Merge pull request #14493 from xiaofeng11/v3_button
...
Fix button texture loaded mark has set to wrong value bug
2015-11-26 21:45:47 +08:00
d69453fa54
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine
2015-11-26 19:04:13 +08:00
24dc9f3392
update code as comment
2015-11-26 17:39:57 +08:00
58dd27efd3
add missing return type
2015-11-26 17:33:45 +08:00
f5f09133e6
Change ASSERT to safety mode
2015-11-26 16:49:01 +08:00
108d145bf0
Add missing luaval and color3b conversion function export
2015-11-26 15:08:49 +08:00
52f696945d
Remove condition MACRO and remove ASSERT in Sprite::initWithFile function
...
Remove CameraFlag define for Cocos Studio only
2015-11-26 14:47:37 +08:00
51cfbca523
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-26 06:02:24 +00:00
c3604aa865
Merge pull request #14470 from zilongshanren/fixListViewClippingIssue
...
Fix list view clipping issue
2015-11-26 13:51:51 +08:00
d744c167b7
Fix button texture loaded mark has set to wrong value bug
2015-11-26 13:49:32 +08:00
5221f8a6fc
improve the code by code review suggestions.
2015-11-26 12:03:18 +08:00
44d8aec4c9
Merge pull request #14484 from xiaofeng11/v3_fix
...
Change component resource load logic
2015-11-26 09:49:40 +08:00
397fa809da
Add default line width to create function
2015-11-26 09:32:57 +08:00
da9e8548a0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-25 17:29:11 +00:00
9ec451ca31
Update CCDrawNode, remove condition MACRO
2015-11-25 23:26:57 +08:00
928dc3ab1f
Add lua value conversion function for cocos studio
2015-11-25 23:03:25 +08:00
30a8873429
Fix app-project generates .lib file
2015-11-25 23:59:49 +09:00
145943068f
Add missing function export
2015-11-25 22:35:02 +08:00
9811d6efcf
Combine studio change for LuaBinding, jsb and simulator
2015-11-25 21:52:44 +08:00
eb47d28266
Change component resource load logic, won't dependent on sprite edit in other studio combine PR
2015-11-25 20:07:50 +08:00
584a5d7407
fix alphaThreshold undefined issue
2015-11-25 18:27:38 +08:00
b1490c96b6
Merge branch 'v3' into fixListViewClippingIssue
2015-11-25 18:25:40 +08:00
06c7b94440
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-25 09:28:43 +00:00
b0d88a552a
Merge pull request #14419 from xiaofeng11/v3_combine_ui
...
Combine Studio change for UI components
2015-11-25 17:19:54 +08:00
c202834312
Clean up manual bindings code, remove JS_THIS_OBJECT and JS_SET_RVAL
2015-11-25 14:33:43 +08:00
69b2b5720b
Use JS::PersistentRooted instead of JS::Heap to prevent delegates and wrappers internal js object from GC
...
More elegant and secured way, potential crashes exists in previous implementation
2015-11-25 14:32:19 +08:00
03046d6fbd
change the default alphaThreshold
2015-11-25 14:31:32 +08:00
759c0bbf31
rename CCStencilBitsManager to StencilStateManager
2015-11-25 14:24:27 +08:00
be2a3077c2
Remove useless manual bindings for addEventListener functions in UI
2015-11-25 14:15:45 +08:00
5fef088695
refactor stencil state management code
2015-11-25 14:14:17 +08:00
23f27534f6
Solve a possible memory leak in HttpRequest
2015-11-25 14:03:56 +08:00
09606e96cd
Add comment for new function
2015-11-25 11:33:24 +08:00
d0cd640ac8
Update
2015-11-25 11:15:17 +08:00
9241797acb
support normal mapping material
2015-11-25 10:45:03 +08:00
4ba6279a98
Merge pull request #14469 from super626/terrain
...
fix bug: Terrain::getIntersectionPoint when there is offset
2015-11-25 09:53:47 +08:00
c0f7ecfcde
User GetModuleFileNameW in all condition, it is more safe than _get_wpgmptr
2015-11-25 09:49:19 +08:00
866c992f41
add cocos2d namespace
2015-11-24 21:41:45 +08:00
3cc3325df8
Merge pull request #14414 from WenhaiLin/v3-win32-audiofix
...
AudioEngine[WIN32]:Fixed `FinishCallback` may not been invoked when the sound play completes.
2015-11-24 21:08:46 +08:00
27f6d6a6ba
Remove condition macro check.
2015-11-24 19:17:38 +08:00
722f20c4b6
Update implement remove condition macro check.
2015-11-24 18:29:58 +08:00
aa38dfba89
release default fbo
2015-11-24 18:11:16 +08:00
9c2130e88a
fix Layout and ClippingNode nested rendering issue
2015-11-24 18:01:50 +08:00
930405d52c
Remove useless manual bindings for MenuItems
2015-11-24 16:32:02 +08:00
1ac82fa273
fix terrain ray trace bug when there is offset
2015-11-24 15:13:52 +08:00
ded045ae26
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-24 07:01:07 +00:00
378cfa35b6
Merge pull request #14394 from super626/v3
...
Terrain: char* to string
2015-11-24 14:53:00 +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
e8d853934b
terrain lua bindings
2015-11-23 14:33:39 +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
23d8b63fca
update header file to fix studio UI js binding compile error
2015-11-23 11:41:42 +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
e145255479
Overhaul UTF modules and add full set of UTFs conversion functions.
2015-11-21 11:26:24 +08:00
9328a7c1d0
fix scalesprite opacity issue.
...
Ref: https://github.com/cocos2d/cocos2d-x/issues/14436
2015-11-20 17:35:29 +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
4829a037f7
Fix #14440
2015-11-20 15:57:26 +09:00
8c25749366
minor improvement
2015-11-20 10:54:05 +08:00
7803669e7a
Reverted curly braces change for consistency.
2015-11-19 16:17:54 +00:00
386c734b25
Merge pull request #14423 from xpol/fixes-boring-warnings
...
Fixes boring deprecated warning.
2015-11-19 18:29:12 +08:00
19257d6120
Add Overflow feature char map font.
...
1. fix single line clamp.
2015-11-19 18:14:46 +08:00
21d0ff846c
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-11-19 17:20:42 +08:00
0893d7d4ff
Fix text color parser for TextField widget
2015-11-19 17:17:17 +08:00
fbcf0680ae
Merge pull request #14430 from cocos2d/V3.9
...
V3.9
2015-11-19 17:06:07 +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
b6b35e0c74
Fix name space.
2015-11-19 15:47:36 +08:00
f4d317f1fd
Combine Studio change for get program file full path.
2015-11-19 15:21:14 +08:00
32f21ca5be
Binding ResouceData structure to js to fix auto compile error
2015-11-19 14:31:39 +08:00
d5b07e5b60
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-19 03:14:03 +00:00
7ea90c2d41
Merge pull request #14033 from m-yukio/feature/fixed-richtext
...
Support the new line element. Fixed a problem of UIRichText.
2015-11-19 11:05:08 +08:00
5369f9a84d
Add header file to make this pr can pass jenkins auto build
2015-11-19 10:14:27 +08:00
aa4c4a9e6c
Fix crash when using cocos2d::Controller on iOS6
2015-11-18 20:48:51 +00:00
9cbcd00798
some properties should be set
2015-11-18 22:47:26 +08:00
0b5a3465bc
Remove duplicated code by introduce a private doSetResponseCallback.
2015-11-18 17:52:24 +08:00
b33aa00109
Fixes boring deprecated warning.
...
I know I duplicated the code but there is no cpp for me to move body into.
2015-11-18 17:47:07 +08:00
02b59f020e
Fix onEndEditing issue in script.
...
Issue: https://github.com/cocos2d/cocos2d-x/issues/14332
2015-11-18 15:05:13 +08:00
bb83fe4596
Combine Studio change for UI components
2015-11-18 13:38:29 +08:00
2d97647177
update framework number
2015-11-18 10:55:10 +08:00
42fa33dc6e
AudioEngine[WIN32]:Fixed `FinishCallback` may not been invoked when the sound play completes.
2015-11-17 23:44:52 +08:00
50889c1c6c
Save _vertShader & _fragShader for PC platform only to decrease memory usage for mobile platform.
2015-11-17 14:29:56 +08:00
acd3b5cbc4
Combine Studio change for openGL related operation
2015-11-17 13:38:42 +08:00
0794c7a43c
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-17 04:09:43 +00: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
0b3a342222
Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets
...
Set focus for widgets
2015-11-17 11:24:27 +08:00
097f7a34e0
Merge pull request #14379 from mogemimi/fix-deprecated-warnings
...
Fix deprecated warnings
2015-11-17 11:19:07 +08:00
c4f9804f5b
Merge pull request #14404 from CocosRobot/update_lua_bindings_1447728669
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-17 10:56:58 +08:00
efde3c3a0e
Merge pull request #14403 from pandamicro/v3
...
Fix issue in ComponentJS::~ComponentJS
2015-11-17 10:56:37 +08:00
3ee2e7a490
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-17 02:56:26 +00:00
a5b7674b4d
Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4
...
improve scale9sprite
2015-11-17 10:48:09 +08:00
c77ea57fb1
Merge pull request #14399 from xiaofeng11/v3_combine_mac32compatible
...
Combine Studio change for compatible with 32 bit Mac System
2015-11-17 10:44:40 +08:00
5bc73c6ede
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-11-17 10:42:05 +08:00
e3c120eef4
Combine Studio change for compatible with 32 bit Mac System
2015-11-16 18:25:26 +08:00
e313f7be8b
Combine Studio change for ActionTimeline
2015-11-16 15:56:23 +08:00
eb644ee79f
Combine Studio change for 3d components
2015-11-16 15:05:43 +08:00
974bdba154
Fix issue in ComponentJS::~ComponentJS
2015-11-16 11:50:48 +08:00
d47a79c0e4
Remove cocos studio limitation for new functions
2015-11-16 11:08:20 +08:00
b99b3d1112
Remove `CC_DLL` in front of `createSpriteFromBase64()` in ccUtils.h to avoid compilation error on windows platform
2015-11-15 23:02:43 +09:00
603d788fbf
PageView - Fix that page indicator was not working well in vertical page view.
2015-11-15 22:49:42 +09:00
b0ae23d567
PageView - Add more comments
2015-11-15 22:49:42 +09:00
ad134a6363
PageView - Fix that the indicator's direction is not appropriate when `PageView::setDirection()` is called before `PageView::setIndicatorEnabled(true)`.
2015-11-15 22:49:42 +09:00
9ec1e2069a
Fix deprecated warnings
2015-11-13 14:38:48 +09:00
140eaf7b6c
Fix function name in cpp file
2015-11-13 09:09:02 +08:00
4c8066e39f
Normalize function names.
2015-11-12 18:23:56 +08:00
39a6f1e8f1
char* to string
2015-11-12 18:08:29 +08:00
1546a062a1
Update
2015-11-12 10:57:22 +08:00
c40a2a3301
Combine Studio change for 2d components
2015-11-12 09:49:49 +08:00
4ccc6ce5de
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-11 06:53:45 +00:00
8695fbe711
Merge pull request #14172 from njh0602/somefix2
...
Add virtual keyword.
2015-11-11 14:17:27 +08:00
6fc7aca423
Merge pull request #14153 from Fraggle/patch-1
...
PMA Handling issue
2015-11-11 14:14:22 +08:00
ac06c9f8bb
Merge pull request #14260 from pyrosphere/add-app-version
...
Added Application::getVersion() to get the app version.
2015-11-11 14:13:42 +08:00
3963e8a774
Merge pull request #14333 from nhuanvd/cocos2dxactivity_bugfix
...
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
2015-11-11 14:10:24 +08:00
5ff7cac4ae
Merge pull request #14298 from TheCodez/patch-1
...
Fix #14298
2015-11-11 14:04:40 +08:00
f604f66539
Update only frame size on window resize
2015-11-11 04:42:58 +02:00
eb8b761381
Add option to create resizable window
2015-11-11 01:17:48 +02:00
d86d32fb09
constexpr for signature, garbage collection and compile-time error for unsupported argument types
2015-11-10 23:39:16 +03:00
94637bef2f
PageView - Change to keep some of the original API names because it makes more sense.
2015-11-10 21:35:01 +09:00
9cbbd283c7
PageView - Deprecate the APIs related to custom scroll threshold.
2015-11-10 21:35:01 +09:00
049607b5d8
Replace tab indents to 4 spaces.
2015-11-10 21:03:51 +09:00
1f0c498bcb
Fixed actionNode position error bug
2015-11-09 19:45:17 +08:00
c08b4a0f9d
Merge pull request #14343 from super626/v3
...
fix cull face for render queue
2015-11-09 12:51:39 +08:00
9d2fca6d34
fix cull face for render queue
2015-11-09 10:42:12 +08:00
80e8b58b53
easy jni
2015-11-07 23:57:05 +03:00
c0c35c603e
Update version number & RELEASE_NOTES.md, prepare 3.9 release
2015-11-06 18:38:09 +08:00
fec8a5db02
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
2015-11-06 13:05:40 +07:00
8183d34b68
revert old timelineParser-2.x.js and add "||false" to it.
2015-11-06 12:50:36 +08:00
76ed15591f
Update web submodule to latest.
2015-11-06 11:56:45 +08:00
81cb13a159
Merge pull request #14328 from xiaofeng11/v3
...
Fix "TextureCache Test" in js-test crash under Android
2015-11-06 10:56:31 +08:00
139d8b5310
Remove unused code
2015-11-06 10:10:09 +08:00
1a56668cd3
Fix "TextureCache Test" in js-test crash under Android
2015-11-06 09:49:19 +08:00
c1a64e9243
new implementation of EditBoxImpl-win32
2015-11-06 02:14:34 +08:00
3016bf696a
fix updateVerticesForLOD
2015-11-05 15:18:46 +08:00
a4c4c64069
cleanup SIOClientImpl when an unexpected close happens
2015-11-05 13:08:33 +11:00
f7803cba19
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-04 11:09:49 +00:00
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
7d93b419fd
Merge pull request #14303 from xiaofeng11/v3_fix
...
Fix ComponentTest in la-test can not load lua file under iOS & Android
2015-11-04 13:52:14 +08:00
e13c9a8d8d
Merge pull request #14313 from super626/v3
...
Function genMaterial keeps old state block
2015-11-04 13:45:36 +08:00
16a79ed9df
function genMaterial keeps old state block
2015-11-04 11:10:28 +08:00
dfe56769a1
added missing Light3DReader files
2015-11-03 08:04:55 -08:00
4d0098c6be
Merge pull request #14299 from mogemimi/fix-docs-typo
...
Fix typos in documentation
2015-11-03 18:12:21 +08:00
3223a97b26
Fix ComponentTest in la-test can not load lua file under iOS & Android
2015-11-03 15:49:46 +08:00
872141d547
update for light3d reader
2015-11-03 13:34:21 +08:00
8f632365c3
Fix typos in documentation
2015-11-03 04:43:44 +09:00
4f89828625
Removed PhysicsBody::update from PhysicsWorld
2015-11-02 14:18:21 +01:00
7fe2b87574
CREATE_FUNC macro NULL -> nullptr
2015-10-31 20:18:39 +09:00
61ce3e8a03
Fixed warnings about missing override in CCApplication for iOS/Mac
2015-10-30 10:02:07 +00:00
c80f523637
Merge pull request #14269 from pandamicro/v3
...
[ci skip]Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
2015-10-30 17:20:58 +08:00
246eab11a1
Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
2015-10-30 17:19:21 +08:00
Xpol Wan