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

20315 Commits

Author SHA1 Message Date
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
Sergey cd892abc77 android uni error clear & more readable log 2014-05-20 14:52:21 +04: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
Sergey 49f26f3fbf lua template & android-build.py updated 2014-05-20 13:49:02 +04:00
minggo dd428b527b Merge pull request #6843 from favorcode/v3 
[ci skip]Update UIImageView.h param name
 2014-05-20 17:34:56 +08:00
Sergey 1ff2a03d16 debug mode by default 
configuration switched to -b debug/release
 2014-05-20 13:00:21 +04:00
Dhilan007 55c1319426 closed issue#5252:Label:It could be possible that for using outline cause crash. 2014-05-20 16:54:51 +08:00
hanbihui 855b8a2784 Update UIImageView.h 
Update param name
 2014-05-20 16:45:09 +08:00
shujunqiao 7232ba9414 [ci skip], add reboot.py in jenkins-scripts. 2014-05-20 16:34:36 +08:00
andyque 480c8cfe8f Merge branch 'fix_revert_pr' into refactor5183 2014-05-20 16:17:38 +08:00
andyque b07e82f7c3 Revert "Revert "Merge pull request #6752 from andyque/refactorLayout"" 
This reverts commit 1ed9b9749e.
 2014-05-20 16:17:10 +08:00
andyque 723e01f5df issue #5183, refactor UILayoutExecutant doLayout method 2014-05-20 16:09:30 +08:00
minggo 47482f8a3a Merge pull request #6825 from cocoscodeide/v3 
[ci skip] update template project lua
 2014-05-20 15:45:03 +08:00
minggo f092f26ca5 [ci skip] 2014-05-20 15:44:12 +08:00
minggo e5a27ad605 [ci skip] 2014-05-20 15:41:19 +08:00
minggo 9a276c66a0 Merge pull request #6740 from zifter/FixProgressTo 
Fix Progress Action. Not working with charging from 100 to 0.
 2014-05-20 15:36:10 +08:00
minggo 1ce1b00544 Merge pull request #6839 from natural-law/support-prebuilt 
Update the reference of submodule cocos2d-console.
 2014-05-20 15:12:56 +08:00
minggo bab737fe23 Merge pull request #6836 from CocosRobot/update_lua_bindings_1400568144 
[AUTO]: updating luabinding automatically
 2014-05-20 15:08:01 +08:00
minggo 05df6c8324 Merge pull request #6835 from CocosRobot/update_cocosfiles_1400568020 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-20 15:07:48 +08:00
zhangbin ccc85ab210 Update the reference of submodule cocos2d-console. 2014-05-20 15:03:43 +08:00
minggo 875f7bc49f Merge pull request #6834 from lmskater/fix-android-path 
[Jenkins][ci skip] Fix the path of android public project
 2014-05-20 14:54:41 +08:00