Wang Nan
|
00a1ff82af
|
Merge pull request #544 from jareguo/v1.0
fix SpriteFrame.setTexture
|
2016-03-28 11:10:28 +08:00 |
|
Wang Nan
|
80e84314d3
|
Merge pull request #548 from dabingnn/v1.0_fix_radialBug
fix radial bug by using range comparing(point comparing it used before)
|
2016-03-28 11:09:35 +08:00 |
|
Wang Nan
|
e9aad0395c
|
Merge pull request #549 from knoxHuang/v1.0
update Tiled Map API
|
2016-03-28 11:09:13 +08:00 |
|
knoxHuang
|
325175ec53
|
fix tile map api error
|
2016-03-28 10:58:13 +08:00 |
|
knoxHuang
|
256e94f605
|
Merge branch 'v1.0' of github.com:fireball-x/engine into v1.0
|
2016-03-28 09:44:18 +08:00 |
|
Huabing.Xu
|
782d9d068c
|
fix radial bug by using range comparing(point comparing it used before)
|
2016-03-27 10:18:09 +08:00 |
|
pandamicro
|
e4de4510cc
|
Merge pull request #545 from zilongshanren/fix-a-few-bugs
fix editbox touch issue.
|
2016-03-26 14:12:25 +08:00 |
|
zilongshanren
|
6522aad698
|
fix editbox touch issue.
fix loadRes API issue
|
2016-03-26 10:40:15 +08:00 |
|
Jare Guo
|
a9adcd63df
|
fix SpriteFrame.setTexture
|
2016-03-25 20:52:12 +08:00 |
|
pandamicro
|
4c726b2090
|
Merge pull request #543 from pandamicro/v1.0
Fix socket io variable name conflict in JSB
|
2016-03-25 20:50:42 +08:00 |
|
pandamicro
|
cf77995a94
|
Fix socket io variable name conflict in JSB
|
2016-03-25 20:49:10 +08:00 |
|
Wang Nan
|
1ae4d71dfc
|
Merge pull request #539 from jareguo/v1.0
fix spine blend mode
|
2016-03-25 20:24:53 +08:00 |
|
knoxHuang
|
b2c6ed3dfd
|
update Tiled Map API
|
2016-03-25 18:35:27 +08:00 |
|
Jare Guo
|
73d5240c7c
|
Merge pull request #542 from knoxHuang/v1.0
fix Audio Source bug
|
2016-03-25 18:31:30 +08:00 |
|
knoxHuang
|
ceb4064f84
|
fix Audio Source bug
|
2016-03-25 18:30:34 +08:00 |
|
Jare Guo
|
20bcac9e0c
|
Merge pull request #541 from knoxHuang/v1.0
fix spine API and fix CCNode on example error
|
2016-03-25 17:37:31 +08:00 |
|
knoxHuang
|
5fe7fffb00
|
update spine API and fix CCNode on example error
|
2016-03-25 17:34:42 +08:00 |
|
Wang Nan
|
19cf1331c8
|
Merge pull request #536 from knoxHuang/v1.0
update spine API
|
2016-03-25 16:24:57 +08:00 |
|
Wang Nan
|
306c302345
|
Merge pull request #540 from nantas/v1.0
fixed api doc error.
|
2016-03-25 16:23:12 +08:00 |
|
Nan Wang
|
c8b95e65b2
|
fixed api doc error.
|
2016-03-25 16:22:12 +08:00 |
|
knoxHuang
|
786a8981cb
|
update spine API
|
2016-03-25 16:12:25 +08:00 |
|
Jare Guo
|
ac5cbb54d9
|
fix spine blend mode
|
2016-03-25 13:58:40 +08:00 |
|
Wang Nan
|
c4188ca3c3
|
Merge pull request #538 from nantas/v1.0
update ccsprite tooltip.
|
2016-03-25 11:27:25 +08:00 |
|
Nan Wang
|
634270b0e8
|
update ccsprite tooltip.
|
2016-03-25 11:20:36 +08:00 |
|
knoxHuang
|
af62adf3f8
|
update spine API
|
2016-03-25 10:37:13 +08:00 |
|
Wang Nan
|
38100df5d5
|
Merge pull request #535 from pandamicro/v1.0
Modify README and some docs
|
2016-03-25 10:05:47 +08:00 |
|
pandamicro
|
a3a102626c
|
Improve component documentation
|
2016-03-24 22:51:46 +08:00 |
|
pandamicro
|
6be57f63e2
|
Modify README and some docs
|
2016-03-24 22:42:37 +08:00 |
|
Jare Guo
|
2c4af84bc2
|
Merge pull request #533 from zilongshanren/improveProgressBar
Improve progress bar
|
2016-03-24 22:10:32 +08:00 |
|
zilongshanren
|
cc8957cfca
|
fix editbox text vertical alignment
|
2016-03-24 21:27:26 +08:00 |
|
Jare Guo
|
5d810cf9d4
|
Merge pull request #534 from jareguo/v1.0
minor tweaks
|
2016-03-24 20:50:36 +08:00 |
|
Jare Guo
|
aa9304626d
|
minor tweaks
|
2016-03-24 20:28:06 +08:00 |
|
zilongshanren
|
83c30ea536
|
fix editbox maxLength
|
2016-03-24 18:01:41 +08:00 |
|
Wang Nan
|
e958c33bfd
|
Merge pull request #531 from knoxHuang/v1.0
update Node and Component API
|
2016-03-24 17:37:19 +08:00 |
|
knoxHuang
|
dd7e228c34
|
update Node and Component API
|
2016-03-24 17:14:06 +08:00 |
|
zilongshanren
|
b01f458217
|
fix label, editbox first time content size change
|
2016-03-24 17:07:38 +08:00 |
|
zilongshanren
|
80344be921
|
improve the ProgressBar reverse behavior
|
2016-03-24 15:47:03 +08:00 |
|
Jare Guo
|
e566a1846b
|
Merge pull request #532 from VisualSJ/v1.0_2333
Fixed a bug about Sprite opacity
|
2016-03-24 15:29:16 +08:00 |
|
ViusualSJ
|
ea32f5bf7b
|
Fixed a bug about Sprite opacity
|
2016-03-24 15:01:37 +08:00 |
|
pandamicro
|
00abde8df1
|
Merge pull request #530 from pandamicro/v1.0
完成 SpriteAtlas 实现,支持获取 url,sprite frame 和 texture
|
2016-03-23 18:43:08 +08:00 |
|
pandamicro
|
e9ed4846a3
|
Complete SpriteAtlas class
|
2016-03-23 18:41:18 +08:00 |
|
pandamicro
|
e2ea7b816a
|
Improve audio engine and audio downloader logic
|
2016-03-23 17:17:36 +08:00 |
|
Jare Guo
|
c89d52ddfa
|
Merge pull request #529 from zilongshanren/fix-syncstatus-transform
add true back to _syncStatus function
|
2016-03-23 16:16:48 +08:00 |
|
zilongshanren
|
26dc7622b7
|
add true back to _syncStatus function
|
2016-03-23 16:00:38 +08:00 |
|
pandamicro
|
69e86dd3f3
|
Merge pull request #527 from knoxHuang/v1.0
add Audio API
|
2016-03-23 15:45:48 +08:00 |
|
knoxHuang
|
be89229590
|
fix Audio API
|
2016-03-23 15:28:20 +08:00 |
|
knoxHuang
|
5ee0d68a07
|
add Audio API
|
2016-03-23 14:45:42 +08:00 |
|
Jare Guo
|
e47edf9027
|
Merge pull request #526 from knoxHuang/v1.0
update assets api
|
2016-03-23 14:24:54 +08:00 |
|
knoxHuang
|
eef23a0c35
|
update assets api
|
2016-03-23 14:21:56 +08:00 |
|
pandamicro
|
40a79621d2
|
Avoid black screen between scene transition
|
2016-03-23 13:42:06 +08:00 |
|