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

30803 Commits

Author SHA1 Message Date
pandamicro a90a8b12c6 Merge pull request #12840 from pandamicro/path 
[ci skip] Add cc.path.mainFileName
 2015-07-14 16:41:16 +08:00
pandamicro 41778f35fb Add cc.path.mainFileName 2015-07-14 16:33:38 +08:00
pandamicro 658fe74141 Merge pull request #12838 from VisualSJ/v3.7-release-parser 
[ci skip] Remove getRes (parser)
 2015-07-14 16:20:42 +08:00
pandamicro efffea5b91 Fixed #12834 Invoke cleanup function when override in JS 2015-07-14 15:35:29 +08:00
VisualSj a9deb6dda5 Remove getRes (parser) 2015-07-14 15:26:13 +08:00
pandamicro 48376db17a Merge pull request #12832 from pandamicro/jsb_loader_fix 
Fix jsb loader
 2015-07-14 15:25:24 +08:00
pandamicro 09775d6f2a Ensure backward compatibility 2015-07-14 14:14:36 +08:00
pandamicro 43a5b6f020 Fix jsb loaders issues 2015-07-14 13:40:09 +08:00
pandamicro 365c51cfab Merge pull request #12824 from darkdukey/v3.7-release 
update release notes for sdkbox
 2015-07-14 09:46:06 +08:00
pandamicro 5dc0cab4a5 Merge pull request #12823 from natural-law/v3.7-release 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-07-14 09:42:50 +08:00
Nite Luo 55037345a4 update release notes for sdkbox 2015-07-13 18:42:35 -07:00
Bin Zhang 569695d844 Update the reference of submodule cocos2d-console. 2015-07-14 09:40:42 +08:00
XiaoFeng a68835733f Add Skybox parser to js 2015-07-13 16:02:19 +08:00
pandamicro 68b7e390c2 Merge pull request #12801 from natural-law/v3.7-release 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-07-13 12:07:07 +08:00
Bin Zhang 75920b8e11 Update the reference of submodule cocos2d-console. 2015-07-13 12:05:17 +08:00
pandamicro d6c535b592 Merge pull request #12800 from WenhaiLin/v3-37-rollback-12299 
Rollback pr12299
 2015-07-13 11:40:01 +08:00
WenhaiLin 80dff7f1c4 Rollback pr12299 2015-07-13 11:32:25 +08:00
pandamicro 67c731f587 Merge pull request #12798 from VisualSJ/v3.7-release-backup 
[ci skip] update web index
 2015-07-13 11:18:16 +08:00
VisualSj 38756fb44b update web index 2015-07-13 11:14:06 +08:00
pandamicro 89927c7073 Merge pull request #12782 from xiaofeng11/v3.7-release 
UISliderReader and component update
 2015-07-13 11:05:59 +08:00
pandamicro c167e249cd Merge pull request #12790 from pandamicro/shaderNormal 
Use shader with normal while creating mesh with normals
 2015-07-12 21:47:05 +08:00
pandamicro 600568fdba Migrate test case from #10692 @babcca 2015-07-12 11:33:22 +08:00
子龙山人 a4ea35b0c7 Merge pull request #12781 from natural-law/v3.7-release 
[ci skip] Use msbuild to generating engine prebuilt libs on win32.
 2015-07-10 17:03:53 +08:00
Bin Zhang 8ca9e10a22 Use msbuild to generating engine prebuilt libs on win32. 2015-07-10 17:01:08 +08:00
XiaoFeng 92d78efce0 Fix percentage setting won't effect when UISlider's background resource set to null 2015-07-10 17:00:16 +08:00
pandamicro c30ce38cb5 Merge pull request #12766 from super626/v3.7-release 
Set default 3d animation quality to low
 2015-07-10 15:35:22 +08:00
pandamicro 07fd337052 Merge pull request #12763 from folgerhu/v3.7-release 
CCTMXXMLParser code negligence
 2015-07-10 11:49:30 +08:00
yangxiao c4587ecda1 if has normal use the shader with normal 2015-07-10 11:44:20 +08:00
子龙山人 0468cf7ba9 Merge pull request #12772 from zilongshanren/v3.7-release 
[ci skip]fix js template run error on linux.
 2015-07-10 10:20:31 +08:00
andyque 1ea7926083 fix js template run error on linux. 2015-07-10 10:19:36 +08:00
yangxiao 10fe728eee animation quality default to low, do not interpolation 2015-07-09 17:54:21 +08:00
folgerhu@sina.com a79586c052 CCTMXXMLParser code negligence 2015-07-09 17:02:12 +08:00
pandamicro a2da5d5f9d Merge pull request #12738 from super626/v3.7-release 
Update tiny obj loader and fix empty textrue
 2015-07-09 14:57:10 +08:00
pandamicro 17ef09551b Merge pull request #12756 from VisualSJ/v3.7-release-update 
[ci skip]Fixed a bug that is SingleNode setColor is null
 2015-07-09 14:55:32 +08:00
VisualSj 9f52b1e6fb Fixed a bug that is SingleNode setColor is null 2015-07-09 11:49:11 +08:00
pandamicro 893d39c543 Merge pull request #12737 from chengstory/FixReaderBug 
Fix cocos reader bug.
 2015-07-09 10:33:45 +08:00
pandamicro 0c2bb9f691 Merge pull request #12745 from CocosRobot/update_lua_bindings_1436403718 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-09 09:27:12 +08:00
CocosRobot bfe6db174e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-09 01:07:59 +00:00
pandamicro 7f4675b43f Merge pull request #12739 from pandamicro/v3.7-release 
Add auto bindings for Frame::g|setTweenType
 2015-07-09 08:58:07 +08:00
pandamicro 30c79fea02 Add auto bindings for Frame::g|setTweenType 2015-07-08 17:19:30 +08:00
yangxiao 97a17cdc8a program created dummy texture instead of empty texture 2015-07-08 17:00:01 +08:00
zhangcheng 0862d313b2 Fix cocos reader bug. 
Fixes child nodes can't be rendered when particle and TiledMap as parent and their resource have been removed from disk.
 2015-07-08 16:13:38 +08:00
yangxiao f7cdd7162b adapter according to latest objloader 2015-07-08 15:33:43 +08:00
子龙山人 3f550ef331 Merge pull request #12663 from xiaofeng11/v3.7-release 
Fix drawLine & drawPoints won't use blendFunc bug
 2015-07-08 14:38:10 +08:00
子龙山人 5e8609e5d7 Merge pull request #12728 from fusijie/fix_polygonsprite 
fix polygon sprite bug.
 2015-07-08 14:13:32 +08:00
yangxiao dac84ade0d index to short 2015-07-08 14:03:53 +08:00
yangxiao 40b33604d8 adjust objloader to cocos 2015-07-08 13:44:15 +08:00
yangxiao fdd78ef73f update objloader to latest 2015-07-08 13:42:14 +08:00
Jacky 06c06a1f03 fix polygon sprite bug. 2015-07-08 10:07:35 +08:00
XiaoFeng 8429cc1d90 Update CCDrawNode bug test 2015-07-08 09:35:29 +08:00