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

22596 Commits

Author SHA1 Message Date
Kenichi Hamada 771996f9f3 Added a function getAssetManager() on CCFileUtilsAndroid 2014-08-06 13:36:04 +09:00
heliclei a06873bff7 [ci skip][jenkins]add script to check pull request status, if not set, rebuild it automatically 2014-08-06 10:29:26 +08:00
minggo 9f51adfafa Merge pull request #7461 from joshuastray/fix_constructor_access 
fix LabelAtlas constructor protected to CC_CONSTRUCTOR_ACCESS
 2014-08-06 10:15:02 +08:00
minggo 08cc7982d7 Merge pull request #7666 from zawasp/template_fix 
Template fix
 2014-08-06 10:03:12 +08:00
minggo b7e1c4ab17 [ci skip] 2014-08-06 09:57:50 +08:00
samuele3hu 63b3f838b6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 09:56:07 +08:00
minggo b39954ad92 [ci skip] 2014-08-06 09:52:41 +08:00
minggo e43b05955f Merge pull request #7674 from darkdukey/patch-12 
Fix opacity for Slider
 2014-08-06 09:50:47 +08:00
minggo 16653bf24e Merge pull request #7675 from darkdukey/chore/reuse-file-utils-for-video-path 
Chore/reuse file utils for video path
 2014-08-06 09:41:28 +08:00
minggo 08e6f9233d Merge pull request #7671 from CocosRobot/update_cocosfiles_1407234193 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-06 09:35:30 +08:00
Nite Luo 0a2afe983c Fix spacing 2014-08-05 17:56:55 -07:00
Nite Luo 9f34a5c0f2 Fix build for ios 2014-08-05 17:53:15 -07:00
Nite Luo ac20f51f7b Fix formatting 2014-08-05 16:53:00 -07:00
Nite Luo e0855d64df Merge branch 'v3' into patch-12 
Conflicts:
	cocos/ui/UISlider.cpp
 2014-08-05 16:51:02 -07:00
samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
	tools/tolua/cocos2dx.ini
 2014-08-06 00:37:19 +08:00
samuele3hu 6f763917a7 Delte liblua project for win32 and adjust cocos2d-win32 project 2014-08-06 00:26:02 +08:00
samuele3hu 4d4d5374df Delete Android.mk for cocos_lua_static 2014-08-06 00:18:56 +08:00
samuele3hu 99c52f0102 Split module for Linux on Lua and adjust related test cases 2014-08-06 00:15:44 +08:00
xiangxw 78587254a5 show error after a win32 lua program crashes 2014-08-05 21:10:30 +08:00
samuele3hu d86a37110d Split module for win32 and adjust related test cases 2014-08-05 19:46:13 +08:00
CocosRobot eacb8fa120 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 10:23:15 +00:00
minggo 5ad45ecae9 Merge pull request #7670 from Wu-Hao/v3 
fix readme spellings, added missing files guide for git user
 2014-08-05 18:21:31 +08:00
Wu-Hao ac8e5d3d57 Create missing tools?.txt 2014-08-05 18:08:50 +08:00
Wu-Hao 87aded5d15 missing file guide 2014-08-05 18:06:39 +08:00
Wu-Hao 43c63fde21 fix spellings 2014-08-05 18:03:21 +08:00
heliclei 5bd0e14b17 refine code 2014-08-05 18:01:09 +08:00
minggo befe284027 Merge pull request #7664 from CocosRobot/update_cocosfiles_1407217954 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-05 16:45:08 +08:00
minggo 7ef775db1b Merge pull request #7667 from CocosRobot/update_cocosfiles_1407227920 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-05 16:41:58 +08:00
CocosRobot 3a3cf0383d [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 08:38:41 +00:00
minggo f172a86e22 Merge pull request #7665 from dabingnn/v3_addNewAttribFlag 
V3 add new attrib flag
 2014-08-05 16:37:18 +08:00
Mircea Rila 119ca86e3f additional fixes for win32 project 2014-08-05 11:29:04 +03:00
heliclei da3e7d80db [jenkins][ci skip]use github access token to retrive commits 2014-08-05 16:22:01 +08:00
Mircea Rila d808581d2b fix win32 template project 2014-08-05 10:43:29 +03:00
Huabing.Xu 7353f036db Merge branch 'v3' into v3_addNewAttribFlag 2014-08-05 15:23:14 +08:00
Huabing.Xu 7fbd81aeca add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib 2014-08-05 15:15:17 +08:00
Mircea Rila 5720df4336 add VS 2013 support for C++ template 2014-08-05 10:11:04 +03:00
CocosRobot 839bfb7d55 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 05:52:35 +00:00
minggo 1bad9ddbc2 Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr 
V3 wp8glviewhookpr
 2014-08-05 13:51:15 +08:00
minggo 3814fe5592 Merge pull request #7663 from CocosRobot/update_lua_bindings_1407216814 
[AUTO]: updating luabinding automatically
 2014-08-05 13:40:16 +08:00
CocosRobot 24da61e443 [AUTO]: updating luabinding automatically 2014-08-05 05:35:12 +00:00
minggo 6771ee10a5 [ci skip] 2014-08-05 13:34:41 +08:00
minggo 2ece4b90fb [ci skip] 2014-08-05 13:32:55 +08:00
minggo cd98034f16 Merge pull request #7631 from maltium/v3 
added 3D rotation support to the RotateTo action
 2014-08-05 13:30:43 +08:00
samuele3hu da18657f4f Add module Android.mk config and adjust related test cases 2014-08-05 13:29:54 +08:00
minggo 376d218ff8 Merge pull request #7662 from CocosRobot/update_lua_bindings_1407210952 
[AUTO]: updating luabinding automatically
 2014-08-05 11:58:36 +08:00
CocosRobot f3e2ebf215 [AUTO]: updating luabinding automatically 2014-08-05 03:57:51 +00:00
minggo 99f9a0fb19 [ci skip] 2014-08-05 11:55:06 +08:00
minggo 0ff00ddbf7 [ci skip] 2014-08-05 11:53:37 +08:00
minggo 38e4ad0fbd Merge pull request #7653 from takaken1994/feature/improve-extensions-scrollview 
Update : added function for setting min/max scale
 2014-08-05 11:52:22 +08:00
minggo 2f41f031fa Merge pull request #7661 from CocosRobot/update_cocosfiles_1407204823 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-05 10:14:28 +08:00