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

22841 Commits

Author SHA1 Message Date
minggo a8bb2462de Merge pull request #7052 from gin0606/videoPlayerScaleIssue 
Fix video scale issue in iOS
 2014-07-28 10:43:13 +08:00
minggo b58569151b Merge pull request #7590 from andyque/fixWidgetContentSize 
Simplify Widget ContentSize cascade change algorithm
 2014-07-28 10:40:05 +08:00
AppleJDay bd5ca6a244 Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions 2014-07-28 10:39:35 +08:00
Dhilan007 f02b80bc2c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio 2014-07-28 10:39:20 +08:00
boyu0 85b9765b8f Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha() 2014-07-28 10:38:22 +08:00
minggo 9805a4bbf2 Merge pull request #7588 from Dhilan007/v3 
fix warn
 2014-07-28 10:33:01 +08:00
Dhilan007 f7a08d5697 Fix the size of VideoPlayer is incorrect on android. 2014-07-28 10:09:46 +08:00
Huabing.Xu 3e9b900665 Merge branch 'v3' into v3_windowChangeModule 2014-07-28 09:23:45 +08:00
Huabing.Xu 7f5782c207 chang module name for windows project file 2014-07-28 09:20:02 +08:00
Dhilan007 66e54c3a77 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio 2014-07-27 22:07:16 +08:00
dzl-ian bc30519812 Add missing space in function definition 2014-07-27 08:23:16 +09:00
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
boyu0 34a8d26124 Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image. 2014-07-25 18:19:04 +08:00
boyu0 e3b79f4150 delete Image::_preMulti, Deprecate Image::isPremultipliedAlpha(), change Image::hasPremultipliedAlpha() meaning. 2014-07-25 18:01:32 +08:00
Dhilan007 154be91808 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio 2014-07-25 17:58:40 +08:00
heliclei aba0a12413 [ci skip][jenkins]merge pull request to latest baseline before build 2014-07-25 16:38:22 +08:00
gin0606 c66ebbf528 Fix void* casting 2014-07-25 16:41:12 +09:00
andyque 7353f8685a Simplify Widget ContentSize cascade change algorithm 2014-07-25 14:59:58 +08:00
dzl-ian 7048bc515b Remove update of content size as it won't change 2014-07-25 15:52:35 +09:00
andyque e56e015be2 minor modification of tests 2014-07-25 14:40:58 +08:00
Dhilan007 b9cfa4a8b5 fix warn 2014-07-25 14:38:02 +08:00
Huabing.Xu b72bffab1f change mac/ios target name 2014-07-25 14:27:52 +08:00
andyque 3502cb0a23 fix remove self in Widget touch callback issue 2014-07-25 14:23:04 +08:00
dzl-ian 3ad0d981c4 Add getter and setter for TextColor to Text Widget 2014-07-25 14:46:25 +09:00
gin0606 4ee13994ce Fix Scale issue on cocos2d-x cpp-test 2014-07-25 13:10:16 +09:00
Huabing.Xu 68894e622f add indexData 2014-07-25 11:58:54 +08:00
LiuZhuo 2f10e8e468 Update CCParticleSystem.cpp 2014-07-25 11:40:23 +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
Huabing.Xu a4cd61f30a compiles OK: raw version of vertex Index buffer, half version of vertex data 2014-07-25 09:58:24 +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
Dhilan007 a558e78ff0 Merge branch 'v3-newaudio' of D:\github_repository\cocosNew into v3 2014-07-24 22:00:57 +08:00
minggo b9d8e84b4d Merge pull request #7581 from andyque/fixEditBoxCompile 
fix mac compile error
 2014-07-24 21:59:31 +08:00