Commit Graph

22373 Commits

Author SHA1 Message Date
Sergey 92ac809bfe Mac fonts tests 2014-07-24 12:27:17 +04:00
Sergey 9501b9912d load font v2 2014-07-24 12:25:07 +04:00
Huabing.Xu 7dc7c95ca3 fix mac compile error 2014-07-24 14:47:54 +08:00
Huabing.Xu c7bfc934fd windows works now 2014-07-24 12:57:39 +08:00
andyque a9a16b3ee5 fix RichText visit issue 2014-07-24 11:51:47 +08:00
Huabing.Xu f795ca5467 Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError 2014-07-24 10:38:25 +08:00
Huabing.Xu 58cd01b2f6 reverse cocos2d.vcxproj 2014-07-24 10:37:54 +08:00
Huabing.Xu 918da16639 Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError 2014-07-24 10:09:59 +08:00
Huabing.Xu b110296e53 reverse win32 sln 2014-07-24 10:09:38 +08:00
minggo 03299cb76a Merge pull request #7572 from darkdukey/download-dep
Make download-deps.py easier to use
2014-07-24 09:40:22 +08:00
minggo 2e83d34852 Merge pull request #7573 from dabingnn/v3_mac_relative_path
change mac cocosNetwork deps to relative path
2014-07-24 09:38:35 +08:00
minggo 09a9b5dadd Merge pull request #7571 from CocosRobot/update_cocosfiles_1406133479
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-24 09:38:11 +08:00
Huabing.Xu e274b38a16 change mac cocosNetwork deps to relative path 2014-07-24 09:36:21 +08:00
Nite Luo 5c92e26417 Make download-deps.py easier to use 2014-07-23 15:59:36 -07:00
CocosRobot ea69a2c72d [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-23 16:38:00 +00:00
Ricardo Quesada b8282d3efd Merge pull request #7570 from ricardoquesada/license_spine
Adds Spine license
2014-07-23 09:28:36 -07:00
Ricardo Quesada 5a96751a19 Adds Spine license 2014-07-23 09:27:58 -07:00
kaile.yin 3b1ee96aef fixed armature blendfunc effect 2014-07-23 21:35:08 +08:00
wagulu 46ac5d12b2 Update CCParticleSystem.cpp
diff is base on WorldSpace, when you scale scene,you will get the wrong value.
2014-07-23 21:04:17 +08:00
kaile.yin 01d85340ad fixed black edge in Armature 2014-07-23 20:07:33 +08:00
minggo 3732feb14b [ci skip] 2014-07-23 18:36:38 +08:00
minggo 92a6aab146 [ci skip] 2014-07-23 18:34:53 +08:00
Huabing.Xu 61ff03ab45 windows cpp-tests works now 2014-07-23 18:34:49 +08:00
minggo 0d77485b3b Merge pull request #7560 from Mazyod/fix-tableview-touch-handler
FIX: make sure TableView parents are visible before handling touch
2014-07-23 18:32:30 +08:00
minggo 0f105a58c2 Merge pull request #7563 from andyque/minorFixOfRichText
minor fix of RichText
2014-07-23 18:17:41 +08:00
kaile.yin bdad6d9b67 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-23 15:24:36 +08:00
kaile.yin 5aae024a7b fixed cannot set blendfunc to Armature 2014-07-23 15:21:20 +08:00
minggo fcaee3faf8 Merge pull request #7564 from CocosRobot/update_lua_bindings_1406096395
[AUTO]: updating luabinding automatically
2014-07-23 14:27:54 +08:00
minggo f690299ccd [ci skip] 2014-07-23 14:25:14 +08:00
CocosRobot 283d727b76 [AUTO]: updating luabinding automatically 2014-07-23 06:21:31 +00:00
minggo 769267020d Merge pull request #7562 from samuele3hu/v3_conversion
Show detail class & function name on conversion error and update bindings-generator submodule
2014-07-23 14:17:20 +08:00
andyque 21f1624462 minor fix of RichText 2014-07-23 14:10:00 +08:00
samuele3hu 0a6af2f758 Add more useful tip for error log 2014-07-23 13:44:57 +08:00
samuele3hu 6d678ce443 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion 2014-07-23 11:57:56 +08:00
samuele3hu 91fc288fbe Add more useful tip for error log 2014-07-23 11:57:17 +08:00
minggo 2b2a00f0b3 [ci skip] 2014-07-23 11:33:12 +08:00
minggo 3662077025 Merge pull request #7556 from Dhilan007/v3
fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
2014-07-23 11:29:26 +08:00
Huabing.Xu a8c151cc02 change xcode project file 2014-07-23 09:21:53 +08:00
Huabing.Xu b281c38c20 init version of VertexIndexBuffer 2014-07-23 09:20:33 +08:00
Mazyad Alabduljaleel f19acbb6db [FIX]: make sure parent is visible before handling touch 2014-07-23 03:42:29 +04:00
minggo 6d8c1cd4f1 Merge pull request #7559 from minggo/fix-xcode-project
fix the bug that cocos2d_libs.xcodeproj can not be opened in cocos2d_test.xcodeproj
2014-07-22 23:44:34 +08:00
minggo abe0166f60 fix the bug that cocos2d_libs.xcodeproj can not be opened in cocos2d_tests.xcodeproj 2014-07-22 23:41:30 +08:00
LinWenhai 0fe02b3636 Update CCFontAtlasCache.cpp 2014-07-22 22:07:19 +08:00
LinWenhai 815d063a0a replace sprintf with snprintf 2014-07-22 22:05:56 +08:00
minggo 8f50135229 Update config.json 2014-07-22 22:04:17 +08:00
minggo d005ea2404 [ci skip] 2014-07-22 21:33:24 +08:00
minggo 033bbbe440 [ci skip] 2014-07-22 21:25:20 +08:00
minggo d68e7eb465 [ci skip] 2014-07-22 21:23:16 +08:00
minggo 1af3236d09 Merge pull request #6997 from newnon/v3_software_pvr_decompression
V3 software pvr decompression
2014-07-22 21:21:16 +08:00
Sergey 9e692cd329 missing include 2014-07-22 15:49:39 +04:00