Commit Graph

912 Commits

Author SHA1 Message Date
zilongshanren 14b51b2ef6 fix layout reorder child issue.
Fix https://github.com/cocos-creator/fireball/issues/1935
2016-02-17 17:22:41 +08:00
Jare Guo ec2d4db718 Merge pull request #339 from jareguo/master
add api syntax for children event
2016-02-17 16:01:41 +08:00
Jare Guo 04fd455c87 add api syntax for children event 2016-02-17 15:52:02 +08:00
Jare Guo 30904861da Merge pull request #337 from knoxHuang/master
request #1873 Adding components to save data ParticleSystem plist fil…
2016-02-17 15:16:04 +08:00
knoxHuang 64c5ca1d52 Merge branch 'master' of github.com:fireball-x/engine 2016-02-17 15:15:42 +08:00
knoxHuang 5fd7f5d73b fix #1873 code 2016-02-17 15:14:54 +08:00
Jare Guo e196c5767a Merge pull request #338 from jareguo/master
sprite should not display again if spriteFrame is null
2016-02-17 15:14:34 +08:00
Jare Guo e96c3ef4cb sprite should not display again if spriteFrame is null 2016-02-17 15:12:45 +08:00
knoxHuang c9a462601f request #1873 Adding components to save data ParticleSystem plist file function 2016-02-17 14:01:46 +08:00
Jare Guo ee27138bf3 Merge pull request #336 from jareguo/master
minor fix audio source
2016-02-17 12:03:12 +08:00
Jare Guo cc4b564ddb minor fix audio source 2016-02-17 12:01:15 +08:00
Jare Guo 52555ccbd3 Merge pull request #335 from 2youyouo2/master
fixed reset defaultClip
2016-02-17 11:53:21 +08:00
Jare Guo c8425ccc48 Merge pull request #333 from jareguo/master
add API onRestore for reset menu and undo operation
2016-02-17 11:52:21 +08:00
2youyouo2 f4221121f6 fixed reset defaultClip 2016-02-17 11:44:34 +08:00
Jare Guo d4161f409c Merge pull request #334 from zilongshanren/fix-reset-component-null
fix reset scrollbar null exception
2016-02-17 11:41:21 +08:00
zilongshanren 3ca164fe19 fix reset scrollbar null exception 2016-02-17 11:33:15 +08:00
Jare Guo a248cd22fe add API onRestore for reset menu and undo operation 2016-02-17 11:14:18 +08:00
pandamicro bb4f2fb394 Merge pull request #324 from minggo/master
fix comments
2016-02-17 10:38:40 +08:00
pandamicro 4125cb34ba Merge pull request #332 from dabingnn/fix_canvas_generateColorTexture
fix generate color texture
2016-02-17 10:37:56 +08:00
Huabing.Xu 8e4a381e04 add protected code when rect.width or rect.height is 0 2016-02-17 10:29:40 +08:00
Huabing.Xu dd610d4c30 fix generate color texture 2016-02-17 10:18:12 +08:00
pandamicro c15cdbf754 Merge pull request #331 from jareguo/master
fix getBoundingBox
2016-02-16 15:40:36 +08:00
Jare Guo e0244b4c42 fix getBoundingBox 2016-02-16 15:24:54 +08:00
Jare Guo 080329009c Merge pull request #329 from knoxHuang/master
remove  sourcePosition tip
2016-02-16 09:48:55 +08:00
knoxHuang 07f2b4279b remove sourcePosition tip 2016-02-16 09:45:18 +08:00
Jare Guo f10d337eea Merge pull request #330 from jareguo/spine
implement _getLocalBounds to make spine pickable
2016-02-15 21:37:56 +08:00
Jare Guo 520eddd0f9 implement _getLocalBounds to make spine pickable 2016-02-15 17:45:20 +08:00
pandamicro aa76cfeadb Merge pull request #328 from jareguo/spine
Spine
2016-02-15 11:55:01 +08:00
Jare Guo 1c1062f2ae update pr 2016-02-15 11:46:22 +08:00
Jare Guo 4a2cae6f8e update pr 2016-02-15 10:55:55 +08:00
minggo fbcd6bde05 fix comment 2016-02-15 09:41:50 +08:00
Wang Nan 58c3bbd0fe Merge pull request #320 from nantas/master
improving api doc
2016-02-14 23:58:15 +08:00
Jare Guo d435ce5fce implement spine plugin 2016-02-14 16:08:06 +08:00
Jare Guo 638f0d92ac clean up old spine codes 2016-02-14 15:25:21 +08:00
pandamicro b0d76e8f5f Merge pull request #327 from pandamicro/master
Fix documentation in Node/Scheduler
2016-02-14 00:23:03 +08:00
pandamicro 82aafce352 Fix documentation in Node/Scheduler 2016-02-14 00:22:09 +08:00
Jare Guo d2680b962d Merge pull request #326 from jareguo/master
minor tweaks
2016-02-05 20:05:12 +08:00
Jare Guo 6c6a1d8eba minor tweaks 2016-02-05 20:02:59 +08:00
Nan Wang aa748daea7 fixed director type. add spritetype and sizemode enum. 2016-02-05 17:47:29 +08:00
Nan Wang 73de4661ef fixed animation state type. 2016-02-05 17:18:40 +08:00
Nan Wang ecbeba95a2 Merge branch 'master' of github.com:cocos-creator/engine 2016-02-05 17:18:04 +08:00
Wang Nan 67d323529b Merge pull request #325 from cocos-creator/v0.7
merge v0.7
2016-02-05 17:17:33 +08:00
minggo 0ad613c02f re-add optional default value 2016-02-04 23:07:58 +08:00
minggo 9d605e2734 fix comments 2016-02-04 18:34:49 +08:00
Nan Wang 5a7f6d79b8 Merge branch 'master' of github.com:cocos-creator/engine 2016-02-04 13:57:42 +08:00
Nan Wang 95e28d3bb8 fixed return type. 2016-02-04 13:57:13 +08:00
pandamicro d7b9f5a3dc Merge pull request #322 from minggo/master
fix comments
2016-02-04 13:52:30 +08:00
minggo 29e20cc47c fix comments 2016-02-04 13:43:58 +08:00
Nan Wang cfcef658ce Merge branch 'master' of github.com:cocos-creator/engine 2016-02-04 09:57:38 +08:00
Jare Guo b3ecf08ec8 Merge pull request #321 from pandamicro/loader
Fix more JSB crash issues
2016-02-04 09:51:12 +08:00