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

34356 Commits

Author SHA1 Message Date
zilongshanren 3a2900494f Merge pull request #15080 from njh0602/somefix 
fix return value
 2016-02-19 10:09:55 +08:00
zilongshanren a4f3826fa9 Merge pull request #15083 from mogemimi/fix-docs-typo 
Fix typos in documentation
 2016-02-19 10:09:32 +08:00
mogemimi 1d9e688707 Fix typos in documentation 2016-02-18 16:16:36 +09:00
zilongshanren 8e1c53b541 Merge pull request #15074 from xiaofeng11/v3 
Remove test/lua-tests/project/Classes/lua_module_register.h, use the one in libluacocos2d instead.
 2016-02-18 12:00:39 +08:00
肖峰 4e501149a3 Fix lua-test link error under linux 2016-02-18 10:53:33 +08:00
NamJunHyone 79c69d77d6 fix return value 2016-02-18 11:23:54 +09:00
mogemimi 8280f06c1f Add missing reference-return types 2016-02-18 05:10:42 +09:00
Mikhail Shulepov fb7044c535 Add SpriteFrameCacheTest to Android, Windows, Linux project files 2016-02-17 20:52:30 +03:00
James Chen 0cb94cc373 Merge branch 'v3_libwebsockets' of https://github.com/xiaofeng11/cocos2d-x into refactor-websocket 2016-02-17 14:56:57 +08:00
James Chen 7d43e35741 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket 2016-02-17 14:56:32 +08:00
XiaoFeng 9224a9d03b Remove test/lua-tests/project/Classes/lua_module_register.h, use the one in libluacocos2d instead. 2016-02-17 14:54:15 +08:00
James Chen 5b55a453d9 Updates config.json 2016-02-17 14:44:07 +08:00
zilongshanren ced5493304 Merge pull request #15064 from CocosRobot/update_lua_bindings_1455542820 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-17 09:34:17 +08:00
pandamicro cf4c18e90d Merge pull request #15070 from CocosRobot/update_lua_bindings_1455613548 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-16 17:08:32 +08:00
CocosRobot 4d7186f5bd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-16 09:07:51 +00:00
zhangcheng 2b1511096e Fix ValueVector read type error. 2016-02-16 17:01:54 +08:00
pandamicro 4952b4395d Merge pull request #15057 from natural-law/v3 
Update the reference of submodule cocos2d-console
 2016-02-16 17:01:54 +08:00
zhangcheng 53cbc2d32b Fix value type error when read value of bool type from .plist file. 2016-02-16 16:50:54 +08:00
pandamicro 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
pandamicro 1030151047 Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro 2016-02-16 13:43:11 +08:00
CocosRobot e3e9e0cba6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-15 13:29:13 +00:00
zilongshanren 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
zilongshanren 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
zilongshanren c1013d153a Merge pull request #15061 from xiaofeng11/v3 
make UIEditBox code compatible with 32bit MacOSX project
 2016-02-15 21:16:49 +08:00
zilongshanren 79e770628c Merge pull request #15047 from Zzzen/v3 
Let ScrollView swallow touch events by default.
 2016-02-15 21:16:18 +08:00
pandamicro 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
pandamicro 6e7c9ab8db Cleanup log 2016-02-15 17:19:37 +08:00
pandamicro 94c62bed53 Remove ScriptingCore::retainCount 2016-02-15 16:32:00 +08:00
pandamicro bbf89cf016 Fix director restart issue 2016-02-15 16:30:32 +08:00
Wenhai Lin a0724fc08e Merge pull request #15032 from mogemimi/fix-format-string 
Fix format string warnings
 2016-02-15 16:17:25 +08:00
zhangbin 077b5e7bfc Update the reference of submodule cocos2d-console 2016-02-15 10:49:57 +08:00
mogemimi 4c1c238f74 Fix format string warnings 2016-02-15 01:41:08 +09:00
pandamicro 3177f3431e Merge pull request #15055 from CocosRobot/update_lua_bindings_1455432660 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-14 15:05:49 +08:00
CocosRobot f1f0a7130f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-14 06:53:19 +00:00
pandamicro cb4d24e1ee Merge pull request #14759 from pandamicro/hbmemory 
Implement Full GC Relied memory model
 2016-02-14 14:48:01 +08:00
pandamicro 39e7759e77 Fix LuaEngine compilation issue 2016-02-14 10:18:27 +08:00
XiaoFeng 85fc074e29 libwebsockets have been compiled as static lib, remove libwebsockets.dll from win10 & win8.1 project 2016-02-14 10:07:00 +08:00
XiaoFeng 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
pandamicro 6bbfc846da Update bindings generator and Activate new memory model by default 2016-02-14 09:48:29 +08:00
Mikhail Shulepov 014f8e107f fix: ensure calling opengl only when app is active 2016-02-13 11:17:55 +03:00
Mikhail Shulepov 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
Ian Clarkson 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
Mikhail Shulepov c26fe122ad SpriteFrameCacheTest: test for PixelFormat 2016-02-12 19:06:16 +03:00
Mikhail Shulepov 15f0aaa598 Texture2D::getStringForFormat - added missed formats 2016-02-12 19:04:30 +03:00
Mikhail Shulepov ec664bc08b Added aliases for PixelFormat names 2016-02-12 17:25:11 +03:00
Mikhail Shulepov 112fceae81 Texture2D: RGB888 -> A8 conversion (white - full opacity, black - full transparency) 2016-02-12 17:23:56 +03:00
Zen 07051a0357 Let ScrollView swallow touch events by default. 2016-02-12 21:21:57 +08:00
zilongshanren eb55a0e603 Merge pull request #15041 from CocosRobot/update_lua_bindings_1455197914 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-02-11 21:44:10 +08:00
CocosRobot 89c0c801b0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-02-11 13:40:35 +00:00