Commit Graph

5281 Commits

Author SHA1 Message Date
yinkaile e5344a013f refactor sprite assembler structure 2017-12-22 15:38:31 +08:00
yinkaile e23a97d790 fixed node matrix is wrong when undo/redo 2017-12-22 15:05:20 +08:00
yinkaile 6ceb4c36de fixed global variable 2017-12-21 11:55:30 +08:00
yinkaile 7cfae81e51 support tiledmap 2017-12-21 11:39:19 +08:00
yinkaile 2bd439e890 fixed motion streak 2017-12-21 11:38:11 +08:00
yinkaile e30ce09da4 small fix 2017-12-19 10:26:10 +08:00
yinkaile 186910d426 Merge branch 'next' of github.com:fireball-x/engine into next 2017-12-18 18:05:57 +08:00
yinkaile 17a035e082 optimize label 2017-12-18 16:41:25 +08:00
pandamicro fa7dcc752b Merge pull request #2194 from pandamicro/fix
Do not remove material in onDisable and fixes
2017-12-18 16:21:20 +08:00
pandamicro e8d375014d Small issue fixes 2017-12-18 16:13:08 +08:00
pandamicro 5d4b74f249 Do not remove material in onDisable 2017-12-18 16:12:11 +08:00
yinkaile 9ebf2f85d4 Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
#	cocos2d/core/value-types/CCColor.js
2017-12-17 12:36:47 +08:00
yinkaile 14f04ac23b add label assembler 2017-12-17 12:33:24 +08:00
yinkaile 0e3dead9f1 fixed TextUtils 2017-12-17 12:32:59 +08:00
yinkaile a7f42d4879 HTMLCavnasElement should init directly 2017-12-17 12:32:32 +08:00
yinkaile 80481b69f3 fixed CCColor 2017-12-17 12:31:33 +08:00
pandamicro efed83573a Merge pull request #2187 from pandamicro/next
Use cc.errorID instead of console.error
2017-12-14 17:55:42 +08:00
pandamicro 950fd4e41d Use cc.errorID instead of console.error 2017-12-14 17:54:42 +08:00
pandamicro c26bc3b176 Merge pull request #2186 from pandamicro/next
Support Mask in new renderer
2017-12-14 17:28:31 +08:00
pandamicro 31686bbfd0 Remove CCClippingNode 2017-12-14 17:24:27 +08:00
pandamicro 49bf5d6eaf Support Mask in new renderer 2017-12-14 17:23:23 +08:00
pandamicro 0ae01978a7 Merge pull request #2185 from pandamicro/next
Fix simple sprite rendering issue and color issue
2017-12-14 17:22:44 +08:00
pandamicro ac3add6a46 Improve render data management 2017-12-14 13:43:20 +08:00
pandamicro fc513a518b Fix color channel getter / seter issue 2017-12-14 13:42:19 +08:00
pandamicro f8ca2a905e Fix simple sprite rendering issue 2017-12-14 13:41:57 +08:00
pandamicro 5dd6735875 Merge pull request #2181 from pandamicro/next
Upgrade to renderer.js v1.7.0
2017-12-12 15:56:44 +08:00
pandamicro 47ea543f90 Upgrade to renderer.js v1.7.0 2017-12-12 15:55:26 +08:00
pandamicro 150883a6af Fix gulp build issue 2017-12-12 15:55:09 +08:00
pandamicro 46e3cc0c4e Merge pull request #2176 from 2youyou2/next
refactor MotionStreak
2017-12-11 18:08:39 +08:00
yinkaile 2e772699a8 remove unused line 2017-12-11 18:03:59 +08:00
yinkaile df07d05bc4 Revert "fixed get node scale property"
This reverts commit bb7b9339e0.
2017-12-11 17:58:54 +08:00
pandamicro 6b720ed314 Merge pull request #2178 from pandamicro/next
Revert Node _scale to _scaleX & _scaleY
2017-12-11 17:56:19 +08:00
pandamicro 773cc84d66 Revert Node _scale to _scaleX & _scaleY 2017-12-11 17:55:05 +08:00
pandamicro 8b456a92f6 Merge pull request #2177 from pandamicro/next
Add render component post handle support
2017-12-11 17:54:13 +08:00
pandamicro 52187f4eee Fix Game EVENT_HIDE SHOW doc 2017-12-11 17:37:47 +08:00
yinkaile e5574255f0 repaint engine when preview state changed 2017-12-11 14:03:27 +08:00
yinkaile dc42ffdb44 fixed MotionStreak preview 2017-12-11 13:55:03 +08:00
yinkaile 3599ef12f6 refactor MotionStreak 2017-12-11 12:01:06 +08:00
yinkaile 12f8387c6d add color to RenderData 2017-12-11 12:00:34 +08:00
yinkaile bb7b9339e0 fixed get node scale property 2017-12-11 11:47:12 +08:00
pandamicro 50446fa3a6 Add render component post handle support 2017-12-10 22:28:43 +08:00
pandamicro 22435a4316 Merge pull request #2174 from pandamicro/next
Oops, previous PR doesn't improve performance after all
2017-12-08 16:54:31 +08:00
pandamicro f73721c246 Oops, previous PR doesn't improve performance after all 2017-12-08 16:34:26 +08:00
pandamicro 338a64a462 Merge pull request #2172 from pandamicro/next
Fill data in batchQueue, much faster in v8
2017-12-08 16:01:41 +08:00
pandamicro 521ba0c84a Fill data in batchQueue, much faster in v8 2017-12-08 16:00:10 +08:00
pandamicro fd34f94657 Merge pull request #2170 from pandamicro/next
Remove antialias config due to performance dropdown
2017-12-08 14:50:24 +08:00
pandamicro b760be59ce Remove useless jsb skip files 2017-12-08 14:46:56 +08:00
pandamicro c28cdafe8e Remove antialias config due to performance dropdown 2017-12-08 14:29:03 +08:00
pandamicro bd3cf1360b Merge pull request #2167 from 2youyou2/next
refactor graphics
2017-12-07 16:45:43 +08:00
yinkaile 32fb764de6 apply graphics to new RenderData 2017-12-07 16:24:26 +08:00