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

33365 Commits

Author SHA1 Message Date
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 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
XiaoFeng c0f7ecfcde User GetModuleFileNameW in all condition, it is more safe than _get_wpgmptr 2015-11-25 09:49:19 +08:00
zilongshanren 866c992f41 add cocos2d namespace 2015-11-24 21:41:45 +08:00
zilongshanren 3cc3325df8 Merge pull request #14414 from WenhaiLin/v3-win32-audiofix 
AudioEngine[WIN32]:Fixed `FinishCallback` may not been invoked when the sound play completes.
 2015-11-24 21:08:46 +08:00
zilongshanren 2c87211dba Merge pull request #14468 from CocosRobot/update_lua_bindings_1448348167 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-24 20:34:46 +08:00
XiaoFeng 27f6d6a6ba Remove condition macro check. 2015-11-24 19:17:38 +08:00
XiaoFeng 722f20c4b6 Update implement remove condition macro check. 2015-11-24 18:29:58 +08:00
yangxiao aa38dfba89 release default fbo 2015-11-24 18:11:16 +08:00
zilongshanren b36f464c09 update ccs-res submodule 2015-11-24 18:06:11 +08:00
zilongshanren 9c2130e88a fix Layout and ClippingNode nested rendering issue 2015-11-24 18:01:50 +08:00
pandamicro 930405d52c Remove useless manual bindings for MenuItems 2015-11-24 16:32:02 +08:00
pandamicro a6fdd9aa09 Improve js template documentation 2015-11-24 16:31:14 +08:00
yangxiao 1ac82fa273 fix terrain ray trace bug when there is offset 2015-11-24 15:13:52 +08:00
CocosRobot ded045ae26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-24 07:01:07 +00:00
pandamicro 378cfa35b6 Merge pull request #14394 from super626/v3 
Terrain: char* to string
 2015-11-24 14:53:00 +08:00
zilongshanren 8d1f1a9933 Merge pull request #14457 from zilongshanren/testEditBoxScaleSize 
Fix edit box setPlaceholderFontName and scale font size issue
 2015-11-24 11:33:52 +08:00
zilongshanren 7676b1cb73 improve label layout logic 2015-11-23 17:47:30 +08:00
zilongshanren dfe4999a06 Update README.md 2015-11-23 16:53:18 +08:00
yangxiao e8d853934b terrain lua bindings 2015-11-23 14:33:39 +08:00
zilongshanren 361daf7f5f fix wrong indentation 2015-11-23 11:50:04 +08:00
François Dupayrat 12df5ae1cc Fix wrong variable use for setPlaceholderFontName 
1. fix editbox scale not affect native font size
 2015-11-23 11:49:22 +08:00
XiaoFeng 23d8b63fca update header file to fix studio UI js binding compile error 2015-11-23 11:41:42 +08:00
zilongshanren 689c0f4af3 Merge pull request #14327 from wohaaitinciu/editbox-win32 
Fix a fatal bug in EditBox implement for platform win32
 2015-11-23 11:35:40 +08:00
zilongshanren 51e2e369d1 Merge pull request #14443 from zilongshanren/fix-scalesprite-opacity 
fix scalesprite opacity issue.
 2015-11-23 09:50:23 +08:00
zilongshanren 9328a7c1d0 fix scalesprite opacity issue. 
Ref: https://github.com/cocos2d/cocos2d-x/issues/14436
 2015-11-20 17:35:29 +08:00
zilongshanren a789e31605 Merge pull request #14441 from neokim/fix-14440 
Fix #14440
 2015-11-20 16:49:12 +08:00
zilongshanren 7ee82f20fc fix getLetter crash issue. 
1. make vertical clamp works in non-wrap mode.

2. make the lineHeight and letterSprite scale work correct.
 2015-11-20 16:39:48 +08:00
Neo Kim 4829a037f7 Fix #14440 2015-11-20 15:57:26 +09:00