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 |
|
zilongshanren
|
478ce6446f
|
add gradient color properties
|
2017-02-17 18:15:46 +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 |
|
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
|
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 |
|
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 |
|
pandamicro
|
70e648397e
|
Fix loader.getResCount
|
2017-02-14 17:18:48 +08:00 |
|
Jare Guo
|
fac0533c4a
|
fix ClassManager
|
2017-02-14 10:41:42 +08:00 |
|
Wang Nan
|
a64aa19375
|
Merge pull request #1482 from jareguo/v1.4
fix error when calling super prototype.ctor in CCClass
|
2017-02-10 18:44:22 +08:00 |
|
Wang Nan
|
84b01c71af
|
Merge pull request #1486 from natural-law/issue5202
Modify the callback argument of spine event listener.
|
2017-02-10 17:34:08 +08:00 |
|
zhangbin
|
d0e88c80c0
|
Modify the callback argument of spine event listener.
Change the argument trackIndex to trackEntry.
|
2017-02-10 17:18:45 +08:00 |
|
Wang Nan
|
b9c79c354d
|
Merge pull request #1485 from pandamicro/v1.4
Fix for last minute fixes
|
2017-02-10 17:13:54 +08:00 |
|
pandamicro
|
afc2640127
|
Fix cc.view undefined issue
|
2017-02-10 17:10:49 +08:00 |
|
pandamicro
|
5876a71865
|
Merge pull request #1483 from pandamicro/v1.4
Last minutes fixes
|
2017-02-10 16:31:52 +08:00 |
|
pandamicro
|
6a429365dc
|
Improve screen adaptation logic
|
2017-02-10 16:23:33 +08:00 |
|
Jare Guo
|
84d0bfff38
|
fix error when calling super prototype.ctor in CCClass
|
2017-02-10 15:35:02 +08:00 |
|
pandamicro
|
964d8b0bfa
|
Supports rgb format in color.fromHEX
|
2017-02-10 11:36:53 +08:00 |
|
pandamicro
|
e3245e9d20
|
Fix distortion shader usage issue
|
2017-02-10 11:35:56 +08:00 |
|
Wang Nan
|
c834071bbc
|
Merge pull request #1481 from knoxHuang/v1.4
fix callInNextTick execution sequence for #fireball/issues/5157
|
2017-02-10 11:11:27 +08:00 |
|
knoxHuang
|
acb126217c
|
fix callInNextTick execution sequence for #fireball/issues/5157
|
2017-02-10 11:02:04 +08:00 |
|
Wang Nan
|
110ee9b77b
|
Merge pull request #1480 from VisualSJ/v1.4-5182
Fixed a bug about audio loader
|
2017-02-09 15:42:10 +08:00 |
|
Jare Guo
|
3824528da2
|
Merge pull request #1479 from knoxHuang/v1.4
fix animation bug for fireball/issues/5157
|
2017-02-09 15:31:58 +08:00 |
|
knoxHuang
|
e2c8ab34ed
|
fix animation bug for fireball/issues/5157
|
2017-02-09 15:29:00 +08:00 |
|
VisualSJ
|
99e0ed8d45
|
Fixed a bug about audio loader
|
2017-02-09 14:10:58 +08:00 |
|
Jare Guo
|
e4b407affe
|
Merge pull request #1478 from jareguo/v1.4
fix prefab loading issue
|
2017-02-08 12:11:16 +08:00 |
|
Jare Guo
|
bd6750fc0a
|
fix prefab loading issue
|
2017-02-08 12:06:45 +08:00 |
|
Jare Guo
|
c9178120c6
|
Merge pull request #1477 from knoxHuang/v1.4
fix CCParticleSystem error for fireball/issues/5155
|
2017-02-08 00:16:27 +08:00 |
|