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

31202 Commits

Author SHA1 Message Date
pandamicro e2068ab84a Update versions and docs for v3.7 2015-07-16 16:53:43 +08:00
pandamicro 4d18b6895a Merge pull request #12877 from CocosRobot/update_lua_bindings_1437034712 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-16 16:41:05 +08:00
CocosRobot f2567f498c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 08:22:58 +00:00
pandamicro b094367c94 Merge pull request #12874 from pandamicro/v3.7-release 
Remove cleanup from auto bindings add made it support override in JS
 2015-07-16 16:15:26 +08:00
子龙山人 a72ea73e60 Merge pull request #12863 from fusijie/fix_polygonsprite_setColor 
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
 2015-07-16 14:51:06 +08:00
pandamicro ae2d955955 Update web engine ref 2015-07-16 14:39:09 +08:00
pandamicro 949eca2846 Improve some manual binding code 2015-07-16 14:34:14 +08:00
andyque 7c665e6447 remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08:00
子龙山人 63add82659 Merge pull request #12871 from CocosRobot/update_lua_bindings_1437026365 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-16 14:12:41 +08:00
pandamicro 490d5a3747 Remove cleanup from auto bindings add made it support override in JS 2015-07-16 14:09:26 +08:00
WenhaiLin d5d5af5ac3 change ‘auto’ to ‘auto&&’ 2015-07-16 14:08:59 +08:00
CocosRobot 8442fe5f89 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-16 06:04:17 +00:00
子龙山人 40f4e0b27b Merge pull request #12864 from zilongshanren/add-jumpToPage-api 
add setCurPageIndex API to PageView.
 2015-07-16 13:56:05 +08:00
pandamicro 0b1d105803 Merge pull request #12870 from VisualSJ/v3.7-release-parser 
[ci skip] Fixed parser's bug
 2015-07-16 13:04:06 +08:00
VisualSj 0bb385f37c Check texture for existence 2015-07-16 11:54:45 +08:00
andyque 517221a0df add jumpToPage API to PageView. 
1. This commit also fix the default font size issue in ui::Button.
 2015-07-16 11:33:57 +08:00
VisualSj ef70e1f996 Fixed a bug that is Armature parser 2015-07-16 10:30:22 +08:00
pandamicro 73a75ea5fb Merge pull request #12868 from pandamicro/v3.7-release 
Update web ref
 2015-07-15 22:37:08 +08:00
pandamicro 04fd171e77 Update web ref 2015-07-15 22:36:28 +08:00
WenhaiLin 1c9a181c35 Label:Fixed the color of letter will be overridden by fade action. 2015-07-15 20:17:05 +08:00
pandamicro bcd20b1bf0 Merge pull request #12861 from pandamicro/v3 
Sync Cocos2d-x v3.7 RC1
 2015-07-15 17:16:44 +08:00
pandamicro 95a7afcd36 Merge pull request #12862 from CocosRobot/update_lua_bindings_1436948312 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-15 17:16:31 +08:00
Jacky e4b392d4c8 fix polygon sprite setColor, setOpacity, setTexture, setTextureRect. 2015-07-15 16:27:29 +08:00
CocosRobot be71b6d563 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-15 08:23:23 +00:00
子龙山人 b2d83350ff Merge pull request #12860 from zilongshanren/fix-scale9sprite-gray 
fixed Scale9Sprite gray state issue.
 2015-07-15 16:15:32 +08:00
pandamicro 99e504e668 Merge pull request #12854 from yangws/issue_11310 
fixed #11310 : multiple camera case utils::captureScreen bug.
 2015-07-15 15:00:29 +08:00
pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	docs/RELEASE_NOTES.md
	web
 2015-07-15 14:39:40 +08:00
andyque 2f31f6baa6 fixed Scale9Sprite gray state issue. 
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.

This commit reset the shader state.
 2015-07-15 14:35:13 +08:00
子龙山人 d291afe295 Merge pull request #12856 from fusijie/fix_rendertexture_backtofront 
fixed renderTexture switch foreground to background issue.
 2015-07-15 14:32:40 +08:00
pandamicro 3c08b497ba Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-15 14:26:19 +08:00
pandamicro 7f7cf92da3 Update bindings-generator 2015-07-15 14:21:47 +08:00
pandamicro 650f045192 Merge pull request #12858 from pandamicro/v3.7-release 
[ci skip]Update requirements info
 2015-07-15 14:15:26 +08:00
pandamicro 0064dfbc71 Update requirements info 2015-07-15 14:11:59 +08:00
子龙山人 dcf0d9bf45 Merge pull request #12855 from CocosRobot/update_lua_bindings_1436938954 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-15 14:06:17 +08:00
Jacky a204b02668 fixed renderTexture switch foreground to background issue. 2015-07-15 13:47:10 +08:00
CocosRobot 4b418fe823 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-15 05:46:42 +00:00
子龙山人 f476169f6f Merge pull request #12853 from zilongshanren/remove-warning-xcode7 
fix tons of warnings in Xcode7
 2015-07-15 13:39:28 +08:00
Vincent Yang 7a105ce1e1 fixed #11310 : multiple camera case utils::captureScreen bug. 2015-07-15 12:09:08 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
子龙山人 49b39bb9c5 Merge pull request #12851 from zilongshanren/v3 
[ci skip]fix win32&win8.1 template compile
 2015-07-15 10:04:03 +08:00
andyque 15b0fea530 fix win32&win8.1 template compile 2015-07-15 10:00:35 +08:00
pandamicro 1e84b8c156 Merge pull request #12850 from pandamicro/v3.7-release 
[ci skip] v3.7 rc1 release doc
 2015-07-14 23:24:30 +08:00
pandamicro d768df51ed Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release 2015-07-14 23:22:54 +08:00
pandamicro c126aac35f v3.7 rc1 release doc 2015-07-14 23:21:34 +08:00
Mazyad Alabduljaleel 008a5ef89c replaced tabs with whitespace 2015-07-14 16:34:11 +03:00
Mazyad Alabduljaleel 6f8bc04934 First commit for improving iOS EditBox 
+ Moved internal stuff to the implementation file
+ Added pragma and organized methods
+ cleanup synthesize, instance variables, and overall code style for ObjC
 2015-07-14 16:18:03 +03:00
pandamicro b49054876c Merge pull request #12846 from VisualSJ/v3.7-release-parser 
[ci skip] update we index
 2015-07-14 18:23:29 +08:00
VisualSj 909ff57231 update we index 2015-07-14 18:21:03 +08:00
pandamicro 373ab0e5b8 Merge pull request #12844 from CocosRobot/update_cocosfiles_1436868917 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-14 18:16:35 +08:00
CocosRobot 3ba4d7230e [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-14 10:15:18 +00:00