Jare Guo
|
b1e8e498e9
|
make sizeProvider error more clear
|
2016-05-21 18:23:03 +08:00 |
|
Wang Nan
|
0e100fd4c1
|
Merge pull request #707 from VisualSJ/master_2535_2
Fixed a bug about use system font
|
2016-05-20 18:23:44 +08:00 |
|
ViusualSJ
|
02c8015610
|
Fixed a bug about use system font
|
2016-05-20 17:46:04 +08:00 |
|
Wang Nan
|
20874ca2e4
|
Merge pull request #702 from VisualSJ/master_2535_2
remove useSystemFont from CCGLabel
|
2016-05-20 16:40:55 +08:00 |
|
ViusualSJ
|
3861c76385
|
remove useSystemFont from CCGLabel
|
2016-05-20 15:38:51 +08:00 |
|
Wang Nan
|
ef96a955a0
|
Merge pull request #693 from jareguo/master
refactor error checking codes for type attribute in CCClass
|
2016-05-20 15:35:00 +08:00 |
|
ViusualSJ
|
306a61707a
|
remove useSystemFont from CCGLabel
|
2016-05-20 15:28:51 +08:00 |
|
Wang Nan
|
4e555017a1
|
Merge pull request #701 from natural-law/issue2610
Record the BMFont original size in the BitmapFont Asset object.
|
2016-05-20 15:08:40 +08:00 |
|
zhangbin
|
8ecb85ffa9
|
Remove unused code.
|
2016-05-20 14:43:50 +08:00 |
|
Jare Guo
|
e009c93410
|
Merge pull request #699 from pandamicro/master
支持在屏幕朝向不正确的情况下自动转屏
|
2016-05-20 14:37:40 +08:00 |
|
zhangbin
|
b56dfce1da
|
Change the bmFontOriginalSize property to private.
|
2016-05-20 14:35:00 +08:00 |
|
Wang Nan
|
8c17eab601
|
Merge pull request #698 from jareguo/temp
build a single js for preview
|
2016-05-20 13:59:48 +08:00 |
|
zhangbin
|
bd83852ec5
|
Record the original size in the BitmapFont Asset object.
|
2016-05-20 11:35:00 +08:00 |
|
pandamicro
|
e86e846a74
|
Support auto rotate canvas when screen orientation isn't correct
|
2016-05-20 10:58:52 +08:00 |
|
Jare Guo
|
5f3aecb6a4
|
add type checking code for addChild
|
2016-05-20 10:30:15 +08:00 |
|
pandamicro
|
d8908507b7
|
Merge pull request #692 from knoxHuang/master
fix update and start calling sequence bug
|
2016-05-19 17:48:47 +08:00 |
|
knoxHuang
|
a1eb098225
|
fix start update lateUpdate calling sequence bug
|
2016-05-19 17:37:38 +08:00 |
|
Wang Nan
|
3dadca53cc
|
Merge pull request #696 from 2youyouo2/tag
add tag for collider
|
2016-05-19 16:27:20 +08:00 |
|
2youyouo2
|
f0f0175262
|
add tag for collider
|
2016-05-19 16:06:02 +08:00 |
|
Wang Nan
|
9a08a40ff1
|
Merge pull request #695 from 2youyouo2/anim
move _updateClip to editor
|
2016-05-19 15:31:25 +08:00 |
|
Jare Guo
|
655ca3412b
|
remove duplicated setFontFileOrFamily in Label
|
2016-05-19 13:52:12 +08:00 |
|
Jare Guo
|
dbba94fbfb
|
refactor error checking codes for type attribute in CCClass
|
2016-05-19 11:51:31 +08:00 |
|
Jare Guo
|
07b0fab451
|
Merge pull request #681 from natural-law/issue3007
Solve the error in TiledMap when build for android on Windows.
|
2016-05-19 11:40:33 +08:00 |
|
2youyouo2
|
4a22551b21
|
move _updateClip to editor
|
2016-05-19 11:17:22 +08:00 |
|
pandamicro
|
0af950dc70
|
Use EventTarget to emit EVENT_HIDE & EVENT_SHOW
|
2016-05-19 11:02:17 +08:00 |
|
zhangbin
|
eb057da554
|
Change the solution of issue 3007.
|
2016-05-19 10:00:17 +08:00 |
|
Wang Nan
|
3ddb895928
|
Merge pull request #689 from zilongshanren/fix-layout-initialize-issue
fix scrollview layout as content issue
|
2016-05-19 09:42:37 +08:00 |
|
Wang Nan
|
5eeee99508
|
Merge pull request #691 from VisualSJ/master_audioloader
修复音效无法播放的问题
|
2016-05-19 09:42:21 +08:00 |
|
zilongshanren
|
99d2a4b71e
|
always listen on size-changed event
|
2016-05-18 18:39:11 +08:00 |
|
knoxHuang
|
7144f10f04
|
Merge branch 'master' of github.com:fireball-x/engine
Conflicts:
cocos2d/motion-streak/CCMotionStreak.js
|
2016-05-18 18:29:42 +08:00 |
|
ViusualSJ
|
a3b10ad4b5
|
change ONLY_ONE
|
2016-05-18 18:29:08 +08:00 |
|
ViusualSJ
|
fd80dc816c
|
Fixed a bug about remove loader item
|
2016-05-18 18:28:30 +08:00 |
|
Wang Nan
|
c51e89f49e
|
Merge pull request #684 from zilongshanren/fix-label-webgl-size-issue
fix label not updating content size
|
2016-05-18 18:24:52 +08:00 |
|
Wang Nan
|
820f615dfa
|
Merge pull request #687 from natural-law/issue2610
Add property in Label component for the origin size of BMFont.
|
2016-05-18 18:24:32 +08:00 |
|
zilongshanren
|
13ab2a1242
|
fix scrollview layout as content issue
|
2016-05-18 18:00:41 +08:00 |
|
zilongshanren
|
7ae03ef67e
|
initalize temp variable.
|
2016-05-18 16:35:51 +08:00 |
|
zhangbin
|
8a85398ab1
|
Rename the property & the method.
|
2016-05-18 16:21:30 +08:00 |
|
zhangbin
|
215cd99831
|
Add property in Label component for the origin size of BMFont.
|
2016-05-18 15:37:41 +08:00 |
|
Wang Nan
|
f680c2c591
|
Merge pull request #685 from dabingnn/label_add_outline
adjust outline effect
|
2016-05-17 18:28:42 +08:00 |
|
zilongshanren
|
1f4770d32a
|
simplify label content update size logic
|
2016-05-17 18:28:41 +08:00 |
|
Huabing.Xu
|
e2c12e672c
|
multiply width by 2
|
2016-05-17 18:13:44 +08:00 |
|
Huabing.Xu
|
714a9816e9
|
adjust outline effect
|
2016-05-17 17:53:27 +08:00 |
|
zilongshanren
|
34ae8d3ccf
|
fix label not updating content size
|
2016-05-17 17:15:35 +08:00 |
|
knoxHuang
|
ca6ae57179
|
fix MotionStreak color example
|
2016-05-17 16:24:13 +08:00 |
|
knoxHuang
|
3a5a0d0d4d
|
add color for MotionStreak and fix motionStreak warning.
|
2016-05-17 15:58:33 +08:00 |
|
Nan Wang
|
32beee604f
|
Merge branch 'master' of github.com:cocos-creator/engine
|
2016-05-17 14:10:02 +08:00 |
|
Nan Wang
|
2d170fd1a1
|
merged visualsj
|
2016-05-17 14:09:36 +08:00 |
|
Wang Nan
|
edf92d24a5
|
Merge pull request #679 from dabingnn/label_add_outline
add width for stroke
|
2016-05-17 14:02:10 +08:00 |
|
Wang Nan
|
3a5b74fa47
|
Merge pull request #677 from knoxHuang/v1.0
fix MotionSteak bug
|
2016-05-17 14:01:48 +08:00 |
|
Nan Wang
|
017f573473
|
merge v1.0
|
2016-05-17 13:00:03 +08:00 |
|