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

17595 Commits

Author SHA1 Message Date
minggo a7fea5bdb7 Merge pull request #5785 from minggo/script-des 
[ci skip]some small modification for releasing
 2014-03-14 11:47:34 +08:00
minggo 1dec465525 update changelog 2014-03-14 11:38:23 +08:00
minggo 82ddaa089b make description more readable 2014-03-14 11:37:26 +08:00
James Chen 4e6d56b93a Merge pull request #5783 from samuele3hu/develop_new_fix 
[LuaTest] fix the error that AssetManager test case can’t find correct resource path
 2014-03-14 10:12:14 +08:00
James Chen bb930eb1c1 Merge pull request #5784 from Dhilan007/develop_label 
label:fixed incorrect effect of outline.
 2014-03-14 09:56:06 +08:00
Dhilan007 36bfd6d2c2 label:fixed incorrect effect of outline. 2014-03-14 09:51:39 +08:00
samuele3hu 100e250d21 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-14 09:50:50 +08:00
samuele3hu 4aef65d4b7 fix the error that AssetManager test case can’t find correct resource path 2014-03-14 09:48:48 +08:00
chuanweizhang2013 8e22053bac Merge pull request #16 from cocos2d/develop 
update engine
 2014-03-14 09:17:06 +08:00
minggo 2adc73473c Merge pull request #5781 from minggo/script-fix 
set COCOS_CONSOLE_ROOT to path on windows
 2014-03-13 23:14:52 +08:00
minggo bc4ceda242 set COCOS_CONSOLE_ROOT to path on windows 2014-03-13 23:12:55 +08:00
James Chen 8f80b76bd1 Merge pull request #5779 from Dhilan007/develop_label2 
EditBox:fixed nothing to display when input flag is PASSWORD on Android.
 2014-03-13 22:35:30 +08:00
Dhilan007 cea307bfb8 EditBox:fixed nothing to display when input flag is PASSWORD on Android. 2014-03-13 22:16:38 +08:00
minggo a1691e5cb8 Merge pull request #5777 from lihex/develop 
fix template & update submodule
 2014-03-13 22:13:06 +08:00
lihex 28a71ff14e update submodule 2014-03-13 22:11:38 +08:00
lihex ab8ce6b096 add build-cfg.json for hellocpp template 2014-03-13 22:10:15 +08:00
James Chen ad514932c6 Update CHANGELOG [ci skip] 2014-03-13 21:21:18 +08:00
James Chen 263c83fd88 Merge pull request #5775 from CocosRobot/update_lua_bindings_1394716568 
[AUTO]: updating luabinding automatically
 2014-03-13 21:19:13 +08:00
CocosRobot c9259bb800 [AUTO]: updating luabinding automatically 2014-03-13 13:17:32 +00:00
James Chen 8743b00d9f Merge pull request #5768 from Dhilan007/develop_label2 
Refactor setter of label's font name and font size.
 2014-03-13 21:14:36 +08:00
James Chen 4809ccc9d3 Merge pull request #5774 from boyu0/physics_bug_fix 
fix some physics bugs:
1) Remove unused parameter in PhysicsBody::getMoment.
2) PhysicsShapeBox::getSize return wrong value.
3) Don't draw physics body if it isn't enabled.
 2014-03-13 21:05:22 +08:00
Dhilan007 fe6f485a6b label:rename some API for clearly. 2014-03-13 21:00:36 +08:00
boyu0 b0b1645190 fix some physics bugs. 2014-03-13 20:56:51 +08:00
Dhilan007 62d0fa8564 label:rename some API for clearly. 2014-03-13 20:52:33 +08:00
James Chen 34a3a2de80 Merge pull request #5772 from chuanweizhang2013/luamerage 
Update lua template for win32.
 2014-03-13 20:22:21 +08:00
James Chen 5ceb672014 Merge pull request #5771 from andyque/fix_ease_action_crash 
[FIX] If the second parameter of 'tweenTo' function is NULL, crash may happen.
 2014-03-13 20:13:56 +08:00
zcw 91ebb580e3 tab to space 2014-03-13 20:11:08 +08:00
zcw cb327e87ff space 2014-03-13 20:07:48 +08:00
zcw edd5d1a8f0 space 2014-03-13 20:07:13 +08:00
andyque c4e20dd63a fix ease action error 2014-03-13 19:53:06 +08:00
minggo b05b69b3f3 Merge pull request #5770 from lihex/develop 
update submodule
 2014-03-13 19:38:56 +08:00
lihex 3ce647268d update submodule 2014-03-13 19:35:55 +08:00
Dhilan007 bc68c6b629 Refactor setter of label's font name and font size. 2014-03-13 18:46:35 +08:00
James Chen 1595465361 Merge pull request #5736 from Dhilan007/develop_editbox 
EditBox:fixed clip the text width to fit to the text box on Android and IOS.
 2014-03-13 18:36:48 +08:00
James Chen b24eb291a9 Merge pull request #5766 from samuele3hu/develop_new_fix 
Rename `testlua` to `lua_tests` for luaTest android project
 2014-03-13 18:32:56 +08:00
boyu0 44a69db0cb update external library, add iOS x86_64 and arm64 architectures, support Xcode5.1 iPhone simulator(64 bit) 2014-03-13 18:32:03 +08:00
samuele3hu 2e7b3331a5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-13 17:53:43 +08:00
James Chen b37bd73861 Merge pull request #5751 from linchaogithub/develop 
[Jenkins-watchdog] check & kill dead buid
 2014-03-13 17:50:53 +08:00
samuele3hu ca56410427 Rename `testlua` to `lua_tests` for luaTest android project 2014-03-13 17:36:53 +08:00
minggo d0fb0b9e6a Merge pull request #5765 from shujunqiao/develop 
add cocos-console-test.py to tools/jenkins-scripts
 2014-03-13 17:08:55 +08:00
qiaofeng00oo 3013bf2d6d modify cocos-console-test.py. 2014-03-13 17:05:10 +08:00
chuanweizhang2013 bf9d3e93b1 Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 2014-03-13 17:02:46 +08:00
chuanweizhang2013 f8dd1c1b1d update win32 templates 2014-03-13 17:00:25 +08:00
qiaofeng00oo 17ba28de2a add cocos-console-test.py to tools/jenkins-scripts/ 2014-03-13 16:29:47 +08:00
minggo ffc541609d Merge pull request #5763 from minggo/script-fix 
find correct path on windows
 2014-03-13 16:07:22 +08:00
minggo 747ca17386 find correct path on windows 2014-03-13 16:01:33 +08:00
James Chen 0df30132e2 Merge pull request #5759 from CocosRobot/update_cocosfiles_1394695081 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-13 15:35:06 +08:00
CocosRobot 28f7603f81 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-13 07:18:02 +00:00
James Chen 1cd41f8caa Merge pull request #5758 from CocosRobot/update_lua_bindings_1394693465 
[AUTO]: updating luabinding automatically
 2014-03-13 15:16:31 +08:00
CocosRobot b1becd3fae [AUTO]: updating luabinding automatically 2014-03-13 06:51:53 +00:00