Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,520 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

35520 Commits

Author SHA1 Message Date
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
pandamicro 21a78dce09 Update web engine ref 2016-06-24 10:03:56 +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
minggo 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
minggo 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
minggo 7a259fe8d9 Merge pull request #15946 from ricardoquesada/issue15937_v312 
fix: fix delay when creating quadcommands
 2016-06-24 09:32:22 +08:00
mogemimi b7982fd8e0 Fix -Wreturn-type warnings when compiling JSB with Clang 2016-06-24 08:48:21 +09:00
Ricardo Quesada 46d760e995 Merge pull request #15945 from ricardoquesada/issue15937 
fix: fix delay when creating quadcommands
 2016-06-23 10:23:22 -07: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
zhangbin c2d930df00 Change the implementation of checking NDK path on windows. 2016-06-23 17:09:07 +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
minggo 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
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 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
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 e1e522bd53 Merge pull request #15921 from pandamicro/v3.12 
Update html5 engine to v3.12
 2016-06-22 17:43:27 +08:00
minggo 465da95c01 return true for preload though it is not implemented 2016-06-22 17:41:04 +08:00
pandamicro 2a659b932a Update html5 engine to v3.12 2016-06-22 17:39:47 +08:00
pandamicro 683a4bfec6 Fix tests for v3.12 web 2016-06-22 17:39:38 +08:00
minggo 5c665e7ddb Merge pull request #15918 from dumganhar/fix/scripting-core 
JSScript* may be garbage collected before the next time executing the same JS file.
 2016-06-22 17:25:25 +08:00
zilongshanren 8366983a01 fix js ui test missing UITest.json 2016-06-22 17:01:53 +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
minggo b2c5e092e4 Merge pull request #15915 from minggo/lua-remove-studio-test 
[ci skip]remove studio related test cases
 2016-06-22 14:11:46 +08:00
minggo 131ed58552 Merge pull request #15913 from CocosRobot/update_lua_bindings_1466574582 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-06-22 14:07:59 +08:00
minggo 359fdb92f2 remove studio related test cases 2016-06-22 14:05:58 +08:00