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 e58626c11c Merge pull request #7476 from Dhilan007/v3-gc0717 
Fixed bugs[Ouya controller]
 2014-07-17 11:12:31 +08:00
Dhilan007 1ff937aa48 Fixed bugs[Ouya controller]: 
1.fix joysticks are reporting the same keycode
2.fix lose disconnected event
 2014-07-17 11:09:08 +08:00
CocosRobot 9217589b9f [AUTO]: updating luabinding automatically 2014-07-17 03:04:08 +00:00
minggo 5a5b245e84 Merge pull request #7474 from andyque/fixFastTileMap 
change FastTiledMap namespace to cocos2d::experimental
 2014-07-17 10:52:40 +08:00
andyque 880c2c4c3f change FastTiledMap namespace to cocos2d::experimental 2014-07-17 10:46:20 +08:00
Huabing.Xu 4c609e11f0 add cocosSpin iOS target 2014-07-17 10:44:13 +08:00
minggo 43fe305cc9 Merge pull request #7283 from taug/v3 
could add seach path and resolution order path in front.
 2014-07-17 10:34:45 +08:00
minggo 521702064e Merge pull request #7473 from natural-law/v3 
Update the reference of submodule plugin-x.
 2014-07-17 10:30:40 +08:00
zhangbin 514309dbd0 Update the reference of submodule plugin-x. 2014-07-17 10:29:43 +08:00
minggo ab3a394d08 Merge pull request #7472 from CocosRobot/update_lua_bindings_1405563998 
[AUTO]: updating luabinding automatically
 2014-07-17 10:29:18 +08:00
CocosRobot e72fffe5c9 [AUTO]: updating luabinding automatically 2014-07-17 02:28:34 +00:00
minggo 54da8be54f Merge pull request #7467 from ntotani/fix-lua-accelerometer 
fix enabled to interval
 2014-07-17 10:23:45 +08:00
minggo 4c7d777f25 Merge pull request #7471 from visiblelight/wp8_shader_update 
Wp8 shader update
 2014-07-17 10:14:54 +08:00
minggo 40392f5fd5 Merge pull request #7470 from samuele3hu/v3_hot_fix 
Update bindings-generator submodule and fix some lua-tests errors
 2014-07-17 10:13:02 +08:00
vision 40951d586c update 2014-07-17 10:10:33 +08:00
vision c47d844d20 update the buildin shaders on WP8. Disable the effect 3d test. 2014-07-17 10:08:49 +08:00
samuele3hu 39e3f29e92 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 10:07:03 +08:00
Huabing.Xu d030c8aed3 add cocosNetwork ios target 2014-07-17 10:06:23 +08:00
minggo 2403bc2e50 Merge pull request #7343 from zhouxiaoxiaoxujian/feature/COC-10 
Add getChildByName method for get a node that can be cast to Type T
 2014-07-17 10:02:57 +08:00
samuele3hu ce4f5f0e96 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 10:02:16 +08:00
minggo c0fdc747e8 Merge pull request #7460 from andyque/fixComments 
modify widget class comments
 2014-07-17 10:00:12 +08:00
minggo a192ddfebd Merge pull request #7466 from andyque/fixPageView 
remove unused functions
 2014-07-17 09:59:46 +08:00
minggo a653d0eb28 Merge pull request #7440 from boyu0/add_utils_atof 
Add utils::atof(), fix bug: particle not shown on android.
 2014-07-17 09:59:15 +08:00
samuele3hu 2baf860669 Update bindings-generator submodule 2014-07-17 09:56:35 +08:00
Mazyad Alabduljaleel 27ba8ecd42 [FIX]: make the scrollView delegate methods optional 2014-07-17 02:10:59 +04:00
samuele3hu d6d182cb59 Fix the action can’t be triggered in the TriggerTest 2014-07-16 23:18:10 +08:00
cocoscodeide 2e8c497a00 Merge pull request #63 from chuanweizhang2013/v3luaruntime 
rename local variable GameScene to gameScene
 2014-07-16 22:40:31 +08:00
chuanweizhang2013 a51332e955 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-16 22:37:16 +08:00
chuanweizhang2013 c7579c2cd3 rename local variable GameScene to gameScene 2014-07-16 22:36:47 +08:00
cocoscodeide c7b7bcead2 Merge pull request #62 from chuanweizhang2013/v3luaruntime 
fixed mac ios reload bug
 2014-07-16 22:15:10 +08:00
chuanweizhang2013 211c79eefa fixed mac ios reload bug 2014-07-16 07:10:46 -07:00
samuele3hu b782814b4b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-16 22:08:48 +08:00
cocoscodeide 56d6437202 Merge pull request #61 from chuanweizhang2013/v3luaruntime 
add GameScene.lua
 2014-07-16 21:36:06 +08:00
minggo b25cb5ccf3 Merge pull request #7468 from CocosRobot/update_lua_bindings_1405515629 
[AUTO]: updating luabinding automatically
 2014-07-16 21:28:37 +08:00
minggo ac82fdca59 Merge pull request #7462 from chengstory/v3_FixLuaTriggerTestBug 
1、 fixes lua TriggerTest bug.
 2014-07-16 21:28:15 +08:00
chuanweizhang2013 fc420abec6 add GameScene.lua 2014-07-16 21:22:13 +08:00
chuanweizhang2013 5a4aa64f48 modify lua name 2014-07-16 21:20:48 +08:00
CocosRobot af231d78db [AUTO]: updating luabinding automatically 2014-07-16 13:02:27 +00:00
minggo c5d30ce40c Merge pull request #7465 from Dhilan007/v3-320final 
fixed crash in setup.py script.
 2014-07-16 20:56:51 +08:00
chuanweizhang2013 04b9457ed2 add local for main.lua 2014-07-16 20:49:24 +08:00
chuanweizhang2013 897f42c6fd add consolePort 2014-07-16 20:30:11 +08:00
chuanweizhang2013 390dc3781b support custom console port 2014-07-16 20:19:19 +08:00
cocoscodeide 0d5370a70e Merge pull request #60 from chuanweizhang2013/v3luaruntime 
fixed android debuginfo
 2014-07-16 19:41:34 +08:00
chuanweizhang2013 67c078197d Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-07-16 19:35:28 +08:00
chuanweizhang2013 da74684cf1 fixed android debuginfo 2014-07-16 19:35:04 +08:00
chuanweizhang2013 e160474f23 rename menu title 2014-07-16 04:33:45 -07:00
cocoscodeide 4592cb2387 Merge pull request #59 from chuanweizhang2013/v3luaruntime 
fixed living code bug
 2014-07-16 18:26:49 +08:00
chuanweizhang2013 727f129147 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-07-16 18:23:52 +08:00
Huabing.Xu add4caca5a add cocosNetwork target for mac 2014-07-16 18:21:21 +08:00
chuanweizhang2013 31aa374fe8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-16 18:20:44 +08:00