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

22558 Commits

Author SHA1 Message Date
minggo d5db4c2b84 Merge pull request #7687 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-06 17:50:22 +08:00
zhangbin 1ced935ea2 Update the reference of submodule cocos2d-console. 2014-08-06 17:44:00 +08:00
minggo a9f343b07d Merge pull request #7685 from CocosRobot/update_lua_bindings_1407316329 
[AUTO]: updating luabinding automatically
 2014-08-06 17:15:33 +08:00
CocosRobot f47d11cce0 [AUTO]: updating luabinding automatically 2014-08-06 09:14:13 +00:00
minggo 7a833d66d1 Merge pull request #7676 from samuele3hu/v3_module 
Split luabindings into serval modules and adjust project settings of test cases
 2014-08-06 17:09:12 +08:00
minggo ef5f83de6b Merge pull request #7682 from CocosRobot/update_cocosfiles_1407309866 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-06 15:38:06 +08:00
CocosRobot 35a19dd0ea [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-06 07:24:27 +00:00
minggo dc9288ee74 Merge pull request #7681 from minggo/v3 
rename file name
 2014-08-06 15:22:28 +08:00
minggo 7b3e1b7a73 rename file name 2014-08-06 15:01:18 +08:00
samuele3hu 497847f7e8 Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files. 2014-08-06 14:46:30 +08:00
minggo fdcf6a0c7c Merge pull request #7672 from xiangxw/show_lua_error_message 
show error after a win32 lua program crashes
 2014-08-06 14:39:25 +08:00
minggo 786e4a8b7e [ci skip] 2014-08-06 14:39:12 +08:00
minggo d8aefffe3c [ci skip] 2014-08-06 14:36:37 +08:00
minggo 58f7807960 [ci skip] 2014-08-06 14:34:23 +08:00
minggo 6ee0c4171f Merge pull request #7622 from rny/LabelTTF 
fix LabelTTF::getBoundingBox() position error
 2014-08-06 14:33:28 +08:00
minggo 6885f997e9 [ci skip] 2014-08-06 14:32:03 +08:00
minggo f786190349 Merge pull request #7652 from zhiqiangxu/labelbmfont_getboundingbox 
bug fix for LabelBMFont::getBoundingBox()
 2014-08-06 14:28:52 +08:00
minggo 187dc29f6d Merge pull request #7679 from andyque/fixComponentContainerRemoveIssue 
add safe guard when remove component from node componentContainer
 2014-08-06 14:21:49 +08:00
minggo d1b30b45bd [ci skip] 2014-08-06 14:20:33 +08:00
minggo 73f9cbdb01 Merge pull request #7678 from Hamken100per/v3 
Added a function getAssetManager() on CCFileUtilsAndroid
 2014-08-06 14:18:13 +08:00
minggo ca56990a83 Merge pull request #7677 from heliclei/github-pr-watchdog 
[ci skip][jenkins]add script to check pull request status, if not set, rebuild it automatically
 2014-08-06 13:57:34 +08:00
samuele3hu 9912b596f8 Reset lua-empty-test Mac/iOS build configure to ‘debug’ and delete CCModuleManager.h/cpp by mistake 2014-08-06 13:51:46 +08:00
andyque e2e8325f58 add safe guard when remove component from node componentContainer 2014-08-06 13:51:16 +08:00
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
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