Commit Graph

34016 Commits

Author SHA1 Message Date
Liam bcc2ed0e2a update for scrollView test 2015-12-23 18:14:09 +08:00
mogemimi b0c4adcbd0 Fix method name spelling in AutoPolygon 2015-12-23 19:07:03 +09:00
Liam 0cac519e5c fix uiWidget clipping error with Node 2015-12-23 16:05:52 +08:00
zilongshanren 851d288d0b Merge pull request #14781 from zilongshanren/rollbackSlider
Rollback slider and loadingbar in non scale9 mode
2015-12-23 15:04:55 +08:00
zilongshanren 2a2f184449 refine code with DRY. 2015-12-23 14:43:25 +08:00
zilongshanren 847094ec7d ui::loadingBar -> add flip logic back 2015-12-23 14:34:36 +08:00
pandamicro 45d1d655cc Merge pull request #14779 from xiaofeng11/v3.10
Bug fix & update
2015-12-23 12:35:52 +08:00
pandamicro d11b2b4bfd Merge pull request #14782 from geron-cn/v3.10
update submodule: web
2015-12-23 12:34:24 +08:00
XiaoFeng 3fd8f36a90 Limit force GC in menu item only work in lua-binding 2015-12-23 12:30:59 +08:00
zilongshanren a5525c15ab Merge pull request #14763 from ArisLittle/patch-1
fix some minor typos in the comments
2015-12-23 09:39:20 +08:00
geron-cn 26bd2b8212 update submodule 2015-12-22 21:43:10 +08:00
geron-cn 86ccf28343 update submodule: web 2015-12-22 21:25:21 +08:00
zilongshanren d4a5d0da44 rollback uislider 2015-12-22 20:03:56 +08:00
zilongshanren ab77e8c520 Revert "loading bar use new scale9 feature"
This reverts commit a671bf7ce9.
2015-12-22 19:53:24 +08:00
pandamicro 1ac13efacc Merge pull request #14780 from VisualSJ/v3.10
Close webgl dedicated test in canvas mode
2015-12-22 19:09:17 +08:00
VisualSj 1c60ae6ff1 Close webgl dedicated test in canvas mode 2015-12-22 19:07:46 +08:00
pandamicro e311655fbe Merge pull request #14778 from VisualSJ/v3_12_11
Close webgl dedicated test in canvas mode
2015-12-22 18:59:53 +08:00
VisualSj 843694cea5 Close webgl dedicated test in canvas mode 2015-12-22 18:46:30 +08:00
XiaoFeng 82867b0073 Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
2015-12-22 18:41:44 +08:00
VisualSj 875a2d83b1 Close webgl dedicated test in canvas mode 2015-12-22 18:36:48 +08:00
zilongshanren 7d730d7c21 Update CHANGELOG 2015-12-22 13:46:29 +08:00
zilongshanren e8d3e3f136 Update CHANGELOG 2015-12-22 13:44:30 +08:00
zilongshanren 064cd8d04f Merge pull request #14722 from newnon/v3.10_webp_improvement
WebP loading improvements WebP loaded as premultiplied alpha if it has
2015-12-22 13:43:11 +08:00
zilongshanren 9347335fad Merge pull request #14767 from xiaofeng11/v3.10_logChange
[ci skip] remove duplicate change log
2015-12-22 13:41:39 +08:00
xiaofeng11 954a54f7bb Merge pull request #14770 from pandamicro/v3.10
Fix VS crash issue caused by unsupported macro syntax
2015-12-22 09:42:24 +08:00
pandamicro a91a669972 Fix VS crash issue caused by unsupported macro syntax
piece of shit...
2015-12-21 22:44:59 +08:00
pandamicro baa6028e42 Merge pull request #14769 from CocosRobot/update_lua_bindings_1450697623
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-21 21:34:47 +08:00
CocosRobot 30f3096c92 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-21 11:36:07 +00:00
zilongshanren 8eda79eb32 Merge pull request #14768 from liamcindy/v3_ui_BMFont
add interface for BMFont
2015-12-21 19:30:10 +08:00
zilongshanren fa172b9da9 Merge pull request #14765 from liamcindy/v3_ui_js
update for js uiTextAtlasTest
2015-12-21 19:17:41 +08:00
Liam 98a6558018 add interface for BMFont 2015-12-21 18:49:46 +08:00
肖峰 a6a9e30287 remove duplicate change log 2015-12-21 17:00:20 +08:00
zhangcheng c4ed577589 Update cocos2d-x 3.10 Release note. 2015-12-21 16:56:35 +08:00
fanli 81f9d20158 update for js uiTextAtlasTest 2015-12-21 16:29:16 +08:00
zilongshanren fe0bd66698 Merge pull request #14753 from xiaofeng11/v3.10_logChange
[ci skip]Update change log and authors
2015-12-21 14:43:10 +08:00
ArisLittle 68e166568e fix some minor typos in the comments
change spelling from "a item" to "an item", "a event" to "an event", "a index" to "an index" in cocos/ui/UIListView.h
2015-12-21 14:26:50 +08:00
pandamicro 8d8ac60625 Merge pull request #14761 from pandamicro/v3.10
Correct return type to adopt GC Rooting API
2015-12-21 11:46:59 +08:00
pandamicro 616f5c0a01 Correct return type to adopt GC Rooting API 2015-12-21 11:07:40 +08:00
pandamicro 4e36e24993 Correct return type to adopt GC Rooting API 2015-12-21 10:42:54 +08:00
肖峰 23c51145ec update changeling 2015-12-21 10:12:24 +08:00
yangxiao 09c139039f add tmx with flipped spritebatch test 2015-12-21 10:00:15 +08:00
pandamicro 727480e44f Merge pull request #14760 from mogemimi/fix-doc-typo
Fix typos in documentation, comments and strings
2015-12-21 09:32:57 +08:00
mogemimi aac1558b75 Fix typos in documentation, comments and strings 2015-12-21 08:22:41 +09:00
pandamicro 81918f51ea Fix event handle function issue with compartment
and  Fix a crash issue caused by malformed js usage
2015-12-21 00:16:17 +08:00
pandamicro 8d712a4c45 Expose CC_ENABLE_GC_FOR_NATIVE_OBJECTS 2015-12-21 00:16:17 +08:00
pandamicro 34c7331b99 Issue fixes for new memory model 2015-12-21 00:16:17 +08:00
pandamicro 6a6407f711 Pass native references to script scope 2015-12-21 00:16:16 +08:00
pandamicro 8ddaf310ef Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
pandamicro 6c2fd67d08 Update auto bindings 2015-12-21 00:14:51 +08:00
pandamicro e1bc6640f4 Implement full GC relied memory model 2015-12-21 00:14:51 +08:00