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

33449 Commits

Author SHA1 Message Date
zilongshanren 6595075fb7 Merge pull request #14496 from CocosRobot/update_lua_bindings_1448517311 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-26 21:45:23 +08:00
zilongshanren 97c6e3b046 Merge pull request #14494 from CocosRobot/update_cocosfiles_1448517223 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-26 21:45:14 +08:00
zilongshanren d638504a68 Merge pull request #14497 from CocosRobot/update_lua_bindings_1448517448 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-26 21:44:59 +08:00
zilongshanren 5ca1099004 Merge pull request #14495 from CocosRobot/update_cocosfiles_1448517392 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-26 21:44:43 +08:00
XiaoFeng d69453fa54 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine 2015-11-26 19:04:13 +08:00
XiaoFeng 24dc9f3392 update code as comment 2015-11-26 17:39:57 +08:00
XiaoFeng 5a2a343152 update code as comment 2015-11-26 17:38:32 +08:00
XiaoFeng 58dd27efd3 add missing return type 2015-11-26 17:33:45 +08:00
XiaoFeng f5f09133e6 Change ASSERT to safety mode 2015-11-26 16:49:01 +08:00
XiaoFeng 108d145bf0 Add missing luaval and color3b conversion function export 2015-11-26 15:08:49 +08:00
XiaoFeng 52f696945d Remove condition MACRO and remove ASSERT in Sprite::initWithFile function 
Remove CameraFlag define for Cocos Studio only
 2015-11-26 14:47:37 +08:00
CocosRobot 51cfbca523 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-26 06:02:24 +00:00
CocosRobot 58912c88b9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-26 06:00:46 +00:00
CocosRobot 390a37e123 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-26 05:56:34 +00:00
zilongshanren 6321357c56 Update CHANGELOG 2015-11-26 13:54:34 +08:00
CocosRobot 3296476c43 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-26 05:53:45 +00:00
zilongshanren c3604aa865 Merge pull request #14470 from zilongshanren/fixListViewClippingIssue 
Fix list view clipping issue
 2015-11-26 13:51:51 +08:00
XiaoFeng d744c167b7 Fix button texture loaded mark has set to wrong value bug 2015-11-26 13:49:32 +08:00
zilongshanren 5221f8a6fc improve the code by code review suggestions. 2015-11-26 12:03:18 +08:00
songchengjiang dcfdfd3a78 LUA tests: add Sprite3DNormalMappingTest 2015-11-26 11:27:33 +08:00
zilongshanren b89700b7d6 Update CHANGELOG 2015-11-26 10:30:36 +08:00
songchengjiang 64f082ab7c add bumped testing model 2015-11-26 10:14:27 +08:00
zilongshanren 44d8aec4c9 Merge pull request #14484 from xiaofeng11/v3_fix 
Change component resource load logic
 2015-11-26 09:49:40 +08:00
zilongshanren 7dfa3c3d03 Merge pull request #14487 from CocosRobot/update_lua_bindings_1448472242 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-26 09:37:02 +08:00
XiaoFeng 397fa809da Add default line width to create function 2015-11-26 09:32:57 +08:00
CocosRobot da9e8548a0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 17:29:11 +00:00
Ricardo Quesada b8f43f334d Merge pull request #14420 from xiaofeng11/v3_combine_particle3d 
Combine Studio change for particle 3d
 2015-11-25 09:20:47 -08:00
XiaoFeng 9ec451ca31 Update CCDrawNode, remove condition MACRO 2015-11-25 23:26:57 +08:00
XiaoFeng 928dc3ab1f Add lua value conversion function for cocos studio 2015-11-25 23:03:25 +08:00
XiaoFeng 145943068f Add missing function export 2015-11-25 22:35:02 +08:00
XiaoFeng 9811d6efcf Combine studio change for LuaBinding, jsb and simulator 2015-11-25 21:52:44 +08:00
XiaoFeng eb47d28266 Change component resource load logic, won't dependent on sprite edit in other studio combine PR 2015-11-25 20:07:50 +08:00
zilongshanren 584a5d7407 fix alphaThreshold undefined issue 2015-11-25 18:27:38 +08:00
zilongshanren b1490c96b6 Merge branch 'v3' into fixListViewClippingIssue 2015-11-25 18:25:40 +08:00
zilongshanren 4ce328212b Merge pull request #14481 from CocosRobot/update_lua_bindings_1448443401 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-25 17:29:52 +08:00
CocosRobot 06c7b94440 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 09:28:43 +00:00
zilongshanren 92649c539b Merge pull request #14480 from CocosRobot/update_cocosfiles_1448443303 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-25 17:23:33 +08:00
CocosRobot 82feb314f6 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-25 09:21:44 +00:00
zilongshanren b0d88a552a Merge pull request #14419 from xiaofeng11/v3_combine_ui 
Combine Studio change for UI components
 2015-11-25 17:19:54 +08:00
pandamicro c202834312 Clean up manual bindings code, remove JS_THIS_OBJECT and JS_SET_RVAL 2015-11-25 14:33:43 +08:00
pandamicro 69b2b5720b Use JS::PersistentRooted instead of JS::Heap to prevent delegates and wrappers internal js object from GC 
More elegant and secured way, potential crashes exists in previous implementation
 2015-11-25 14:32:19 +08:00
zilongshanren 03046d6fbd change the default alphaThreshold 2015-11-25 14:31:32 +08:00
zilongshanren 759c0bbf31 rename CCStencilBitsManager to StencilStateManager 2015-11-25 14:24:27 +08:00
pandamicro be2a3077c2 Remove useless manual bindings for addEventListener functions in UI 2015-11-25 14:15:45 +08:00
zilongshanren 5fef088695 refactor stencil state management code 2015-11-25 14:14:17 +08:00
pandamicro 23f27534f6 Solve a possible memory leak in HttpRequest 2015-11-25 14:03:56 +08:00
XiaoFeng 09606e96cd Add comment for new function 2015-11-25 11:33:24 +08:00
XiaoFeng d0cd640ac8 Update 2015-11-25 11:15:17 +08:00
songchengjiang 9241797acb support normal mapping material 2015-11-25 10:45:03 +08:00
XiaoYang 4ba6279a98 Merge pull request #14469 from super626/terrain 
fix bug: Terrain::getIntersectionPoint when there is offset
 2015-11-25 09:53:47 +08:00