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

22249 Commits

Author SHA1 Message Date
minggo 6217748f1c [ci skip] 2014-07-25 23:16:27 +08:00
minggo 4a969c4afe [ci skip] 2014-07-25 23:14:18 +08:00
minggo 31af102f26 Merge pull request #7532 from lite3/object_to_luaval 
replace dynamic_cast to std::is_base_of
 2014-07-25 23:11:55 +08:00
minggo 568698a1be Merge pull request #7593 from heliclei/pull-request-builder 
[ci skip][jenkins]merge pull request to latest baseline before build
 2014-07-25 22:58:01 +08:00
minggo 732bd407a2 Merge pull request #7589 from dabingnn/v3_renameModule 
change mac/ios target name
 2014-07-25 22:45:49 +08:00
heliclei aba0a12413 [ci skip][jenkins]merge pull request to latest baseline before build 2014-07-25 16:38:22 +08:00
Huabing.Xu b72bffab1f change mac/ios target name 2014-07-25 14:27:52 +08:00
minggo 5ac75dadcc [ci skip] 2014-07-25 11:40:10 +08:00
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 c50c884d80 [ci skip] 2014-07-25 11:23:49 +08:00
minggo 98f9395728 [ci skip] 2014-07-25 11:21:52 +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
minggo 4d11c84d08 Merge pull request #7584 from CocosRobot/update_lua_bindings_1406211714 
[AUTO]: updating luabinding automatically
 2014-07-25 09:23:01 +08:00
minggo ae522f08fb [ci skip] 2014-07-24 23:06:42 +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
minggo 991fcffbf1 [ci skip] 2014-07-24 22:09:13 +08:00
minggo c60be03243 [ci skip] 2014-07-24 22:06:30 +08:00
minggo 20ce967cf4 Merge pull request #7582 from Gamevy/feature/use-non-main-bundle-ios 
Allow setting bundle to use in file utils
 2014-07-24 22:04:24 +08:00
minggo b9d8e84b4d Merge pull request #7581 from andyque/fixEditBoxCompile 
fix mac compile error
 2014-07-24 21:59:31 +08:00
Unai Orbe ae56e637f8 allow setting bundle to use in file utils 2014-07-24 11:56:59 +01:00
andyque e9ab6bb5cd fix EidtBox mac 32bit compile error 2014-07-24 17:56:28 +08:00
minggo fa1d9ecf0c Merge pull request #7568 from 2youyouo2/v3 
fixed init Armature blendfunc state
 2014-07-24 17:44:56 +08:00
minggo 55ca7c3914 Merge pull request #7576 from dabingnn/v3_fixWindowsCompileError 
V3 fix windows compile error
 2014-07-24 17:42:56 +08:00
andyque 9b82453df4 Merge branch 'v3_fixMacCompileError' of https://github.com/dabingnn/cocos2d-x into fixEditBoxCompile 2014-07-24 17:13:17 +08:00
minggo 04271edc4e Merge pull request #7579 from heliclei/ci-dailybuild-android 
[ci skip][jenkins]add android dailybuild script, records all built libs to database
 2014-07-24 16:59:07 +08:00
heliclei 97aa3b5239 [ci skip][jenkins]add android dailybuild script, records all built libs(*.a) size to database 2014-07-24 16:48:42 +08:00
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
kaile.yin 01d85340ad fixed black edge in Armature 2014-07-23 20:07:33 +08:00