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

26889 Commits

Author SHA1 Message Date
yusheng.lu 858bafdae9 Removed the unused variable to make XCode compile pass. 2015-01-20 19:56:00 +08:00
yusheng.lu a35be8977a Submodule ccs-res go forward. 2015-01-20 19:18:23 +08:00
yusheng.lu bfe767cf58 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test 2015-01-20 19:16:13 +08:00
minggo e849243894 Merge pull request #10109 from CocosRobot/update_lua_bindings_1421741688 
[AUTO]: updating luabinding automatically
 2015-01-20 16:51:40 +08:00
CocosRobot 9a15610983 [AUTO]: updating luabinding automatically 2015-01-20 08:17:36 +00:00
minggo 4ff7a95d5a Merge pull request #10106 from samuele3hu/v3_4_issue9537 
issue #9537:Make parameters more sense
 2015-01-20 16:11:08 +08:00
minggo 151146deff Merge pull request #10103 from damorton/v3 
Update CCRef.cpp
 2015-01-20 16:09:35 +08:00
samuele3hu d4db54dc64 issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
minggo f83c791eee Merge pull request #10104 from CocosRobot/update_lua_bindings_1421739367 
[AUTO]: updating luabinding automatically
 2015-01-20 15:40:54 +08:00
CocosRobot 37dcdacc7f [AUTO]: updating luabinding automatically 2015-01-20 07:38:26 +00:00
David 1e3ee08561 Update CCRef.cpp 
Updated the comment explaining the Ref::retain and Ref::release functions for readability.
 2015-01-20 07:32:18 +00:00
minggo 6ebe1169f6 Merge pull request #10066 from samuele3hu/v3_4_rc1_check 
Add macro judgement for CC_PLATFORM_MAC
 2015-01-20 15:32:05 +08:00
minggo c8688afbf6 Merge pull request #10077 from doomsdayer/v3_sim_dynamic_root_note 
Dynamic change the root node's size when changing the resolusion of the simulator
 2015-01-20 15:24:12 +08:00
minggo 7dee9d2356 Merge pull request #10074 from liamcindy/LayoutComponent_2.4 
update for lay out component
 2015-01-20 15:12:49 +08:00
minggo bad526e8de Merge pull request #10064 from pipu/fix_memory_leak 
Fix memory leak
 2015-01-20 13:48:35 +08:00
minggo a3046730d7 Merge pull request #10073 from liamcindy/Widget_2.4 
the ui widget need to refresh size by ignore state
 2015-01-20 11:23:23 +08:00
minggo 7507336b50 [ci skip] Update CHANGELOG 2015-01-20 11:17:31 +08:00
yusheng.lu 811c5e1f54 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test 2015-01-20 10:45:18 +08:00
minggo a05fc8bc8e Merge pull request #10070 from liamcindy/Imageview_2.4 
fix imageview render error
 2015-01-20 10:41:17 +08:00
minggo 22c5e49f38 Merge pull request #10081 from MSOpenTech/wp8-fix 
Added support for Universal App device orientation change
 2015-01-20 09:39:16 +08:00
Dale Stammen 56d8e62409 added support for device orienation change. Fixed gravity for winrt landscape flipped 2015-01-19 09:38:49 -08:00
yusheng.lu 7fde1d0e0d When reading csd/csb and the simulator's resolution is changed, change the root node's size to fit the simulator windows size. It will make sure the layout component feature works. 2015-01-19 18:10:30 +08:00
pipu ea84ae78dc Invoke FileUtils::getInstance()->getStringFromFile() instead of FileUtils::getInstance()->getFileData(). 2015-01-19 17:16:26 +08:00
Liam 3b0ba72b01 update for lay out component 2015-01-19 17:11:04 +08:00
Liam 62020483fc the ui widget need to refresh size by ignore state 2015-01-19 17:09:15 +08:00
Liam 987bfd4831 fix imageview render error 2015-01-19 17:00:53 +08:00
samuele3hu cc732743da Add macro judgement for CC_PLATFORM_MAC 2015-01-19 13:58:03 +08:00
pipu 77c6d2fa4f Merge branch 'v3' into fix_memory_leak 2015-01-19 12:41:34 +08:00
minggo a456a3b917 Merge pull request #10052 from slackmoehrle/patch-4 
provided a link to Wikipedia about Frustum culling
 2015-01-19 11:58:13 +08:00
minggo f4039a8fea Merge pull request #10058 from CocosRobot/update_cocosfiles_1421631253 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-19 11:56:51 +08:00
pipu 103fecf3ef Fixes memory leaks of using FileUtils::getInstance()->getFileData() in FlatBuffersSerialize.cpp. 2015-01-19 11:45:20 +08:00
yusheng.lu bba8d6481f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test 2015-01-19 10:05:39 +08:00
Huabing.Xu d1c0c0eeb6 [ci skip] update version 2015-01-19 09:50:19 +08:00
CocosRobot 945be7529d [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-19 01:34:14 +00:00
minggo 20fa8efe6b Merge pull request #10053 from MSOpenTech/wp8-fix 
WP8/WP8.1 shader fixes
 2015-01-19 09:32:22 +08:00
Dale Stammen 7b6b02d338 catch exception for older winrt tablets not supporting accelerometer report interval 2015-01-16 15:36:16 -08:00
Dale Stammen 86567afa5f added kShaderType_PositionColor_noMVP_GrayScale for WP8 to support UIScale9Sprite 2015-01-16 15:02:05 -08:00
Dale Stammen 5988cb520d added precompiled shader for ccPositionTextureColor_noMVP_vert and ccUIGrayScale_frag shader for UIScale9Sprite" 2015-01-16 14:59:08 -08:00
Dale Stammen 096fc13c47 added ui shader 2015-01-16 14:57:41 -08:00
Dale Stammen 7b3154a7ee updated precompiled shaders for WP8 2015-01-16 11:19:32 -08:00
Dale Stammen 2c6ec3eebe added ccShader_PositionColorPointsize-no-gl_PointSize.vert for WP8.1 2015-01-16 11:19:00 -08:00
slackmoehrle aa69b5b2ae provided a link to Wikipedia about Frustum culling 
provided a link to Wikipedia about Frustum culling as there is no definition of what it is.
 2015-01-16 12:37:46 -05:00
Huabing.Xu 2c5d82d772 Merge pull request #10051 from CocosRobot/update_cocosfiles_1421424819 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-17 00:25:42 +08:00
CocosRobot f9192835c9 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-16 16:13:41 +00:00
Huabing.Xu 1e0baaa219 Merge pull request #10050 from dualface/v3-origin 
update template/runtime version
 2015-01-16 23:34:08 +08:00
dualface bc75849ac7 update template/runtime version 2015-01-16 23:22:03 +08:00
dualface 63fba4f86f fix compile win32 2015-01-16 23:19:00 +08:00
Huabing.Xu 05b59d0ef3 Merge pull request #10048 from dabingnn/v3_updateReleaseNotes 
V3 update release notes
 2015-01-16 23:16:41 +08:00
Huabing.Xu f59a50a2f6 [ci skip] update releasenotes 2015-01-16 23:16:00 +08:00
Huabing.Xu 9e073f5445 [ci skip] update releasenotes 2015-01-16 23:13:59 +08:00