WenhaiLin
|
ce7e36f76e
|
Fixed warns and crash on Win32.
|
2015-04-28 20:10:56 +08:00 |
WuHao
|
dcf8f674bc
|
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
Conflicts:
cocos/2d/SpritePolygon.cpp
cocos/2d/SpritePolygonCache.cpp
|
2015-04-27 17:18:26 +08:00 |
WuHao
|
815c6a9b74
|
merge the start and end points
|
2015-04-27 16:33:54 +08:00 |
WuHao
|
9f2ea5fbb9
|
fixed some SpritePolygon create, added more tests
|
2015-04-27 13:34:47 +08:00 |
WuHao
|
5620da1adf
|
fixed anchor point issue, removed rect rotated property
|
2015-04-24 18:17:12 +08:00 |
WuHao
|
0e318dd8dc
|
fixed UV issue, also taking account of contentScaleFactor, made test case better
|
2015-04-24 17:39:43 +08:00 |
WuHao
|
07349ff588
|
initial cpp test
|
2015-04-23 18:03:03 +08:00 |
WuHao
|
1ee87140b1
|
renamed PolySprite to SpritePolygon
|
2015-04-23 14:34:56 +08:00 |