Commit Graph

941 Commits

Author SHA1 Message Date
Nan Wang 068c38d559 merged v1.4 2017-03-14 10:04:00 +08:00
zilongshanren 4e1bd339aa only set spacingX when label is bmfont 2017-03-10 14:10:37 +08:00
Jare Guo 21eb9ed894 Merge pull request #1523 from jareguo/master
重新实现组件生命周期调用,支持脚本优先级
2017-03-09 12:56:41 +08:00
Jare Guo bdbc04b462 extract NodeActivator 2017-03-09 01:52:23 +08:00
Jare Guo 86f3a09f98 reviewed 2017-03-08 20:33:34 +08:00
Jare Guo b272941cf6 working on execution order of lifecycle methods 2017-03-08 17:33:20 +08:00
2youyouo2 dae0a14f41 Merge branch 'v1.4' of github.com:fireball-x/engine into physics 2017-03-08 16:41:00 +08:00
zilongshanren 4a31d4bcac fix BMFont spacingX 2017-03-07 18:54:31 +08:00
Jare Guo 454671046b Merge pull request #1528 from 2youyou2/playOnLoad
add _playedOnLoad for CCAnimation
2017-03-02 17:01:53 +08:00
2youyouo2 4c62bd89fe playOnLoad should work in start 2017-03-02 16:54:45 +08:00
2youyouo2 a624733058 add _playedOnLoad for CCAnimation 2017-03-02 15:46:36 +08:00
Jare Guo 1f0b5503f0 Merge commit 'aaa2ac73b9dc0b05bf3d1b05342d10676e0ad432' into temp2
# Conflicts:
#	cocos2d/core/platform/CCClass.js
#	cocos2d/core/platform/CCView.js
#	cocos2d/core/platform/_CCClass.js
#	jsb/jsb-director.js
2017-03-02 14:30:09 +08:00
Jare Guo c43c5262aa minor fix (+1 squashed commit)
Squashed commits:
[c91748a] minor fix
2017-03-01 14:02:54 +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 6d1a459a5d fix spriteInsets on JSB 2017-02-19 15:45:04 +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
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
zhangbin ae50aeff1a Improve the initialization logic of Label with BitmapFont. 2017-02-17 11:06:15 +08:00
Jare Guo 5d38426653 working on component scheduler 2017-02-17 00:24:36 +08:00
zhangbin 4f8e4ba6d5 Improve the initialization logic of Label with BitmapFont. 2017-02-16 10:36:24 +08:00
Jare Guo 6d63d1a0ff Merge branch 'v1.3'
# Conflicts:
#	cocos2d/core/event-manager/CCEventManager.js
2017-02-14 17:53:25 +08:00
Jare Guo 3ada4789f2 working on component scheduler 2017-02-10 19:59:44 +08:00
Jare Guo c861b7ded2 Merge pull request #1468 from cocos-creator/v1.4
Sync V1.4
2017-02-03 21:24:43 +08:00
Jare Guo 7e7c58a058 should enable try catch for life-cycle methods in edit mode 2017-02-03 17:57:12 +08:00
Jare Guo 64e253a1e7 Sync 1.4 2017-01-24 15:16:29 +08:00
pandamicro eb71e44cb8 Remove useless modules 2017-01-22 17:34:22 +08:00
Jare Guo 2b80e4bf35 fix destroy missing component 2017-01-22 10:46:04 +08:00
Jare Guo e572ce5f84 Merge commit 'cc26ee35ee3e97474faf93b07242fb5531d1518c' into temp2 2017-01-19 11:08:59 +08:00
zilongshanren 58008584ee don't emit vidoPlayer event when in Editor 2017-01-19 10:24:58 +08:00
VisualSJ b2ef365eec review code 2017-01-16 17:30:03 +08:00
VisualSJ 59c787ba0a Fixed a bug about ios setVolume 2017-01-16 17:07:30 +08:00
Jare Guo aeff840cb4 Sprite#setInsetLeft should take effect before onLoad 2017-01-12 11:49:39 +08:00
Jare Guo 8cab9f31a9 Merge pull request #1416 from VisualSJ/1.4-5050
The problem of audio playback
2017-01-06 21:43:32 +08:00
VisualSJ 7bab7e2740 Review code 2017-01-06 18:14:02 +08:00
VisualSJ 477853c3ca Review code 2017-01-06 16:17:39 +08:00
VisualSJ 98f7bd5aaf The problem of audio playback 2017-01-06 16:15:40 +08:00
zilongshanren 3ee0c88e33 fix toggle check/uncheck event emit 2017-01-06 15:26:22 +08:00
zilongshanren 9c436f0bcc add label outline to richtext 2017-01-05 16:59:49 +08:00
Jare Guo 69aef0634e Merge pull request #1413 from zilongshanren/fix-scrollbar-size-issue
Fix scrollbar size issue
2017-01-04 16:02:53 +08:00
zilongshanren 0e3a66e71c fix scrollbar size less than scrollview size 2017-01-04 15:57:10 +08:00
zilongshanren 802b59354e don't resize bar node size to it's parent 2017-01-04 14:41:34 +08:00
knoxHuang 9130bf34a1 Add the Canvas defaults to the project settings for fireball/issues/4602 2017-01-04 11:10:46 +08:00
zilongshanren 2da17ecbb8 fix pageview_indicator cellSize tooltip 2017-01-04 10:50:14 +08:00
zilongshanren b1e7855d70 fix typo 2016-12-30 11:26:01 +08:00
Jare Guo 8becd8f9d7 improve log if script not found 2016-12-27 17:04:20 +08:00
zilongshanren a514d4ddc6 make labelatlas inheritent from bitmapfont 2016-12-23 21:18:41 +08:00
zilongshanren 025f92da24 finish labelatlas 2016-12-23 17:43:38 +08:00
knoxHuang 85de852a50 fix pageview bug for fireball/issues/4972 2016-12-23 17:01:56 +08:00