Commit Graph

111 Commits

Author SHA1 Message Date
Nan Wang 017f573473 merge v1.0 2016-05-17 13:00:03 +08:00
Jare Guo d4f1eb6f68 Merge pull request #657 from pandamicro/v1.0
Fix setSiblingIndex and some code cleanup
2016-05-17 12:00:37 +08:00
pandamicro f4c86f906a Fix event order not changed in setSiblings and some code cleanup 2016-05-17 11:57:21 +08:00
Jare Guo 10b259a21c support minimized serialization 2016-05-17 00:39:27 +08:00
Wang Nan 5d9ce5d57e Merge pull request #669 from cocos-creator/v1.0
merge V1.0
2016-05-13 13:45:01 +08:00
knoxHuang b0122605fb fix Inherits from SGNode nodes can not overload a method in BaseNodePropertyDefine.js 2016-05-12 11:06:36 +08:00
Jare Guo 3f1b682d19 Merge commit '0d438a748a5aae594e29344fffe4ea040e235c81'
# Conflicts:
#	cocos2d/core/components/CCRendererInSG.js
#	cocos2d/core/load-pipeline/asset-table.js
#	cocos2d/tilemap/CCTiledMap.js
#	jsb/jsb-editbox.js
2016-04-27 10:01:06 +08:00
Jare Guo 8a11d50099 inline redundant type cheching function 2016-04-25 14:33:47 +08:00
Johnny Wu 41ca344fe1 fix properties define syntax error 2016-04-25 10:30:01 +08:00
Johnny Wu 68ca51085f add distortion scale 2016-04-25 10:20:11 +08:00
Huabing.Xu 6b86b638ec add distortion sprite 2016-04-22 10:15:20 +08:00
Wang Nan 5e8922f58f Merge pull request #598 from cocos-creator/v1.0
merge v1.0
2016-04-14 12:00:59 +08:00
Huabing.Xu 1237b2bbe9 fix indices out of range when using tiled sprite (#596)
* fix indices out of range when using tiled sprite

* change default indices size to 54
2016-04-13 18:55:57 +08:00
SijieWang 71cb529763 9宫格在只进行visit的时候状态不更新的问题 (#572)
* Fixed a bug about update _displayColor and _transform

* Fixed a bug about Sprite transform

* Fixed a bug about Sprite transform

* Fixed a bug about Sprite transform
2016-04-11 16:21:06 +08:00
Jare Guo 91113f83c9 update sprite frame doc 2016-04-05 23:59:05 +08:00
pandamicro 4b605f4ede Merge pull request #547 from dabingnn/v1.0_optimise_spriteRendering_WGL
optimise sprite rendering by using indexBuffer
2016-03-28 11:28:15 +08:00
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
Huabing.Xu e4ec5a5e7e optimise sprite rendering by using indexBuffer 2016-03-27 10:49:06 +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
Jare Guo a9adcd63df fix SpriteFrame.setTexture 2016-03-25 20:52:12 +08:00
zilongshanren 80344be921 improve the ProgressBar reverse behavior 2016-03-24 15:47:03 +08:00
knoxHuang 7757ac7ae2 fix Animation api 2016-03-22 18:07:00 +08:00
knoxHuang a5ef25e29f fix Animation api 2016-03-22 17:32:41 +08:00
knoxHuang bf21367874 update animation all api 2016-03-22 16:12:49 +08:00
pandamicro 6f530df13b Cleanup other modules 2016-03-14 21:46:13 +08:00
pandamicro 5a690106ea Modulize and cleanup shaders 2016-03-14 21:46:12 +08:00
pandamicro 1d8a6f29e0 Refactor cc.Macro to cc.macro 2016-03-14 11:49:03 +08:00
pandamicro 6a3bc53a0a Cleanup kazmath module 2016-03-14 11:49:03 +08:00
pandamicro 8306801243 Modulize event-manager, renderer and clean up core 2016-03-14 11:49:03 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
Huabing.Xu 53b040cd49 fix rendering bug of sprite in canvas 2016-03-01 14:49:39 +08:00
Nan Wang 5c2725a965 fix api syntax. 2016-02-25 17:51:42 +08:00
pandamicro 0ea99226cc Replace cc.loader with pipeline loader 2016-02-25 10:34:09 +08:00
knoxHuang 4c623eeb22 Merge branch 'master' of github.com:cocos-creator/engine 2016-02-24 13:55:54 +08:00
Jare Guo 466dd16ba3 Merge pull request #369 from dabingnn/refactor_rename_filled_type
rename enum in filled type Horizontal->HORIZONTAL Vertical->VERTICAL
2016-02-24 10:03:42 +08:00
Huabing.Xu 1af3c4181d rename enum in filled type Horizontal->HORIZONTAL Vertical->VERTICAL 2016-02-24 09:44:53 +08:00
Nan Wang 6d2c1de29f fix multiple class types. 2016-02-23 15:37:34 +08:00
knoxHuang 4be34aeec8 remove contentScaleFactor Redundant code 2016-02-23 10:22:12 +08:00
knoxHuang 36b5f75aec remove contentScaleFactor 2016-02-22 17:42:59 +08:00
Jare Guo af799991c5 Updating api about engine-extends 2016-02-18 16:06:25 +08:00
Jare Guo ecec5af4aa Merge pull request #342 from dabingnn/support_negtive_for_filledSprite
support negtive value for filled sprite
2016-02-18 11:56:08 +08:00
Huabing.Xu 416020499d support negtive value for filled sprite 2016-02-18 11:48:34 +08:00
zilongshanren 14b51b2ef6 fix layout reorder child issue.
Fix https://github.com/cocos-creator/fireball/issues/1935
2016-02-17 17:22:41 +08:00
Nan Wang aa748daea7 fixed director type. add spritetype and sizemode enum. 2016-02-05 17:47:29 +08:00
Jare Guo e187eeb533 Merge pull request #313 from minggo/master
fix some comments
2016-02-02 15:56:59 +08:00
minggo abf53d15a6 fix some comments 2016-02-02 15:46:20 +08:00
Nan Wang 8f22fca843 merged ccscheduler. 2016-02-01 10:47:54 +08:00
minggo b8eae4cc39 fix some comments 2016-01-29 18:32:54 +08:00
Nan Wang d691c16952 update api comments to remove unecessary base class. 2016-01-29 16:32:49 +08:00