Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,243 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

5019 Commits

Author SHA1 Message Date
minggo 20e3a61524 Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2 
mac custom font fix v2
 2014-07-25 11:38:38 +08:00
minggo 88d4adda63 Merge pull request #7586 from samuele3hu/v3_retain 
Fix the a error in the `ccmap_string_key_to_luaval` function
 2014-07-25 11:26:33 +08:00
minggo 98943b4517 Merge pull request #7548 from yongkangchen/v3 
fix Label::setTextColor did not have any effect.
 2014-07-25 11:18:10 +08:00
samuele3hu 1d055fe6e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_retain 2014-07-25 09:44:52 +08:00
samuele3hu e51cb57c53 Fix the a error in the `ccmap_string_key_to_luaval` functions 2014-07-25 09:44:17 +08:00
minggo d3e30b1b32 Merge pull request #7574 from andyque/fixRichTextVisitIssue 
fix RichText visit issue
 2014-07-25 09:24:58 +08:00
CocosRobot 8cc0a2eea3 [AUTO]: updating luabinding automatically 2014-07-24 14:23:49 +00:00
minggo b0c922d91e Merge pull request #7188 from pandamicro/FileUtils_FILE_API 
Refactor #5580: Add new file&directory apis into FileUtils and test cases
 2014-07-24 22:18:10 +08:00
Unai Orbe ae56e637f8 allow setting bundle to use in file utils 2014-07-24 11:56:59 +01:00
minggo fa1d9ecf0c Merge pull request #7568 from 2youyouo2/v3 
fixed init Armature blendfunc state
 2014-07-24 17:44:56 +08:00
Sergey 9501b9912d load font v2 2014-07-24 12:25:07 +04: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
kaile.yin 3b1ee96aef fixed armature blendfunc effect 2014-07-23 21:35:08 +08:00
kaile.yin 01d85340ad fixed black edge in Armature 2014-07-23 20:07:33 +08:00
Huabing.Xu 61ff03ab45 windows cpp-tests works now 2014-07-23 18:34:49 +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
CocosRobot 283d727b76 [AUTO]: updating luabinding automatically 2014-07-23 06:21:31 +00: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 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
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
Sergey 9e692cd329 missing include 2014-07-22 15:49:39 +04:00
Sergey 59cbc153d4 Copyright & small fixes 2014-07-22 15:49:38 +04:00
Sergey 9c0493d40b mipmaps loading fix 2014-07-22 15:49:37 +04:00
Sergey 600dbebfb0 pvr 2bpp decompression fixed 2014-07-22 15:49:37 +04:00
Sergey 624b6a5af4 unused variable removed 2014-07-22 15:49:37 +04:00
Sergey 1a617ad804 pvr display fix pvr decompression on 64 bit platforms fix 2014-07-22 15:49:36 +04:00
Sergey 2acce6771f software per decompression support 2014-07-22 15:49:36 +04:00
minggo f2f0152f54 Merge pull request #7555 from CocosRobot/update_lua_bindings_1406020122 
[AUTO]: updating luabinding automatically
 2014-07-22 18:36:30 +08:00
minggo 2e56a4ce21 Merge pull request #7546 from nutty898/v3_nutty_modifynodereader 
Fixed bug of NodeReader
 2014-07-22 18:34:36 +08:00
Dhilan007 f38b48914f fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments. 2014-07-22 18:31:53 +08:00
CocosRobot c8c17b68df [AUTO]: updating luabinding automatically 2014-07-22 09:11:18 +00:00
minggo 8cc25f82e6 fix compiling error 2014-07-22 17:03:27 +08:00
Yongkang Chen bb7d6ba3d4 fix Label::setTextColor did not have any effect. 2014-07-22 14:52:41 +08:00
samuele3hu aa0308a7c8 Add more useful tip for error log 2014-07-22 11:16:16 +08:00
zhangcheng 76c12e9029 1. add export to function CocosGUIVersion() 2014-07-22 10:02:00 +08:00
cai wenzhi d14522880d Fixed bug of NodeReader 2014-07-21 22:45:33 +08:00
zhangcheng bc254cab25 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CocosStudioSurpport 2014-07-21 20:46:55 +08:00
Huabing.Xu 3403182f3e change define macros to avoid run error on mac 32 bit 2014-07-21 18:12:46 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
minggo 8e3220ba9e Merge pull request #7533 from dabingnn/v3_windowsDllCompileError 
fix windows compile error
 2014-07-21 17:17:33 +08:00