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

21932 Commits

Author SHA1 Message Date
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
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
samuele3hu b782814b4b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-16 22:08:48 +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
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
Naoyuki Totani cd025158f6 fix enabled to interval 2014-07-16 19:10:05 +09:00
samuele3hu 1b2d389011 Update ListViewEventType for Lua 2014-07-16 17:18:01 +08:00
andyque 46aafeecc6 remove unused functions 2014-07-16 16:28:01 +08:00
zhangcheng 1530ba4a90 1、fixes Trigger condition value can't be export. 2014-07-16 16:12:55 +08:00
Dhilan007 0bf4af1175 fixed crash in setup.py script. 2014-07-16 15:36:50 +08:00
minggo c7473611b8 Merge pull request #7463 from Dhilan007/v3-320final 
Remove prompt box of connect controller[Nibiru].
 2014-07-16 15:26:24 +08:00
zhangcheng 80de57be39 1、 fixes lua TriggerTest bug. 2014-07-16 14:50:35 +08:00
Dhilan007 7e76b7b9a1 Remove prompt box of connect controller[Nibiru]. 2014-07-16 14:48:22 +08:00
andyque 70ae3bf980 modify widget class comments 2014-07-16 10:12:13 +08:00
minggo e431d4f824 Merge pull request #7458 from MSOpenTech/wp8-v3-fix 
updated cpp template to support EVENT_RENDERER_RECREATED
 2014-07-15 23:02:28 +08:00
Dale Stammen d0c15bc1d8 updated cpp template to support EVENT_RENDERER_RECREATED 2014-07-15 07:23:40 -07:00
minggo 84d42d30f1 Merge pull request #7456 from chengstory/v3_FixWarningAndTriggerTestBug 
Cocos Studio Bugs
 2014-07-15 18:10:32 +08:00
zhangcheng 8bf4c8b6c9 1. Fixes CCTimeLine warning. 
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
 2014-07-15 18:07:33 +08:00
minggo bf27428a28 Merge pull request #7454 from samuele3hu/v3_hot_fix 
Update bindings-generator config files and manual bindings files to fix the compile warning
 2014-07-15 17:43:24 +08:00
minggo 7cb0dc19ae Merge pull request #7453 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-07-15 17:41:08 +08:00
zhangbin 94ea6c40d6 Update the reference of submodule cocos2d-console. 2014-07-15 17:39:56 +08:00
samuele3hu 8394ce74d0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 17:39:24 +08:00
samuele3hu a6c30bc495 Update bindings-generator config files and manual bindings files to fix the compile warning 2014-07-15 17:38:56 +08:00
minggo 16d5d6e9af Merge pull request #7451 from CocosRobot/update_cocosfiles_1405414701 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-15 17:16:48 +08:00
minggo 8f5906bf1e Merge pull request #7452 from CocosRobot/update_cocosfiles_1405415205 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-15 17:15:54 +08:00
CocosRobot c1bb801dc5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-15 09:06:46 +00:00
minggo 52b2cd4b18 Merge pull request #7450 from andyque/fixLoadingBarTest 
fix loading bar switch loading method issue
 2014-07-15 17:00:48 +08:00
andyque 714048059c fix loading bar switch loading method issue 2014-07-15 17:03:35 +08:00
minggo f17817b9ac [ci skip] 2014-07-15 17:00:16 +08:00
CocosRobot 5dfb5807b3 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-15 08:58:22 +00:00
minggo a59a86df0a Merge pull request #7439 from boyu0/merge_arm64_lib_to_fat_lib 
merge iOS arm64 libs to fat libs, change the project setting.
 2014-07-15 16:57:10 +08:00