Commit Graph

3970 Commits

Author SHA1 Message Date
VisualSJ e474b7a7cd #5265 _div need updateVisibility 2017-02-22 11:23:49 +08:00
Jare Guo 777b7c4a08 Merge pull request #1511 from natural-law/db-doc
Solve the error format of DragonBones API documents.
2017-02-21 16:11:08 +08:00
zhangbin af49fd7fe7 Solve the error format of DragonBones API documents. 2017-02-21 16:01:14 +08:00
Jare Guo d5e6cdfb80 fix warning of getRes 2017-02-20 22:05:06 +08:00
Jare Guo 4c0e71ee2e Merge pull request #1509 from jareguo/master
Merge onPreDestory of node
2017-02-20 19:58:22 +08:00
Jare Guo bd6bc3fee3 Merge pull request #1508 from jareguo/temp2
fix spriteInsets on JSB
2017-02-19 15:47:41 +08:00
Jare Guo 6d1a459a5d fix spriteInsets on JSB 2017-02-19 15:45:04 +08:00
Jare Guo 07e64e5bfe push down __fastOn/Off to Director 2017-02-18 22:48:05 +08:00
Jare Guo fff91611cb use shorthand function in properties
stash 2
2017-02-18 22:48:05 +08:00
Jare Guo 787aa87759 merge _onPreDestroy 2017-02-18 22:48:05 +08:00
Wang Nan c51a57988e Merge pull request #1507 from zilongshanren/add-label-gradient-color
Add label gradient color
2017-02-18 10:16:39 +08:00
zilongshanren 35dfa5e318 add spacingX for bmfont 2017-02-17 20:52:13 +08:00
zilongshanren feebb86fbf add spacingX property to label component 2017-02-17 20:26:03 +08:00
zilongshanren a3e1c1d071 finish label gradient effect 2017-02-17 20:06:45 +08:00
Jare Guo cfa41eef89 Merge pull request #1506 from jareguo/master
fix engine bulid error again
2017-02-17 18:34:25 +08:00
Jare Guo e36f4b9c33 fix engine bulid error again 2017-02-17 18:33:17 +08:00
Jare Guo 86edd2bfc7 Merge pull request #1502 from jareguo/master
重构组件生命周期方法调用
2017-02-17 18:17:33 +08:00
zilongshanren 478ce6446f add gradient color properties 2017-02-17 18:15:46 +08:00
Nan Wang 62c7aa9440 update engine version 2017-02-17 18:04:34 +08:00
Jare Guo 52b1e9d5e1 reviewed 2017-02-17 17:19:26 +08:00
Jare Guo a1d5241599 Merge pull request #1501 from pandamicro/gc-fix
Fix gc crash possibly caused by system events
2017-02-17 14:58:32 +08:00
pandamicro 713bc5d8eb Fix gc crash possibly caused by system events 2017-02-17 14:55:39 +08:00
Jare Guo e2af9f54be Merge pull request #1504 from jareguo/v1.4
fix error when ctor parameter defined
2017-02-17 14:12:09 +08:00
Jare Guo 56baab044e fix error when ctor parameter defined 2017-02-17 14:09:14 +08:00
Wang Nan f5e5054721 Merge pull request #1503 from nantas/v1.4
update engine version to v1.4.0
2017-02-17 11:21:03 +08:00
Jare Guo 25312a5e51 Merge pull request #1500 from natural-law/issue5243
Improve the initialization logic of Label with BitmapFont.
2017-02-17 11:09:03 +08:00
zhangbin ae50aeff1a Improve the initialization logic of Label with BitmapFont. 2017-02-17 11:06:15 +08:00
Wang Nan 1698e30ede Merge pull request #1494 from pandamicro/fixAssertID
Use argsArr to wrap arguments in cc.xxxID and fix assertID logic issue
2017-02-17 10:33:17 +08:00
pandamicro 1690651ae1 Merge pull request #1487 from jareguo/v1.4
fix ClassManager
2017-02-17 10:18:08 +08:00
Nan Wang b5095887ae update engine version to v1.4.0 2017-02-17 10:12:22 +08:00
Jare Guo 5d38426653 working on component scheduler 2017-02-17 00:24:36 +08:00
pandamicro ecada6d697 Improve cc.xxxID implementation 2017-02-16 15:52:30 +08:00
Jare Guo 846e83b467 Merge pull request #1493 from natural-law/db-hot-fix
Solve the error logic of CCSlot._updateZOrder.
2017-02-16 15:44:07 +08:00
Jare Guo 562162201a Merge pull request #1491 from pandamicro/v1.4
Fix loader.getResCount
2017-02-16 15:43:06 +08:00
zhangbin 4f8e4ba6d5 Improve the initialization logic of Label with BitmapFont. 2017-02-16 10:36:24 +08:00
Jare Guo 21eebc11b6 Merge pull request #1499 from VisualSJ/v1.4-video
Parameter missing(video)
2017-02-15 15:58:31 +08:00
VisualSJ 400bb5898e Parameter missing(video-review) 2017-02-15 15:57:00 +08:00
VisualSJ 0efdd2378f Parameter missing(video) 2017-02-15 15:44:16 +08:00
Jare Guo a51c20d0f4 Merge pull request #1497 from natural-law/solve-spine-issue
Solve the error effect when a spine node with custom color.
2017-02-15 15:37:18 +08:00
zhangbin 7065902c00 Reviewed issue. 2017-02-15 15:28:57 +08:00
zhangbin c1a5bdd97d Solve the error effect when a spine node with custom color. 2017-02-15 15:28:57 +08:00
Jare Guo a1c17ea7d2 Merge pull request #1489 from natural-law/issue5199
Solve the error effect when a spine node with custom color.
2017-02-15 15:20:50 +08:00
zhangbin 11fb51fcf6 Reviewed issue. 2017-02-15 15:15:37 +08:00
Jare Guo 6bc4bfb07b Merge pull request #1496 from natural-law/issue5232
Solve the opacity & color errors of children armatures.
2017-02-15 15:11:13 +08:00
zhangbin e7957b4f5c Solve the opacity & color errors of children armatures. 2017-02-15 14:58:39 +08:00
pandamicro 86b71bc3d6 Use argsArr to wrap arguments in cc.xxxID and fix assertID logic issue 2017-02-15 14:40:46 +08:00
pandamicro ff569e8a45 Activate FIX_ARTIFACTS_BY_STRECHING_TEXEL by default 2017-02-15 14:27:10 +08:00
zhangbin 77c349cd96 Solve the error logic of CCSlot._updateZOrder. 2017-02-15 14:12:18 +08:00
Wang Nan 0448bf983f Merge pull request #1492 from jareguo/temp2
Sync 1.3
2017-02-15 00:35:30 +08:00
Jare Guo 6d63d1a0ff Merge branch 'v1.3'
# Conflicts:
#	cocos2d/core/event-manager/CCEventManager.js
2017-02-14 17:53:25 +08:00