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

27119 Commits

Author SHA1 Message Date
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
andyque 9a43706db8 refactor variable names of ui::Scale9Sprite 2015-01-20 15:29:25 +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
XiaoYang 15904fda0a Merge pull request #219 from lvlonggame/v3 
modify function description.
 2015-01-20 15:18:46 +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
andyque 38906dce45 refactor for scale9Sprite 2015-01-20 15:10:03 +08:00
yusheng.lu f274277367 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version_1 2015-01-20 14:35:15 +08:00
andyque 1fb30c61f7 clean up coding style 2015-01-20 14:24:10 +08:00
andyque 221e7a4310 refactor remedyLayoutParamter function 2015-01-20 14:24:10 +08:00
Liam 81f3995cc1 update uiTextBMFont setString 2015-01-20 14:20:20 +08:00
yangxiao 2a2330438c fix anchor point bug 2015-01-20 14:10:11 +08:00
Liam 118b74e95c update uiTextBMFont setFontFile 2015-01-20 13:55:39 +08:00
minggo bad526e8de Merge pull request #10064 from pipu/fix_memory_leak 
Fix memory leak
 2015-01-20 13:48:35 +08:00
WenhaiLin e5fc236ec4 Add test case for issue#10089 2015-01-20 12:01:51 +08:00
WenhaiLin f2c6a48976 Fixed lose the precision of label's dimensions 2015-01-20 11:46:43 +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
lvlong 7934d36e24 modify function description. 2015-01-20 10:46:00 +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 d38b802780 BMFont need to refresh size by refresh the string 2015-01-19 17:07:15 +08:00
Liam e8fa6597df fix uitext size error 2015-01-19 17:02:28 +08:00
Liam 987bfd4831 fix imageview render error 2015-01-19 17:00:53 +08:00
Liam 90df276067 add function for ui button 2015-01-19 16:58:46 +08:00
yusheng.lu 5dc87f49b0 Moved the version pair to 1st position of its map. 2015-01-19 14:42:43 +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
XiaoYang f84c58c4ea Merge pull request #215 from lvlonggame/v3 
fix bug: animate3D & sequence
 2015-01-19 11:01:24 +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
cpascal 73b91ddc2c Merge remote-tracking branch 'upstream/v3' into v3 2015-01-19 10:55:50 +09:00
cpascal 281d231a5d Fixed inconsistent time-scale in Httpclient. 2015-01-19 10:50:42 +09:00
Huabing.Xu d1c0c0eeb6 [ci skip] update version 2015-01-19 09:50:19 +08:00
htl 5a87908344 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-19 09:38:34 +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