minggo
|
7204aab00e
|
fix license
|
2018-03-28 16:45:14 +08:00 |
|
minggo
|
a87ae66cb2
|
helloworld can run correctly
|
2018-03-28 09:15:17 +08:00 |
|
minggo
|
d9c0236e50
|
jsb adapt
|
2018-03-26 14:54:34 +08:00 |
|
minggo
|
f91bab267f
|
merge h5 and fix conflict
|
2018-03-26 11:05:19 +08:00 |
|
minggo
|
6e37e154f5
|
JSB adaption
|
2018-03-26 10:54:09 +08:00 |
|
pandamicro
|
73e6cb1c19
|
Merge pull request #2468 from 2youyou2/next-performance
refactor sprite assembler to optimize performance
|
2018-03-23 18:15:26 +08:00 |
|
pandamicro
|
3326b3016c
|
Merge pull request #2469 from 2youyou2/next
fixed new renderer bugs
|
2018-03-23 18:13:07 +08:00 |
|
yinkaile
|
0d5b02ac2a
|
refactor sprite assembler to optimize performance
|
2018-03-23 15:42:16 +08:00 |
|
yinkaile
|
70b7d8a4a0
|
set debug draw zIndex to MAX_ZINDEX
|
2018-03-23 14:56:15 +08:00 |
|
yinkaile
|
2f36d9269d
|
deprecated _opacity property
|
2018-03-23 14:51:52 +08:00 |
|
yinkaile
|
1970ee7c80
|
fixed editbox text
|
2018-03-23 14:22:38 +08:00 |
|
pandamicro
|
3364e0de70
|
Merge pull request #2467 from pandamicro/next
Fix repeat calculation cause action could not be finished
|
2018-03-23 10:29:50 +08:00 |
|
pandamicro
|
1328668787
|
Fix repeat calculation cause action could not be finished
|
2018-03-23 10:19:18 +08:00 |
|
pandamicro
|
7ddc5c6df5
|
Merge pull request #2466 from pandamicro/next
Fix Director deprecated API issue
|
2018-03-23 10:17:55 +08:00 |
|
pandamicro
|
9b28a74856
|
Fix Director deprecated API issue
|
2018-03-23 10:08:48 +08:00 |
|
pandamicro
|
f4bcd89d60
|
Merge pull request #2465 from pandamicro/next
Cleanup View and deprecated APIs
|
2018-03-22 17:45:21 +08:00 |
|
pandamicro
|
ad97143fa5
|
Fix markFunctionWarning log issue
|
2018-03-22 17:32:31 +08:00 |
|
pandamicro
|
0fb074ec82
|
Cleanup old deprecated APIs
|
2018-03-22 16:58:55 +08:00 |
|
pandamicro
|
259f1c565a
|
Cleanup View APIs
|
2018-03-22 16:24:32 +08:00 |
|
pandamicro
|
2f9056052f
|
Merge pull request #2459 from CocosAss/next
Add new Chinese doc to some APIs
|
2018-03-22 15:00:53 +08:00 |
|
Cocos Ass
|
4ca7a671ce
|
add Chinese note to 2.0 scripts
add Chinese note to 2.0 scripts
|
2018-03-22 14:42:13 +08:00 |
|
pandamicro
|
85cbd3f1da
|
Merge pull request #2464 from pandamicro/next
Avoid using technique private _passes
|
2018-03-22 14:07:13 +08:00 |
|
pandamicro
|
717e36f73c
|
Avoid using technique private _passes
|
2018-03-22 13:45:07 +08:00 |
|
pandamicro
|
427f6ad46a
|
Merge pull request #2461 from pandamicro/hash
Add Material Hash for batch breaking
|
2018-03-22 12:59:28 +08:00 |
|
pandamicro
|
264c9b6172
|
Update hash generator
|
2018-03-22 12:04:14 +08:00 |
|
pandamicro
|
58d5547b5b
|
Merge pull request #2441 from 2youyou2/next
support RenderTexture
|
2018-03-21 18:41:30 +08:00 |
|
yinkaile
|
54fe7164de
|
refine code
|
2018-03-21 18:35:25 +08:00 |
|
yinkaile
|
d718101b3e
|
refine code
|
2018-03-21 17:28:30 +08:00 |
|
pandamicro
|
9324deb7f7
|
Simplify stencil manager
|
2018-03-21 17:07:50 +08:00 |
|
pandamicro
|
9f4a67a6f1
|
Improve material hash id update and compare
|
2018-03-21 16:39:36 +08:00 |
|
fusijie
|
10f56b59bd
|
add_effect_hash
|
2018-03-21 16:39:36 +08:00 |
|
minggo
|
0863363f32
|
merge from h5
|
2018-03-21 09:56:04 +08:00 |
|
pandamicro
|
c1a106df4c
|
Merge pull request #2452 from pandamicro/next
Cleanup value types APIs
|
2018-03-20 10:02:36 +08:00 |
|
pandamicro
|
9e0c688de7
|
Cleanup CCMacro
|
2018-03-19 22:30:52 +08:00 |
|
pandamicro
|
196c4000e9
|
Fix issues
|
2018-03-19 20:57:57 +08:00 |
|
pandamicro
|
f92894ea08
|
Remove CCTypes
|
2018-03-19 18:40:14 +08:00 |
|
pandamicro
|
920e4dbfa6
|
Remove CCPointExtensions
|
2018-03-19 18:04:55 +08:00 |
|
pandamicro
|
83507914ae
|
Fix issues and deprecate cc.p instead of removal
|
2018-03-19 13:05:19 +08:00 |
|
pandamicro
|
6e0825cd78
|
Fix other cc.p usage
|
2018-03-19 12:43:15 +08:00 |
|
pandamicro
|
802d57cdac
|
Move affine-transform to utils
|
2018-03-19 12:33:49 +08:00 |
|
pandamicro
|
e404b68b20
|
Cleanup vec2, size related APIs
|
2018-03-19 11:57:36 +08:00 |
|
pandamicro
|
dd1a2cfe8f
|
Cleanup Color related APIs
|
2018-03-19 11:57:00 +08:00 |
|
pandamicro
|
662ea862ee
|
Cleanup Rect related APIs
|
2018-03-19 11:56:23 +08:00 |
|
pandamicro
|
9c4d9a0d30
|
Improve affine transform doc
|
2018-03-19 11:54:11 +08:00 |
|
pandamicro
|
203212c37f
|
Cleanup AffineTransform APIs
|
2018-03-16 17:57:17 +08:00 |
|
pandamicro
|
2f12aa50d2
|
Update value type file names
|
2018-03-16 15:22:02 +08:00 |
|
yinkaile
|
b9792bcf19
|
Merge branch 'next' of github.com:fireball-x/engine into next
|
2018-03-16 15:15:27 +08:00 |
|
pandamicro
|
e00e6f24a7
|
Merge pull request #2449 from pandamicro/next
Fix Texture construction issue
|
2018-03-16 13:47:35 +08:00 |
|
pandamicro
|
f86b8609df
|
Fix Texture construction issue
|
2018-03-16 13:43:29 +08:00 |
|
pandamicro
|
0b0d357cc1
|
Merge pull request #2448 from pandamicro/next
Add Texture.getId
|
2018-03-16 13:03:45 +08:00 |
|