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

24567 Commits

Author SHA1 Message Date
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
Dhilan007 462e38cbc6 fixed opacity of label 2014-10-09 10:54:35 +08:00
minggo 9b2a965485 Merge pull request #8585 from CocosRobot/update_cocosfiles_1412820372 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-09 10:31:31 +08:00
XiaoYang 7ecd8c519a Merge pull request #135 from lvlonggame/v3 
Remove string err that is no used
 2014-10-09 10:14:06 +08:00
yangxiao c087f31e94 modify return type of getDirection and getDirectionInWorld 2014-10-09 10:12:52 +08:00
CocosRobot 79e641b3ff [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 02:06:14 +00:00
Ricardo Quesada f6a831e54f Merge pull request #8584 from ricardoquesada/removes_3d_export 
removes the `3d_export.h` file
 2014-10-08 19:04:28 -07:00
Ricardo Quesada 27cb6afb5e fixes warnings on Android 2014-10-08 18:55:33 -07:00
Ricardo Quesada d326db427f removes the `3d_export.h` file 2014-10-08 18:30:23 -07:00
SunLightJuly 1062dec335 modified project files and make files 2014-10-08 18:44:58 +08:00
Dhilan007 6f50143e0a Fixed LabelAtlas opacity do not change when setting parent node's opacity 2014-10-08 18:28:24 +08:00
Dhilan007 8ea473de7b fix endless loop when dimensions that are not enough to fit one character 2014-10-08 18:22:35 +08:00
minggo 442f767c89 Merge pull request #8579 from CocosRobot/update_lua_bindings_1412761871 
[AUTO]: updating luabinding automatically
 2014-10-08 17:53:58 +08:00
CocosRobot 70a2195ccf [AUTO]: updating luabinding automatically 2014-10-08 09:53:11 +00:00
minggo 33fa2fab84 Merge pull request #8576 from cocoscodeide/v3 
delete tip when reload file is empty(it's normal)
 2014-10-08 17:46:56 +08:00
Naoyuki Totani b0d1fb79b3 call detach method on thread exit 2014-10-08 18:34:06 +09:00
SunLightJuly 763b54e5cb added LuaStack::loadChunksFromZIP() 2014-10-08 17:30:14 +08:00
honghui de9a52892c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-08 17:11:19 +08:00
honghui 91901c16cb delete tip when reload file is empty(it's normal) 2014-10-08 17:06:58 +08:00
minggo 6648884d5e Merge pull request #8574 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-10-08 16:26:59 +08:00
zhangbin bce62aef82 Update the reference of submodule cocos2d-console. 2014-10-08 15:53:01 +08:00
lvlong cba155b5bc Remove string err no used 2014-10-08 15:23:31 +08:00
minggo 640ad4a422 [ci skip] Update CHANGELOG 2014-10-08 13:50:22 +08:00
minggo 8aa03e107f Merge pull request #8209 from boyu0/fix_physics_crash 
fix bug: physics crashes when remove/add children too quick.
 2014-10-08 13:48:03 +08:00
minggo de352dcbec Merge pull request #8570 from CocosRobot/update_cocosfiles_1412732478 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-08 11:37:12 +08:00
CocosRobot 75f21f9c10 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-08 01:41:20 +00:00
minggo 3873bbc5f7 Merge pull request #8060 from giuslape/v3 
Update Reference plugin-x
 2014-10-08 09:39:45 +08:00