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

20055 Commits

Author SHA1 Message Date
bofeng-song 6f1404ec46 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-22 18:28:02 +08:00
cocoscodeide 67e43e188a Merge pull request #25 from chuanweizhang2013/v3luaruntime 
add play ui
 2014-05-22 17:08:15 +08:00
bofeng-song e31b03ab2e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-22 17:01:41 +08:00
James Chen 7ea57e2804 Merge pull request #6873 from CocosRobot/update_lua_bindings_1400746052 
[AUTO]: updating luabinding automatically
 2014-05-22 03:21:17 -05:00
CocosRobot 0ab8624d2f [AUTO]: updating luabinding automatically 2014-05-22 08:08:54 +00:00
James Chen 1bead55e43 Merge pull request #6870 from samuele3hu/v3_fix 
Move `setSearchPath` operation from cpp to script for lua-tests
 2014-05-22 03:04:33 -05:00
samuele3hu 5c869c1356 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-22 14:02:19 +08:00
samuele3hu a6efd4f650 Move `setSearchPat` operation from cpp to script 2014-05-22 14:00:39 +08:00
James Chen 918a48054a Merge pull request #6867 from samuele3hu/v3_fix 
close #5255:Remove Sprite3D effect test
 2014-05-22 00:45:53 -05:00
James Chen 45cce2a692 Merge pull request #6869 from visiblelight/texturecache 
adding guard for the callback condition in `TextureCache::addImageAsyncCallBack`
 2014-05-22 00:38:00 -05:00
vision a68515dbff adding guard for the callback condition 2014-05-22 12:42:52 +08:00
chuanweizhang2013 111840f37b add play ui 2014-05-22 11:52:49 +08:00
minggo 550f6fad37 Merge pull request #6868 from andyque/fixInclude 
fixed ui header file include problem
 2014-05-21 22:33:35 -05:00
andyque d1df19794a fixed ui header file include problem 2014-05-22 10:49:28 +08:00
samuele3hu 6c8e38871c issue #5255:Remove Sprite3D effect test 2014-05-22 10:22:10 +08:00
minggo b7cd118d52 [ci skip] 2014-05-21 18:35:14 +08:00
minggo cda9183e01 Merge pull request #6861 from boyu0/bug4944_physics_crash 
closed #4944: fixed bug: physics engine crashes occasionally when remove...
 2014-05-21 18:32:19 +08:00
James Chen d4bebf7332 Merge pull request #6860 from CocosRobot/update_cocosfiles_1400657115 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-21 17:36:48 +08:00
boyu0 b6274a469d closed #4944: fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback. 2014-05-21 16:07:49 +08:00
CocosRobot a07b2dae75 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-21 07:25:16 +00:00
minggo 017b738f21 Merge pull request #6859 from andyque/fixLayoutVisit 
issue #5183, fix Layout visit issue
 2014-05-21 15:24:00 +08:00
andyque dbd2de63b2 issue #5183, fix Layout visit issue 2014-05-21 15:21:55 +08:00
minggo 64d316fa65 [ci skip] 2014-05-21 14:32:03 +08:00
minggo 3b5417a325 Merge pull request #6854 from MSOpenTech/wp8-v3-fix 
Wp8 v3 fix for precompiled shaders and precompiled headers
 2014-05-21 14:31:18 +08:00
minggo ae5f285a2a Merge pull request #6857 from Dhilan007/v3_labelfix 
issue #5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.
 2014-05-21 14:14:40 +08:00
Dhilan007 d13ed93fc1 issue #5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing. 2014-05-21 14:08:30 +08:00
minggo 7facea521c [ci skip] 2014-05-21 11:44:15 +08:00
minggo 4c6bbd55f6 Merge pull request #6856 from Dhilan007/v3_labelfix 
close issue#5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.
 2014-05-21 11:41:46 +08:00
Dhilan007 ac258439b0 close issue#5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing. 2014-05-21 11:38:45 +08:00
minggo dd21d27d59 [ci skip] 2014-05-21 11:24:23 +08:00
minggo 40df6a28a2 Merge pull request #6844 from Dhilan007/v3-labelfix 
closed issue#5252:Label:It could be possible that for using outline cause crash.
 2014-05-21 11:19:12 +08:00
minggo ad31bdc579 Merge pull request #6698 from Dhilan007/v3_wp8fix 
[ci skip]closed issue:5020:The game still oriented in landscape mode when update the describes of orientation to Portrait in 'MainPage.xaml'.
 2014-05-21 10:58:04 +08:00
minggo d69819057a Merge pull request #6855 from andyque/fixKeypad 
[ci skip]fix keypad test
 2014-05-21 10:48:43 +08:00
andyque fa5d43741c fix keypad test 2014-05-21 10:46:26 +08:00
Dhilan007 70346c4437 Merge branch 'v3_wp8fix' of https://github.com/Dhilan007/cocos2d-x into v3-wp8 2014-05-21 10:44:48 +08:00
minggo 5a309fbc6e Merge pull request #6721 from zifter/FixNodeConst 
[ci skip]Getter always must be a const method.
 2014-05-21 09:48:27 +08:00
Dale Stammen 2a7b223b5b updated link() for wp8 2014-05-20 11:47:33 -07:00
Dale Stammen 3971666426 updated pch file for wp8 2014-05-20 10:06:24 -07:00
Dale Stammen c0798a3c0a updated precompiled shaders for wp8 2014-05-20 10:06:02 -07:00
Dale Stammen f0e4c97bc6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into wp8-v3-fix 2014-05-20 07:50:12 -07:00
Dale Stammen 3db6856d27 added missing pch files for WP8 2014-05-20 07:48:42 -07:00
Dale Stammen 0efc070104 fixed shader compiler after cocos refactor 2014-05-20 07:48:12 -07:00
James Chen 3ec5fc22bd Merge pull request #6850 from CocosRobot/update_cocosfiles_1400586569 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-20 19:50:02 +08:00
CocosRobot 5fe36c55c7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-20 11:49:30 +00:00
James Chen 98808e5362 Merge pull request #6849 from CocosRobot/update_lua_bindings_1400586331 
[AUTO]: updating luabinding automatically
 2014-05-20 19:48:13 +08:00
CocosRobot f734cc3f7b [AUTO]: updating luabinding automatically 2014-05-20 11:46:42 +00:00
minggo 7c2f0e2370 Merge pull request #6847 from samuele3hu/v3_fix 
issue #5255:Add Sprite3D test cases for Lua
 2014-05-20 18:15:50 +08:00
samuele3hu a2ebe428da Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-20 18:11:28 +08:00
samuele3hu 2d65f9bc6f issue #5255:Add Sprite3D test cases for Lua 2014-05-20 18:09:04 +08:00
minggo 92074b780e [ci skip] 2014-05-20 17:49:43 +08:00