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

22826 Commits

Author SHA1 Message Date
minggo f51d6c8e3e [ci skip] 2014-08-07 10:37:11 +08:00
minggo 7b11c6a74e Merge pull request #7237 from martell/v3 
Cmake update and remove old scripts from build folder
 2014-08-07 10:36:10 +08:00
minggo 8565d2734f [ci skip] 2014-08-07 10:25:16 +08:00
minggo b1b3c80603 [ci skip] 2014-08-07 10:22:09 +08:00
minggo 4542b1882d Merge pull request #7617 from rny/SpriteFrameCache 
SpriteFrameCache load from plist file content data
 2014-08-07 10:20:36 +08:00
Dhilan007 9da4ba14f5 fixed can's set outline color for system font correctly on IOS. 2014-08-07 10:04:29 +08:00
minggo 9eff58b0a5 Merge pull request #7690 from heliclei/jenkins-job-trigger 
use github access token to retrive commits
 2014-08-07 09:54:48 +08:00
minggo 2cab8657b2 Merge pull request #7689 from heliclei/ci-dailybuild 
[ci skip][jenkins]Avoid connect to database repeatly
 2014-08-07 09:54:22 +08:00
minggo c8300feff2 Merge pull request #7688 from CocosRobot/update_cocosfiles_1407318715 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-07 09:53:01 +08:00
martell 495f8ffc14 Moved mingw64 build scripts out of cocos2d-x and into msys2 2014-08-06 15:52:42 +01:00
martell f804331558 fix a spacing error with cmake flags 2014-08-06 15:45:40 +01:00
martell b71e0cde3a Fix libaudio.a outpur directory 2014-08-06 15:45:27 +01:00
martell 3bb758668f BUILD_CppTests: should cover the empty test, Fix bad English 2014-08-06 15:44:09 +01:00
martell 7fad8a4d0d added tinyxml2 to the option of using external version 2014-08-06 15:43:54 +01:00
martell 421be753b3 add option to opt not to build box2d, chipmunk 2014-08-06 15:43:41 +01:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
heliclei a04d3e1b2b [ci skip][jenkins]Avoid connect to database repeatly 2014-08-06 18:18:59 +08:00
CocosRobot 075c890ef1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-06 09:51:57 +00:00
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
Dhilan007 7b378cd7e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-06 17:11:16 +08: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
andyque ab33e6f9a2 Let Widget class don't support cascaded opacity and cascaded color on default. 2014-08-06 16:21:00 +08:00
Huabing.Xu 64c2ede765 IOS work now 
reset binding buffer to 0 after drawing
 2014-08-06 15:46:35 +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