minggo
3dc167a9f9
use std::abs instead
2016-07-11 12:01:09 +08:00
minggo
a146f3eec7
use std::srand() instead
2016-07-11 11:17:28 +08:00
mogemimi
7531c5156b
Fix documentation when compile with -Wdocumentation and Clang
2016-07-10 17:38:32 +09:00
Ricardo Quesada
995868c62e
fix: Text::create() does not crash on mac/ios
...
...on invalid unicode.
fixes issue #16073
2016-07-08 16:59:44 -07:00
minggo
c267167d07
Merge pull request #16069 from minggo/ndkr12b-issue
...
fix compiling and linking error with ndk r12b
2016-07-08 17:01:09 +08:00
minggo
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
minggo
8d8c295ff0
Merge pull request #16062 from minggo/fileutils-issue
...
fix bug that FileUtils::removeDirectory() can not work on all platforms except iOS and Mac
2016-07-08 14:54:25 +08:00
CocosRobot
8fe92fbd4b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-07 19:04:04 +00:00
Ricardo Quesada
891fe706da
Merge pull request #16057 from ricardoquesada/issue_12226
...
test: add test case for Github issue #12226
2016-07-07 08:34:30 -07:00
minggo
836acff6d0
Merge pull request #16060 from minggo/merge-v312
...
Merge v312
2016-07-07 18:29:28 +08:00
minggo
4511b35b51
fix bug that FileUitls::removeDirectory() can not work on all platforms except iOS and Mac
2016-07-07 17:43:19 +08:00
minggo
734d857ced
Merge branch 'v3.12' into merge-v312
2016-07-07 15:13:21 +08:00
Ricardo Quesada
6d5a94e569
test: add test case for Github issue #12226
...
Adds test case for Github issue #12226
2016-07-06 16:37:15 -07:00
mogemimi
6ce7f3c0e9
Avoid overhead of casting float to double
2016-07-07 01:38:27 +09:00
minggo
8d6acd9ffe
Merge pull request #16050 from pandamicro/v3.12
...
[ci skip]Update JS versions
2016-07-06 17:04:42 +08:00
pandamicro
ccb30cefc7
Update JS versions
2016-07-06 17:02:53 +08:00
minggo
6248480b3a
Merge pull request #16047 from minggo/issue-14071
...
[ci skip]convert aplpha channel correctly
2016-07-06 15:59:50 +08:00
minggo
d0db838b71
convert aplpha channel correctly
2016-07-06 15:49:05 +08:00
minggo
418907d972
Merge pull request #16044 from pandamicro/v3.12
...
Improve web template and update web ref
2016-07-06 14:47:23 +08:00
pandamicro
305bd95dc2
More secure release in JSB_closeWindow
2016-07-06 13:55:18 +08:00
CocosRobot
cf2646b7a2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-06 02:16:03 +00:00
mogemimi
bed4e048b6
Fix various typos
2016-07-06 08:27:39 +09:00
minggo
2f1e14dcde
fix compiling error
2016-07-05 14:28:30 +08:00
minggo
4c2efb1319
don't read file content if it is empty
2016-07-05 14:27:28 +08:00
minggo
33d1eb4455
don't invoke front() if container is empty
2016-07-05 14:27:11 +08:00
minggo
e4aa6d1ef7
Merge pull request #16035 from minggo/issue-16032
...
remove extra '\'
2016-07-05 14:22:19 +08:00
minggo
0cc8b9fc09
Merge pull request #16031 from MrCapone/fix_GLView
...
GLView::setFrameSize fixed
2016-07-05 09:54:59 +08:00
minggo
1c9ad5594c
remove extra '\'
2016-07-05 09:50:38 +08:00
minggo
f666d99192
Merge pull request #16021 from yalab/cocosstudio_with_texturepacker
...
Fixed to use TexturePacker with cocosstudio.
2016-07-05 09:35:59 +08:00
mogemimi
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
mr_capone-win7
0e64c2a071
GLView::setFrameSize fixed
2016-07-04 19:48:24 +07:00
minggo
b9d6f0d8d6
Merge pull request #16027 from CocosRobot/update_lua_bindings_1467596228
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 11:00:49 +08:00
minggo
ca8ff36f2e
Merge pull request #16016 from LeeMyoungYeol/v3
...
Update utils::getTimeInMilliseconds()
2016-07-04 10:55:41 +08:00
CocosRobot
934b2413dc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 01:40:35 +00:00
minggo
8bbeb01be4
Merge pull request #16025 from mogemimi/fix-doc-typo
...
Fix typos and other mistakes in docs
2016-07-04 09:33:29 +08:00
minggo
b380df97c6
Merge pull request #16022 from mogemimi/fix-format-string
...
Fix format string warning when compiling with Android NDK
2016-07-04 09:31:45 +08:00
mogemimi
2443e09d29
Fix typos and other mistakes in docs
2016-07-04 00:42:10 +09:00
mogemimi
57900112c5
Fix format string warning when compiling with Android NDK
2016-07-03 17:19:17 +09:00
CocosRobot
f30a7cf546
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-03 05:14:11 +00:00
yalab
35968a6fc1
Slidebar can load TextureCache on cocosstudio.
2016-07-02 18:45:20 +09:00
yalab
c675675de5
Fixed to use TexturePacker with cocosstudio.
2016-07-02 17:31:32 +09:00
Ricardo Quesada
f7d65fbe8a
Squashed commit of the following:
...
commit 3a8ccb54b58f01daaa5b17efcd0e1ab4b7ccf914
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 1 11:05:02 2016 -0700
Add support for Hex tiled maps
Based on original patch by https://github.com/JustVic
Original patch:
https://github.com/cocos2d/cocos2d-x/pull/13288
fix: tiled hex maps
Hexagonal TileMaps Support
fix: odd, even works as expected
still problems with rendering order
fix: fixes layer position in Hex
fix render ordering
2016-07-01 15:51:00 -07:00
minggo
c1949be617
Merge pull request #16017 from minggo/issue-15978
...
don't search APK if the path is absolute
2016-07-01 17:21:37 +08:00
minggo
12442521b2
don't search APK if the path is absolute
2016-07-01 15:42:02 +08:00
이명열
853e083c68
- The result comes across as negative.(device android)
2016-07-01 15:32:43 +09:00
mogemimi
2354df9faf
Fix getSubStringOfUTF8String bug
2016-07-01 15:16:35 +09:00
pandamicro
d02bdda781
Fix callfunc released with retained data (callback, target, extradata) issue
2016-07-01 10:56:17 +08:00
CocosRobot
94de257115
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-01 02:16:32 +00:00
minggo
043d81be1c
Merge pull request #16008 from yalab/cocosstudio_with_texturepacker
...
cocosstudio can manage TexturePacker Image.
2016-07-01 10:10:09 +08:00
halx99
2610ad77cc
#15965 : remove unused _orderOfArrival ( #16009 )
2016-07-01 10:09:25 +08:00
yalab
c5648db10a
cocosstudio can manage TexturePacker Image.
2016-06-30 18:10:08 +09:00
CocosRobot
274a82c7f5
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16001 )
2016-06-29 22:56:13 +08:00
minggo
47442b9d8b
Merge pull request #15997 from mogemimi/fix-variable-names
...
Fix some minor typos in local variable names
2016-06-29 14:24:00 +08:00
CocosRobot
ef01ac4465
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-29 04:47:21 +00:00
Ricardo Quesada
b1f93b2679
fix: not leak Toggle items
...
Github issue: fixes #13351
2016-06-28 20:41:47 -07:00
mogemimi
c0f2194961
Fix some minor typos in local variable names
2016-06-29 11:04:11 +09:00
Drakon-Cocos
7302ad979a
Can set scroll to item duration in ListView and derived classes ( #15964 )
...
* Can set scroll to item duration in ListView and derived classes (e.g. PageView)
* Parameter no more 'const'. Comments
2016-06-29 09:48:03 +08:00
minggo
ecf97575ad
Revert "Added CCGLViewImpl.h"
2016-06-29 09:45:05 +08:00
minggo
feb513c7eb
Merge pull request #15982 from mogemimi/fix-typo
...
Fix typo: destoryMark -> destroyMark
2016-06-29 09:41:59 +08:00
minggo
076e0b488b
Merge pull request #15980 from minggo/merge-v312
...
Merge v312
2016-06-29 09:41:30 +08:00
kuzy000
8598003b55
Added CCGLViewImpl.h ( #10501 )
...
* Added CCGLViewImpl.h for more consistency
* fixed indentation
2016-06-29 09:36:13 +08:00
mogemimi
2060b333ca
Fix typo: destoryMark -> destroyMark
2016-06-29 10:04:31 +09:00
minggo
0c290540df
Merge pull request #9823 from ericmux/frame-independent-ms
...
Making CCMotionStreak _maxPoints framerate independent.
2016-06-28 18:29:14 +08:00
minggo
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
pandamicro
d46cd96896
Don't warn user about API deprecation
2016-06-28 12:11:21 +08:00
pandamicro
e7e365a00f
Fix window.close crash in JSB
2016-06-28 11:59:55 +08:00
mogemimi
2a853ba73e
Avoid const_cast when calling Node::setAdditionalTransform
2016-06-27 19:33:45 +09:00
minggo
d7cb7676bc
Merge pull request #15966 from mogemimi/improve-refptr
...
Improve RefPtr to avoid casting when possible
2016-06-27 10:07:54 +08:00
mogemimi
a287e696c9
Improve RefPtr to avoid casting when possible
2016-06-26 21:39:43 +09:00
Alfonso Grillo
b6fa894f81
Fix page view indicator opacity for inactive pages
2016-06-25 18:49:13 +02:00
mogemimi
bc51528301
Fix typo in FileUtils::Status enum
2016-06-25 12:58:55 +09:00
Ricardo Quesada
04a01b65f4
fix: FPS appears on iOS
...
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits
Github issue #15934
2016-06-24 11:44:55 -07:00
Ricardo Quesada
4f973044ac
fix: FPS appears on iOS
...
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits
github issue #15934
2016-06-24 11:40:13 -07:00
minggo
26fb64395a
Merge pull request #15954 from pandamicro/v3.12
...
Fix easing action crash because the js object is not rooted
2016-06-24 17:21:41 +08:00
Ricardo Quesada
0872cccd67
fix: collection of vr fixes ( #15948 )
...
* fix: collection of vr fixes
* Node::additionalTransform() and Node::setNodeToParentTransform() can be used at the same time
* Node allocs _additionalTransform in runtime taking 60 bytes lees for 99% of the nodes
* Node calculates the transform faster when an additionalTransform is being used
* VR works when the camera is being moved manually with setNodeToParentTransform
* VR has its own tests
* VR can be disabled and works as expected
* doc: documentation for the new fix
* fix: restore submodule web
* fix: compile and link on iOS
* fix conflicts
2016-06-24 16:55:28 +08:00
pandamicro
8cb2e93644
Fix easing action crash because the js object is not rooted
2016-06-24 14:38:59 +08:00
mogemimi
0dce4961ee
Avoid implicit conversion from size_t to int
2016-06-24 15:15:45 +09:00
minggo
2931b310cf
Merge pull request #15942 from zilongshanren/improveEditBox
...
Improve edit box
2016-06-24 10:27:22 +08:00
minggo
b29fbf0fc8
Merge pull request #15885 from Sumxx/v3
...
fix restart game crash in FT_Get_Char_Index
2016-06-24 10:08:32 +08:00
Ricardo Quesada
69d2ac1786
fix: collection of vr fixes ( #15947 )
...
* fix: collection of vr fixes
Node: additionalTransform() has its own dirty variable
VR: disabling VR works as expected
VR: works with camera3d test
VR: iOS Tracking works even if it doesn't have any input
fix: setNodeToParentTransform() and setAdditionalTransfrom() work...
...at the same time.
Also, this PR makes the size of Node smaller. `_additionalTransform` is
no longer an inline object.
Instead, it is allocated on demand making 99% of the Nodes smaller by 60
bytes.
fix: compile in windows
* doc: documentation for this fix
2016-06-24 10:03:38 +08:00
minggo
86af4cdab8
Merge pull request #15897 from halx99/patch-4
...
luabindings: Add script with utf-8 bom support.
2016-06-24 09:58:41 +08:00
minggo
dbc083b924
Merge pull request #15939 from halx99/patch-2
...
Optimize, remove unnecessory truncate.
2016-06-24 09:54:57 +08:00
minggo
1042b18999
Merge pull request #15936 from mogemimi/use-nullptr-instead
...
Use nullptr instead of 0 or NULL whenever possible
2016-06-24 09:54:15 +08:00
mogemimi
b7982fd8e0
Fix -Wreturn-type warnings when compiling JSB with Clang
2016-06-24 08:48:21 +09:00
Ricardo Quesada
e681a9b5d1
fix: fix delay when creating QuadCommands
...
starts with a bigger buffer, and also increases buffer by 25% if needed.
triggered by particles.
Github issue #15937
2016-06-23 09:19:21 -07:00
Ricardo Quesada
9e0371a3b8
fix: fix delay when creating quadcomamnds
...
triggered by particles.
Github issue #15937
2016-06-23 09:17:26 -07:00
zilongshanren
459b7f30c6
refactoring Android editbox setVisible API
...
fix set visible issue of android editbox
fix android lower case multiline
revert unkown changes
2016-06-23 18:18:39 +08:00
halx99
cd93612746
Optimize, remove unnecessory truncate.
2016-06-23 16:01:05 +08:00
zilongshanren
a6b0ea76de
improve editbox test and font creation
2016-06-23 15:57:41 +08:00
minggo
ee7ceee007
Merge pull request #15874 from mogemimi/fix-unused-variable
...
Fix unused variable warnings when compiling release mode
2016-06-23 15:55:11 +08:00
minggo
08898db883
Merge pull request #15831 from j-jorge/premultiplied-alpha-config
...
Add a config option to enable or disable the premultiplied alpha code.
2016-06-23 13:57:41 +08:00
halx99
ba55723178
Update CCLuaStack.cpp
2016-06-23 13:42:38 +08:00
mogemimi
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
halx99
90434e58d0
fix compile error.
2016-06-23 11:37:20 +08:00
子龙山人
bac1870d16
fix android editbox custom font file ( #15924 )
...
* fix android editbox custom font file
* simplify get real font name on Android
2016-06-23 11:26:32 +08:00
halx99
c4def57774
Update CCLuaStack.cpp
...
Lua script utf-8 bom support, handle encrypted script.
2016-06-23 10:24:22 +08:00
minggo
597fb61a78
Merge pull request #15922 from dumganhar/fix/lua-binding
...
Some lua bindings fixes:
2016-06-23 10:00:45 +08:00
Ricardo Quesada
ec5155137f
Merge pull request #15933 from ricardoquesada/issue15932
...
fix: not crash after removing a physics body right after...
2016-06-22 15:28:56 -07:00
Ricardo Quesada
ff71ffae84
fix: not crash after removing a physics body right after...
...
adding it.
2016-06-22 14:12:27 -07:00
Ricardo Quesada
a31279f8cb
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow setAdditionalTransform() breaks
setNodeToParentTransform(). And since setAdditionalTransform is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:28:58 -07:00
Ricardo Quesada
edafe726cc
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow `setAdditionalTransform()` breaks
`setNodeToParentTransform()`. And since `setAdditionalTransform` is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:22:47 -07:00
minggo
7828b505fe
Merge pull request #15925 from minggo/andriod-preload
...
[ci skip]return true for preload though it is not implemented
2016-06-22 18:19:09 +08:00
minggo
82597d4305
Merge pull request #15920 from dumganhar/fix/particle
...
Fix ParticleSystem::_paused varible isn't initialized. Particle will show or hide after being created randomly.
2016-06-22 18:10:55 +08:00
minggo
324931a242
Merge pull request #15919 from zilongshanren/fix-android-system-fontname
...
fix system font creation on Android platform
2016-06-22 18:10:13 +08:00
James Chen
710ab777dd
Some lua bindings fixes:
...
1) Reverts changes in #15443 , the behavor of LuaEngine::handleCommonEvent should not be changed. empty eventName should be supported, otherwise it will break compatiblity.
2) Null pointer check in CommonScriptData initialization
3) No error callback in lua (fixed #15904 )
2016-06-22 17:48:17 +08:00
minggo
465da95c01
return true for preload though it is not implemented
2016-06-22 17:41:04 +08:00
James Chen
09d5fd3f90
Fix ParticleSystem::_paused varible isn't initialized. Particle will show or hide after being created randomly.
2016-06-22 16:54:57 +08:00
zilongshanren
783dfb3f14
fix system font name on Android ttf creation
2016-06-22 16:54:01 +08:00
James Chen
67dd4b0684
JSScript* may be garbage collected before the next time execute the same JS file.
...
It will crash in JS_ExecuteScript.
2016-06-22 16:18:20 +08:00
minggo
9fd190d283
Merge pull request #15916 from dumganhar/fix/AssetsManager
...
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 15:25:18 +08:00
James Chen
8e19db7d26
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 14:31:26 +08:00
CocosRobot
4a5bedc6e6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-22 05:52:51 +00:00
minggo
9d0801834e
Merge pull request #15893 from halx99/patch-1
...
Optimize, avoid unnecessary memory alloc & copy
2016-06-22 13:44:40 +08:00
minggo
cdc3b2b9f1
Merge pull request #15903 from minggo/fileutil-directory-exists
...
should use full path to check directory
2016-06-22 13:40:07 +08:00
James Chen
cffc9cecd7
cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this.
2016-06-22 11:05:04 +08:00
mogemimi
a3bc979452
Fix typos in documentation and comments
2016-06-22 11:22:05 +09:00
minggo
6b9c76fd93
should use full path to check directory
2016-06-22 10:19:35 +08:00
Ricardo Quesada
414f1d4252
fix: little menu fixes
...
does not execute `dynamic_cast<>` in release mode
uses for(:) instead of the old way
2016-06-21 16:46:27 -07:00
zilongshanren
2d3785c03d
fix tizen compile error
2016-06-21 19:50:00 +08:00
halx99
f41130bafe
luabindings: Add script with utf-8 bom support.
2016-06-21 14:31:25 +08:00
halx99
654d17d27c
Update CCFontFNT.cpp
2016-06-21 11:25:11 +08:00
halx99
51ba45ae26
Optimize, avoid unnecessary memory alloc & copy
2016-06-21 10:52:25 +08:00
Ricardo Quesada
ca677f2be1
fix: not crash if CC_SPRITE_DEBUG_DRAW is enabled in SpriteBatchNode
...
`SpriteBatchNode` was trying to render `DrawNode` when
`CC_SPRITE_DEBUG_DRAW` was enabled.
Github issue #14730
2016-06-20 19:13:53 -07:00
Julien Jorge
6fb3946c51
Add a config option to enable or disable the premultiplied alpha code.
2016-06-20 18:05:11 +02:00
minggo
ad28d44d2f
Merge pull request #15878 from cezheng/build_for_android6/downloader
...
fix downloader build issue for Android API 23
2016-06-20 13:38:22 +08:00
mogemimi
f0028e5459
Fix unused variable warnings when compiling release mode
2016-06-20 09:23:42 +09:00
sum
4700bbce43
fix restart game crash in FT_Get_Char_Index
2016-06-19 03:22:57 +08:00
Ricardo Quesada
35008702bf
fix: underline will have the same solor as text in TTF
...
underline will have the same solor as text in TTF when calling
`setColor`. There is another method called `setTextColor` which is
confusing. What does each function?
github issue #15214
2016-06-17 17:23:59 -07:00
Ricardo Quesada
d9b3ef55ae
Merge pull request #15880 from ricardoquesada/issue-15776
...
fix: TextureCache ASSERTS if image is invalid
2016-06-17 16:48:19 -07:00
Ricardo Quesada
c387f953fa
fix: TextureCache ASSERTS if image is invalid
...
Github issue #15776
2016-06-17 16:07:33 -07:00
Ce Zheng
84db1ac294
fix downloader build issue for Android API 23
...
fixes #15823
2016-06-17 22:32:49 +09:00
minggo
ed955cbe1d
update version
2016-06-17 18:09:27 +08:00
CocosRobot
4c233b8df7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-17 02:22:58 +00:00
minggo
6778ebf451
Merge pull request #15853 from ricardoquesada/vr_squashed
...
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
minggo
e9cf762304
Merge pull request #15866 from minggo/remove-compiling-flag
...
remove gcc comipling flag
2016-06-17 09:39:18 +08:00
minggo
6280b8a376
Merge pull request #15870 from mogemimi/fix-unused-function
...
Remove unused debug function in RenderCommand
2016-06-17 09:38:32 +08:00
minggo
44ced37785
Merge pull request #15825 from dumganhar/iss15652-perf-fix
...
issue #15652 : fix low FPS on some android devices while auto batch is disabled.
2016-06-17 09:37:42 +08:00
mogemimi
0872a50f60
Remove unused debug function in RenderCommand
2016-06-17 03:19:19 +09:00
Ricardo Quesada
08ed2eccd2
fix: using `enum class` instead of `typedef enum`
2016-06-16 07:02:04 -07:00
minggo
832ec5eab4
remove gcc comipling flag
2016-06-16 16:14:50 +08:00
minggo
0db0a45fa0
Merge pull request #15863 from zilongshanren/fix-word-clamp-with-only-one-word-left
...
fix TTF and BMFont word wrap
2016-06-16 15:01:27 +08:00
minggo
9b210e00d7
Merge pull request #15837 from geemedia/cmake-improvements
...
Various CMake improvements
2016-06-16 14:53:10 +08:00
minggo
d66b686bd8
Merge pull request #15816 from yalab/valuemap_reject_none
...
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-16 14:20:46 +08:00
zilongshanren
f0f8663fa9
fix TTF and BMFont word wrap
2016-06-16 14:15:00 +08:00
mogemimi
01aaff66c8
Fix -Wsometimes-uninitialized warning in release build
2016-06-16 14:27:52 +09:00
minggo
5fa57ae5c1
Merge pull request #15844 from halx99/patch-1
...
fix: missing properties for clone
2016-06-16 11:15:13 +08:00
minggo
ab0e461b00
Merge pull request #15852 from MSOpenTech/v3-winrt-x64
...
V3: updated to support Windows 10 UWP x64 builds
2016-06-16 11:08:28 +08:00
minggo
d8bd0ff8c8
Merge pull request #15855 from mogemimi/fix-possible-leak
...
Fix possible memory leak when pass initialization fails
2016-06-16 11:04:03 +08:00
CocosRobot
cc2b887dbb
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-16 02:58:46 +00:00
minggo
b0f3d43414
Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb
...
RenderTexture - set opacity modify RGB
2016-06-16 10:52:21 +08:00