Commit Graph

25 Commits

Author SHA1 Message Date
andyque 1be5402050 Merge branch 'v3' into addiOSMultiline-support
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
2015-09-16 21:49:55 +08:00
fusijie 5f527bfc1d Fixed sprite debug draw. 2015-08-26 18:18:58 +08:00
fusijie dcef1e9d31 fix polygon sprite setflipped bug. 2015-07-31 15:49:44 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
WenhaiLin 1494f09f06 Remove unneeded include files and fixed warns. 2015-06-25 23:15:39 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
Jacky 562d4b9a78 fix on the windows. 2015-06-09 11:23:37 +08:00
WuHao 2650de030c modified tests to show current epsilon 2015-06-08 15:08:16 +08:00
Jacky 3e62dd0473 remove unused file and code. 2015-06-06 13:31:25 +08:00
WuHao 0a51c9bd27 Finished AutoPolygon and Sprite 2015-06-04 15:43:31 +08:00
WuHao 3c5326ba1f removed spritePolygon, merge into sprite and draft of AutoPolygon 2015-06-02 10:10:09 +08:00
WuHao 3d62805d04 Merge branch 'v3' into fix_spritepolygon
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/2d/MarchingSquare.cpp
2015-05-29 18:10:41 +08:00
Jacky 8df4920f6e fixed file name. 2015-05-29 15:03:36 +08:00
Jacky 514c8ae965 move sprite polygon logic to sprite polygon cache. 2015-05-19 11:25:53 +08:00
minggo 3b60f67041 Merge pull request #11816 from fusijie/fix_spritepolygon
fix memory leakage.
2015-05-14 10:19:48 +08:00
Jacky c7acb9b83d fix memory leakage. 2015-05-13 17:21:57 +08:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00
WenhaiLin ce7e36f76e Fixed warns and crash on Win32. 2015-04-28 20:10:56 +08:00
WuHao 9d46c5413d added performance test for SpritePolygon 2015-04-28 15:18:40 +08:00
WuHao a046f74c4d fix anchor point bug 2015-04-27 17:30:38 +08:00
WuHao 9f2ea5fbb9 fixed some SpritePolygon create, added more tests 2015-04-27 13:34:47 +08:00
WuHao c1d10ffa1c fixed poly2tri creation method, added testCase 2015-04-24 18:28:28 +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