Commit Graph

4254 Commits

Author SHA1 Message Date
Jare Guo da567994c3 refine cc.instantiate API doc 2017-05-17 14:51:14 +08:00
Jare Guo 4393080acf refine creator.d.ts 2017-05-17 10:55:03 +08:00
Nan Wang 32a90f5ad6 update api doc for anysdk and systemEvent 2017-05-16 17:35:38 +08:00
Jare Guo 68869a3167 update example of CCEnum 2017-05-16 16:02:15 +08:00
Wang Nan 4823eb3e87 Merge pull request #1654 from jareguo/master
支持 TypeSciprt 枚举定义
2017-05-16 15:51:02 +08:00
Jare Guo 4bd7c7f628 implement TypeScript support for CCEnum 2017-05-16 15:35:01 +08:00
Jare Guo d187f903e4 refine cc.Enum 2017-05-16 14:31:41 +08:00
Jare Guo 323c156733 Merge pull request #1652 from zilongshanren/fix-webview-ios-size
webview and bmfont bug fix
2017-05-16 11:13:46 +08:00
zilongshanren 2db44085f9 bug fix 2017-05-16 11:03:44 +08:00
Jare Guo bd7f23cbce Merge pull request #1651 from knoxHuang/master
Remove redundant code for CCPageView
2017-05-16 10:12:22 +08:00
knoxHuang 1fe4eac00b Remove redundant code for CCPageView 2017-05-16 10:10:39 +08:00
Wang Nan 05a0f4901b Merge pull request #1649 from jareguo/master
优化场景下载性能
2017-05-16 09:47:22 +08:00
Wang Nan d69154a4a2 Merge pull request #1650 from 2youyou2/physics
improve physics
2017-05-15 17:25:52 +08:00
2youyouo2 cdd2dfa8bc add rigidbody.getJointList 2017-05-15 17:18:38 +08:00
Jare Guo 2f4bfe3596 optimize uuid-loader 2017-05-15 16:25:41 +08:00
Jare Guo 05b398abe4 optimize deserialize 2017-05-15 15:52:20 +08:00
Jare Guo 67c5e28659 use JS.Pool 2017-05-15 15:51:26 +08:00
2youyouo2 c77661fac2 add protect code for physics polygon collider 2017-05-15 15:45:20 +08:00
2youyouo2 98f6292ed7 fixed physics comment 2017-05-15 15:44:41 +08:00
Wang Nan 1ec9460aaf Merge pull request #1648 from zilongshanren/fix-scrollview-issues-2
Fix scrollview issues 2
2017-05-15 11:13:35 +08:00
zilongshanren 1b90ac7497 fix scrollview event handling 2017-05-15 10:49:25 +08:00
zilongshanren c93d093ff5 fix bouncing position issue 2017-05-15 10:38:06 +08:00
Wang Nan 4dedf55deb Merge pull request #1644 from jareguo/master
优化实例化和反序列化时的性能
2017-05-15 10:16:47 +08:00
Jare Guo dde1903110 use misc.Pool 2017-05-13 01:02:45 +08:00
Jare Guo 27ee506fb4 Merge pull request #1645 from 2youyou2/animation
should remove animator from animation manager when pause animator
2017-05-12 17:53:14 +08:00
2youyouo2 bc0163c7a5 refine animation 2017-05-12 17:50:52 +08:00
Wang Nan 9d33322239 Merge pull request #1647 from zilongshanren/remove-unneeded-warning-msg
improve web native ui controls
2017-05-12 17:13:42 +08:00
Jare Guo 713126f51e optimize instantiate 2017-05-12 17:11:31 +08:00
zilongshanren 7050d577c1 improve web native ui controls 2017-05-12 16:03:49 +08:00
2youyouo2 3c7504110d change animation Array to MutableForwardIterator 2017-05-12 15:55:53 +08:00
Wang Nan 3d598bedae Merge pull request #1646 from zilongshanren/remove-unneeded-warning-msg
fix videoplayer not working for iOS
2017-05-12 14:54:43 +08:00
zilongshanren 40515d4f1f fix videoplayer not working for iOS 2017-05-12 14:38:42 +08:00
2youyouo2 99fde38c39 should remove animator from animation manager when pause animator 2017-05-12 11:18:07 +08:00
Jare Guo 9481afcae8 optimize deserialization 2017-05-11 17:55:50 +08:00
Jare Guo 0dd55bdfa7 Merge pull request #1643 from zilongshanren/remove-unneeded-warning-msg
remove unneeded warning msg
2017-05-11 17:27:38 +08:00
zilongshanren b7da540af7 remove warning msg from md 2017-05-11 17:17:47 +08:00
zilongshanren cee31521bd remove debug msg 2017-05-11 17:17:07 +08:00
zilongshanren af3691d2f2 remove unneeded warning msg 2017-05-11 17:15:31 +08:00
Jare Guo 0f55bbbdd5 Merge pull request #1642 from 2youyou2/animation
fixed animation
2017-05-11 16:27:14 +08:00
2youyouo2 dcd8da6a6f should not resume animation when call node.active = true and animation is paused before 2017-05-11 16:24:31 +08:00
2youyouo2 ae0ad54ad2 fixed contact TangentSpeed 2017-05-11 11:29:57 +08:00
Jare Guo b89c614d19 stash 2017-05-10 16:54:14 +08:00
Wang Nan 934203e0d1 Merge pull request #1641 from 2youyou2/animation-delay
fixed animation not worked
2017-05-10 15:38:40 +08:00
2youyouo2 c3a9c6926d fixed animation not worked 2017-05-10 15:09:15 +08:00
Wang Nan fe3187aa81 Merge pull request #1638 from jareguo/master
fix ES6 Classes on JSB
2017-05-10 09:47:33 +08:00
Jare Guo 98d64fd45d eruda: fix ccsg.Node.init is removed 2017-05-10 01:19:17 +08:00
Jare Guo 8f831af4d3 reviewed 2017-05-10 01:00:20 +08:00
pandamicro b34fb8ed2b Merge pull request #1640 from pandamicro/master
Remove memory profiling and Fix divide 0 issue in Scale9Sprite
2017-05-10 00:49:29 +08:00
pandamicro 582ccf7bf3 Add () 2017-05-10 00:48:57 +08:00
Jare Guo bb056d77b0 Merge pull request #1639 from knoxHuang/master
fix CCSGParticleSystem code err for fireball/issues/5702
2017-05-09 18:00:13 +08:00