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

24593 Commits

Author SHA1 Message Date
minggo 01e3ae2c61 Merge pull request #8606 from andyque/fixButtonContentSize 
fix button title only content size issue
 2014-10-10 15:23:25 +08:00
minggo 49b3e907e9 Merge pull request #8604 from samuele3hu/v3_3D 
Add CameraTest、OBBTest and related lua bindings
 2014-10-10 15:22:17 +08:00
Dhilan007 7fb448e90f add 'static' for global function 2014-10-10 15:13:05 +08:00
minggo df60fde7ab Merge pull request #8610 from andyque/fixCocostudioIncludePath 
fix cocostudio include path
 2014-10-10 15:05:39 +08:00
Huabing.Xu a08d0e4be3 Merge branch 'v3' into v3_fixGLProgramCrash 2014-10-10 15:05:09 +08:00
minggo 4856b6782a Merge pull request #7979 from giginet/scene-reader-canvas-size 
SceneReader sets contentSize by canvasSize.
 2014-10-10 15:00:28 +08:00
pipu aecba2b2f9 Delete libprotobuf.a 2014-10-10 14:26:50 +08:00
Huabing.Xu e69465e428 remove texture unit 4-7, only 0 -3 is reserved 2014-10-10 14:06:37 +08:00
Huabing.Xu f097c76e46 fix compile error for macro redefinition 2014-10-10 14:05:57 +08:00
Dhilan007 250875b081 fixed compile error 2014-10-10 14:03:20 +08:00
andyque d5fe0758ed fix cocostudio include path 2014-10-10 13:48:49 +08:00
pipu d699b5809b Modifying libprotocolbuf.a as protocolbuffer.a 2014-10-10 12:52:42 +08:00
Dhilan007 6a8c4f4194 Fixed FileUtils::removeFile doesn't work on iOS 2014-10-10 11:59:35 +08:00
minggo 2a95286329 Merge pull request #7785 from DaisukeHashimoto/fix_CCActionManagerEx_Bug 
use fileName for _actionDic key
 2014-10-10 11:13:41 +08:00
andyque da48649370 fix button title only content size issue 2014-10-10 11:01:51 +08:00
minggo ba5ff2e8e3 Merge pull request #8586 from super626/v3 
Fix warning of Bundle3D and modify light
 2014-10-10 10:46:24 +08:00
pipu ee624e47cc 1. Modifying UIScale9Sprite 
2. Updating UI Test
3. Updatding resource of ActionTimeline
 2014-10-10 10:44:16 +08:00
minggo 3aa6337974 Merge pull request #8599 from dabingnn/v3_fixEGLConfigOnAndroid 
fix egl config error on android
 2014-10-10 10:41:52 +08:00
minggo d7d52a7cf0 [ci skip] Update CHANGELOG 2014-10-10 10:19:07 +08:00
Huabing.Xu 254ee5b873 Merge branch 'v3' into v3_fixGLProgramCrash 2014-10-10 10:09:26 +08:00
minggo cbc2a5246f Merge pull request #8603 from ahlwong/v3 
Fix UIButton Scale 9 Highlight
 2014-10-10 10:08:22 +08:00
minggo af4a1972a4 Merge pull request #8602 from fengl2/patch-1 
the android library path in proj.andriod/project.properties file is wrong
 2014-10-10 10:02:05 +08:00
yangxiao 7a23cc3c1a Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-10 09:55:56 +08:00
yangxiao 1ef511d31f Merge branch 'newcode' into v3 2014-10-10 09:53:57 +08:00
samuele3hu f97a7ae52d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-10-10 09:52:29 +08:00
samuele3hu 115d81574c Add CameraTest、OBBTest and related lua bindings 2014-10-10 09:49:25 +08:00
Ahlwong 5027f24348 Fix UIButton Scale 9 Highlight 2014-10-09 12:48:09 -07:00
NeoLeeee a5a16eecbf the android library path is wrong 
if you run the following command in your game forder 

cocos run -p android

it will give you the following error since the path is wrong

BUILD FAILED
/Users/lifeng/dev/adt_bundle_mac/sdk/tools/ant/build.xml:459: ../../../cocos/platform/android/java resolve to a path with no project.properties file for project /Users/lifeng/study/cosco2dx/MyFirstGame/proj.android
 2014-10-10 01:33:41 +08:00
Huabing.Xu d5e29d285d fix gel Config error on android 2014-10-09 18:34:14 +08:00
XiaoYang b77559fe5d Merge pull request #136 from songchengjiang/new_v3 
Fixed CosOuterAngle error
 2014-10-09 18:31:24 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Dhilan007 83150aa4d1 fix warns and memory leak 2014-10-09 17:19:43 +08:00
minggo f928046f50 Merge pull request #8580 from Dhilan007/v3-labelfix 
issue #8492:fix endless loop when dimensions that are not enough to fit one character
 2014-10-09 17:05:39 +08:00
yangxiao 88fc4258ca Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-09 17:02:10 +08:00
yangxiao 222bf570f2 Merge branch 'newcode' into v3 2014-10-09 17:01:35 +08:00
songchengjiang 34efbf189a Fixed getCosOuterAngle errors 2014-10-09 16:16:02 +08:00
minggo db72756d02 [ci skip] Update CHANGELOG 2014-10-09 16:08:56 +08:00
minggo 52ebad885b [ci skip] Update CHANGELOG 2014-10-09 15:53:04 +08:00
minggo b8c5ce6db3 Merge pull request #8588 from Dhilan007/v3-label8582 
fixed issue#8582: opacity of label
 2014-10-09 15:50:44 +08:00
songchengjiang 88012cf86b Merge branch 'v3_new' into v3 
Conflicts:
	tests/lua-tests/src/Sprite3DTest/Sprite3DTest.lua
 2014-10-09 15:49:50 +08:00
minggo 273863685c Merge pull request #8595 from andyque/fixLinuxCompileError 
Fix linux compile error
 2014-10-09 14:51:56 +08:00
minggo 0e35c17adf Merge pull request #8593 from CocosRobot/update_cocosfiles_1412833297 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-09 13:55:51 +08:00
minggo 333a58b211 Merge pull request #8594 from CocosRobot/update_cocosfiles_1412833779 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-09 13:50:21 +08:00
CocosRobot 0b5122a11b [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 05:49:41 +00:00
Ricardo Quesada 8e2a3f0512 Merge pull request #8592 from martell/winphone 
wp8: use CC_STATIC because libs are static
 2014-10-08 22:47:56 -07:00
CocosRobot 39d544368b [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 05:41:39 +00:00
minggo be566b7aa0 Merge pull request #8590 from martell/linux 
Linux: fix glfw3 searching
 2014-10-09 13:38:38 +08:00
martell 73980195c0 wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
martell 479cd16886 Linux: make glfw3 visable to subprojects 2014-10-09 05:34:27 +01:00
martell 07c31bb4e1 Linux: fix glfw3 searching 2014-10-09 05:22:21 +01:00