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

20183 Commits

Author SHA1 Message Date
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
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
CocosRobot 33d8973277 [AUTO]: updating luabinding automatically 2014-05-20 06:44:06 +00:00
CocosRobot 06febdf2b9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-20 06:40:22 +00:00
minggo 8409b99abd Merge pull request #6833 from andyque/revert_pr 
Revert "Merge pull request #6752 from andyque/refactorLayout"
 2014-05-20 14:36:20 +08:00
andyque 1ed9b9749e Revert "Merge pull request #6752 from andyque/refactorLayout" 
This reverts commit ae118a9d22, reversing
changes made to 6f2f2046c7.
 2014-05-20 14:36:29 +08:00
lm 70d1daf8f4 [Jenkins][ci skip] Fix the path of android public project 2014-05-20 14:31:42 +08:00
cocoscodeide 96b580fd88 Merge pull request #24 from chuanweizhang2013/v3luaruntime 
add java nativeIsDebug
 2014-05-20 14:28:34 +08:00
minggo 84fa60e171 Merge pull request #6832 from andyque/addReleaseNotes 
[ci skip]modify some texts on RELEASE_NOTES
 2014-05-20 14:10:30 +08:00
andyque 4109b5b208 modify some texts on RELEASE_NOTES 2014-05-20 14:12:09 +08:00
minggo 9cf21f9a6a Merge pull request #6829 from favorcode/v3 
[ci skip]Update UIText.h doxygen comments
 2014-05-20 14:03:19 +08:00
minggo 7ad622c7c4 Merge pull request #6831 from CocosRobot/update_lua_bindings_1400564980 
[ci skip][AUTO]: updating luabinding automatically
 2014-05-20 14:00:57 +08:00
minggo ca28557ac3 Merge pull request #6827 from CocosRobot/update_cocosfiles_1400558896 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-20 14:00:32 +08:00
minggo 47138ef392 Merge pull request #6828 from CocosRobot/update_lua_bindings_1400558963 
[ci skip][AUTO]: updating luabinding automatically
 2014-05-20 14:00:03 +08:00
minggo 4393a322c8 Merge pull request #6830 from CocosRobot/update_cocosfiles_1400564891 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-20 13:59:31 +08:00
cw 1aa92bdef0 add java nativeIsDebug 2014-05-20 13:53:52 +08:00
CocosRobot ee7c753612 [AUTO]: updating luabinding automatically 2014-05-20 05:50:48 +00:00
CocosRobot b637f06ce6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-20 05:48:12 +00:00
minggo dd1ef2fbfc Merge pull request #6826 from andyque/addReleaseNotes 
modify 3.1rc0 release note
 2014-05-20 13:46:57 +08:00
andyque d8f5652392 add release note 2014-05-20 13:44:06 +08:00
favorcode 5ed9e781e4 Update UIText.h 
Update the doxygen comment
 2014-05-20 13:05:20 +08:00
CocosRobot 2c47eae1a0 [AUTO]: updating luabinding automatically 2014-05-20 04:10:28 +00:00
CocosRobot cbda99653d [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-20 04:08:17 +00:00
minggo ae118a9d22 Merge pull request #6752 from andyque/refactorLayout 
refactor Layout
 2014-05-20 12:07:04 +08:00
cocoscodeide d505cb3b50 Merge pull request #23 from chuanweizhang2013/v3luaruntime 
fixed android degbug
 2014-05-20 11:59:26 +08:00