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
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
0977fc87f2
Merge pull request #15952 from mogemimi/fix-implicit-conversion
...
Avoid implicit conversion from size_t to int
2016-06-24 17:22:56 +08:00
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
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
8cb2e93644
Fix easing action crash because the js object is not rooted
2016-06-24 14:38:59 +08:00
0dce4961ee
Avoid implicit conversion from size_t to int
2016-06-24 15:15:45 +09:00
c4efd066f3
Merge pull request #15951 from pandamicro/v3.12
...
Remove cocos studio tests in JS-tests
2016-06-24 14:00:55 +08:00
d643b306ef
Remove cocos studio tests in JS-tests
2016-06-24 13:50:24 +08:00
b8b362df92
Merge branch 'v3.12' of github.com:cocos2d/cocos2d-x into v3.12
2016-06-24 10:51:46 +08:00
2931b310cf
Merge pull request #15942 from zilongshanren/improveEditBox
...
Improve edit box
2016-06-24 10:27:22 +08:00
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
21a78dce09
Update web engine ref
2016-06-24 10:03:56 +08:00
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
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
dbc083b924
Merge pull request #15939 from halx99/patch-2
...
Optimize, remove unnecessory truncate.
2016-06-24 09:54:57 +08:00
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
756caf215f
Merge pull request #15941 from natural-law/v3
...
Change the implementation of checking NDK path on windows.
2016-06-24 09:49:55 +08:00
41ed6f6a6a
Merge pull request #15949 from mogemimi/fix-wreturn-type
...
Fix -Wreturn-type warnings when compiling JSB with Clang
2016-06-24 09:47:37 +08:00
7a259fe8d9
Merge pull request #15946 from ricardoquesada/issue15937_v312
...
fix: fix delay when creating quadcommands
2016-06-24 09:32:22 +08:00
b7982fd8e0
Fix -Wreturn-type warnings when compiling JSB with Clang
2016-06-24 08:48:21 +09:00
46d760e995
Merge pull request #15945 from ricardoquesada/issue15937
...
fix: fix delay when creating quadcommands
2016-06-23 10:23:22 -07:00
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
9e0371a3b8
fix: fix delay when creating quadcomamnds
...
triggered by particles.
Github issue #15937
2016-06-23 09:17:26 -07:00
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
c2d930df00
Change the implementation of checking NDK path on windows.
2016-06-23 17:09:07 +08:00
cd93612746
Optimize, remove unnecessory truncate.
2016-06-23 16:01:05 +08:00
a6b0ea76de
improve editbox test and font creation
2016-06-23 15:57:41 +08:00
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
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
ba55723178
Update CCLuaStack.cpp
2016-06-23 13:42:38 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
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
c4def57774
Update CCLuaStack.cpp
...
Lua script utf-8 bom support, handle encrypted script.
2016-06-23 10:24:22 +08:00
597fb61a78
Merge pull request #15922 from dumganhar/fix/lua-binding
...
Some lua bindings fixes:
2016-06-23 10:00:45 +08:00
ac67f8eeb1
Merge pull request #15931 from ricardoquesada/issue15909_v312
...
fix: reverse iterator on events + doesn't use additionalTransform
2016-06-23 10:00:09 +08:00
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
1ab927dae5
Merge pull request #15930 from ricardoquesada/issue15909
...
fix: reverse iterator on events + doesn't use additionalTransform
2016-06-22 14:55:50 -07:00
ff71ffae84
fix: not crash after removing a physics body right after...
...
adding it.
2016-06-22 14:12:27 -07:00
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
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
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
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
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
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
e1e522bd53
Merge pull request #15921 from pandamicro/v3.12
...
Update html5 engine to v3.12
2016-06-22 17:43:27 +08:00
465da95c01
return true for preload though it is not implemented
2016-06-22 17:41:04 +08:00
2a659b932a
Update html5 engine to v3.12
2016-06-22 17:39:47 +08:00
683a4bfec6
Fix tests for v3.12 web
2016-06-22 17:39:38 +08:00
Ricardo Quesada