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

22826 Commits

Author SHA1 Message Date
yangxiao 42e7e3bbe8 format code 2014-08-14 14:11:00 +08:00
yangxiao 1942a27a5c Merge branch 'newcode' into v3_merge 2014-08-14 13:55:57 +08:00
minggo ae11f24cc8 Merge pull request #7779 from dabingnn/v3_fixSkinnedOutline 
V3 fix skinned outline
 2014-08-14 11:26:35 +08:00
Huabing.Xu a9a403013c fix skinned outline effect 2014-08-14 10:44:03 +08:00
minggo 4056333560 Merge pull request #7778 from CocosRobot/update_lua_bindings_1407983300 
[AUTO]: updating luabinding automatically
 2014-08-14 10:38:36 +08:00
minggo 888da8eee8 Merge pull request #7776 from CocosRobot/update_lua_bindings_1407982527 
[AUTO]: updating luabinding automatically
 2014-08-14 10:38:21 +08:00
CocosRobot e2857097d6 [AUTO]: updating luabinding automatically 2014-08-14 02:30:08 +00:00
yangxiao f6da3b76b5 use renderer passed instead of get from global 2014-08-14 10:29:17 +08:00
yangxiao 032ba062a9 rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +08:00
CocosRobot 6467dcaa57 [AUTO]: updating luabinding automatically 2014-08-14 02:17:25 +00:00
minggo 186fd78729 [ci skip] 2014-08-14 10:06:32 +08:00
Huabing.Xu 5d49afec0e fix ios running error 2014-08-14 10:04:01 +08:00
minggo f9e6dab507 Merge pull request #7770 from Dhilan007/v3-label-issue 
close issue#5734:Label:The letters sometimes slightly cut.
 2014-08-14 10:04:00 +08:00
yangxiao 4629d257e1 rename checkCameraMask to isVisibleByVisitingCamera 2014-08-14 09:58:11 +08:00
minggo 3ab8bed741 Merge pull request #7745 from samuele3hu/v3_module 
Modify cpp-template-default project configure
 2014-08-14 09:46:37 +08:00
minggo a88504b153 Merge pull request #7756 from andyque/fixTestCase 
fix custom particle tests position
 2014-08-14 09:44:16 +08:00
minggo e468beea86 Merge pull request #7760 from dabingnn/v3_addCallBackForRenderTexture 
add comment for the limit of RenderTextue::saveToFile
 2014-08-14 09:43:54 +08:00
minggo a6c75c0eb6 Merge pull request #7767 from super626/v3_merge2 
reset camera position in initDefault, Fix some tile map can not show bug
 2014-08-14 09:43:40 +08:00
minggo d76724b6aa Merge pull request #7773 from CocosRobot/update_lua_bindings_1407980273 
[AUTO]: updating luabinding automatically
 2014-08-14 09:43:08 +08:00
minggo 55e9487dbd [ci skip] 2014-08-14 09:42:59 +08:00
CocosRobot 7a99220aad [AUTO]: updating luabinding automatically 2014-08-14 01:39:44 +00:00
minggo 0b86e129b0 Merge pull request #7762 from andyque/addAlignmentToUILabel 
add UITextField color & place hold color, fix double delete bug
 2014-08-14 09:38:57 +08:00
minggo c809c8806a [ci skip] 2014-08-14 09:36:29 +08:00
minggo f1ae73bf30 Merge pull request #7766 from samuele3hu/v3_3_fix 
Add release_print lua binding
 2014-08-14 09:35:16 +08:00
minggo 91d5f69584 Merge pull request #7768 from andyque/addDisableStateToControl 
add missing safe guard in checkbox callback
 2014-08-14 09:34:55 +08:00
minggo b2dad11f7c [ci skip] 2014-08-14 09:33:32 +08:00
minggo 234f100187 Merge pull request #7769 from super626/mirrortest 
add mirror test
 2014-08-14 09:31:57 +08:00
minggo 7d2ca95988 Merge pull request #7749 from zawasp/virtual_pause_resume 
virtual Node::pause() / Node::resume()
 2014-08-14 09:31:10 +08:00
minggo 1e027ad7d4 Merge pull request #7772 from CocosRobot/update_cocosfiles_1407979781 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-14 09:30:31 +08:00
CocosRobot 6510d74ff7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-14 01:29:42 +00:00
minggo 8128335d7f Merge pull request #7765 from CocosRobot/update_lua_bindings_1407912033 
[AUTO]: updating luabinding automatically
 2014-08-14 09:28:08 +08:00
yangxiao 7bfd636b16 reset default camera rotation 2014-08-14 09:06:06 +08:00
Dhilan007 ff147b6cf8 close issue#5734:Label:The letters sometimes slightly cut. 2014-08-13 18:40:35 +08:00
yangxiao 6ce3b5c20a add mirror test 2014-08-13 17:38:16 +08:00
andyque 3ee6a9ab10 add missing safe guard in checkbox callback 2014-08-13 17:15:15 +08:00
yangxiao b4ec344bcf reset camera position in initDefault 2014-08-13 15:57:22 +08:00
CocosRobot df7c0ae1cb [AUTO]: updating luabinding automatically 2014-08-13 06:42:14 +00:00
minggo 8fdaaccd3d Merge pull request #7764 from natural-law/v3 
Adjust the lua templates for the lua modules.
 2014-08-13 14:37:48 +08:00
zhangbin e766a22bda Adjust the lua templates for the lua modules. 2014-08-13 14:29:14 +08:00
yangxiao 76329f9e53 add camera mask check to visit 2014-08-13 12:06:51 +08:00
andyque e2d609c05d add UITextField color & place hold color, fix double delete bug 2014-08-13 11:28:37 +08:00
samuele3hu 5b1ceb5e5d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_fix 2014-08-13 10:31:12 +08:00
samuele3hu 8ab7647b54 Add release_print lua bindings 2014-08-13 10:27:06 +08:00
Huabing.Xu 5b99ee71c1 add comment for the limit of RenderTextue::saveToFile 2014-08-13 10:14:26 +08:00
minggo f068cd2458 Merge pull request #7757 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-13 10:10:13 +08:00
minggo a6c25450ef Merge pull request #7747 from liang8305/v3 
AssetsManager not follow rediect, and will not download again when uncompress false
 2014-08-13 10:07:33 +08:00
zhangbin c8ad850d68 Update the reference of submodule cocos2d-console. 2014-08-13 10:06:22 +08:00
minggo a2cafa29e5 [ci skip] 2014-08-13 10:06:14 +08:00
minggo d223629477 Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture 
add callback for RenderTexture::saveToFile
 2014-08-13 10:05:08 +08:00
andyque e269ad49c1 fix custom particle tests position 2014-08-13 09:56:37 +08:00