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

36397 Commits

Author SHA1 Message Date
子龙山人 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
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 98706e2350 Merge pull request #15905 from mogemimi/fix-doc-typos 
Fix typos in documentation and comments
 2016-06-22 13:40:47 +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
minggo dd07f8684c Merge pull request #15910 from dumganhar/xcode-proj-fix 
Adds missing ccs-res folder to XCode project.
 2016-06-22 13:38:27 +08:00
minggo 6207d0cd3d Merge pull request #15911 from dumganhar/fix/socket-io-test 
SocketIOTest: url fix
 2016-06-22 13:37:45 +08:00
minggo 99ea0299c8 Merge pull request #15908 from dumganhar/deprecated-method 
cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this.
 2016-06-22 13:37:11 +08:00
James Chen beee9a664e SocketIOTest: url fix 2016-06-22 12:10:19 +08:00
minggo 458b43f193 Merge pull request #15906 from geemedia/fix-simulator-build 
Fixed simulator project files to add tinyxml2 to the include paths
 2016-06-22 11:41:25 +08:00
James Chen e1d39343d3 Adds missing ccs-res folder to XCode project. 2016-06-22 11:31: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
Adrien de Sentenac b84f935886 Fixed simulator project files to add tinyxml2 to the include paths 2016-06-21 22:30:58 -04: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
子龙山人 7eb1ffba3f Merge pull request #15899 from zilongshanren/fix-tizen-compile-error 
fix tizen compile error
 2016-06-22 09:51:57 +08:00
Ricardo Quesada 63e72ecf70 Merge pull request #15902 from ricardoquesada/little_menu_fixes 
fix: little menu fixes
 2016-06-21 17:19:27 -07: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
Ricardo Quesada 5d11deca84 Merge pull request #15900 from geemedia/fix-simulator-build 
Fixed simulator project files by adding tinyxml2 to the include paths
 2016-06-21 12:34:59 -07:00
Adrien de Sentenac eafceb38b7 Fixed simulator project files to add tinyxml2 to the include paths 2016-06-21 11:13:10 -04: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
Ricardo Quesada dd75d37b9d Merge pull request #15892 from ricardoquesada/issue14730 
fix: not crash if CC_SPRITE_DEBUG_DRAW is enabled in SpriteBatchNode
 2016-06-20 20:47:22 -07:00
halx99 654d17d27c Update CCFontFNT.cpp 2016-06-21 11:25:11 +08:00