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

22255 Commits

Author SHA1 Message Date
Huabing.Xu 52ac47aea8 Merge branch 'v3' into v3_dll 2014-07-17 18:27:36 +08:00
minggo f8ecceff25 [ci skip] 2014-07-17 18:06:48 +08:00
minggo 7b7d4d6aa0 Merge pull request #7500 from cocoscodeide/v3 
lua runtime 1.3
 2014-07-17 18:01:21 +08:00
minggo 578af01ef1 Merge pull request #7499 from andyque/fixRichTextUTF8 
fix richText utf8 error
 2014-07-17 17:57:41 +08:00
andyque fc2ab110cc fix richText utf8 error 2014-07-17 17:58:40 +08:00
cocoscodeide d3489e680e Merge pull request #64 from chuanweizhang2013/v3luaruntime 
console port android 6010
 2014-07-17 17:55:57 +08:00
chuanweizhang2013 f906880c70 modify size 2014-07-17 02:48:32 -07:00
minggo 08dc96c5e5 Merge pull request #7498 from samuele3hu/v3_hot_fix 
Fix the actionTimelineTest crash on mac platform
 2014-07-17 17:42:39 +08:00
minggo 8381069c75 Merge pull request #7497 from chengstory/v3_fixesActionManagerCrash 
V3 fixes action manager crash
 2014-07-17 17:42:04 +08:00
samuele3hu a9031154e0 Fix the actionTimelineTest crash on mac platform 2014-07-17 17:38:53 +08:00
minggo 0b7ecc769e [ci skip] 2014-07-17 17:31:32 +08:00
minggo 1f4b516f66 Merge pull request #7495 from boyu0/physics_flip_bug 
Fix the bug: flip scale for physics body make it's size incorrect.
 2014-07-17 17:28:03 +08:00
zhangcheng 6d0bf8e143 Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash 2014-07-17 17:25:32 +08:00
zhangcheng 24d87ad05b 1. fixes ActionManagerEx crashes. 2014-07-17 17:24:41 +08:00
minggo 40a872aa8e Merge pull request #7494 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-07-17 17:22:51 +08:00
zhangbin 1a37040e8d Update the reference of submodule cocos2d-console. 2014-07-17 17:21:31 +08:00
boyu0 e07215995a Fix the bug: flip scale for physics body make it's size incorrect. 2014-07-17 17:21:09 +08:00
minggo 91a537dec6 Merge pull request #7493 from visiblelight/render_texture_disabled 
no need to save/restore for render texture when entering background
 2014-07-17 17:07:54 +08:00
vision a2413a6538 no need to save/restore for render texture when entering background 2014-07-17 17:03:10 +08:00
minggo c482e2e14f Merge pull request #7491 from Dhilan007/v3-320final 
fixed text line wrap issue in UITextField.
 2014-07-17 16:48:41 +08:00
Dhilan007 21ea289eb1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-320final 2014-07-17 16:48:08 +08:00
minggo c8078c35b4 Merge pull request #7492 from samuele3hu/v3_hot_fix 
Fix a type judgment error.
 2014-07-17 16:47:43 +08:00
samuele3hu 3dd83edd5c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 16:45:32 +08:00
minggo 30f4a5cced [ci skip] 2014-07-17 16:41:32 +08:00
samuele3hu 10d498e1ae Fix type judgment error. 2014-07-17 16:41:09 +08:00
minggo d28fdb6752 Merge pull request #7490 from geron-cn/chukongv3 
fix bug: cpp-test  binary load test crash
 2014-07-17 16:38:45 +08:00
Dhilan007 8ac1398037 fixed text line wrap issue in UITextField. 2014-07-17 16:23:38 +08:00
geron-cn 4e9a710053 fix binary test crash bug 2014-07-17 16:16:49 +08:00
geron-cn 441f0ebca8 fix binary test crash bug 2014-07-17 16:13:12 +08:00
geron-cn 1a2caaeebf fix binary test crash bug 2014-07-17 16:09:17 +08:00
minggo c34e9e8490 Merge pull request #7489 from CocosRobot/update_cocosfiles_1405584065 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-17 16:04:49 +08:00
CocosRobot 5de1256005 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-17 08:01:08 +00:00
geron-cn 8212ed3822 fix binary test crash bug 2014-07-17 16:01:03 +08:00
minggo 5c1475689b Merge pull request #7488 from CocosRobot/update_lua_bindings_1405583045 
[AUTO]: updating luabinding automatically
 2014-07-17 15:59:43 +08:00
minggo 4009b45353 Merge pull request #7487 from CocosRobot/update_cocosfiles_1405582937 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-17 15:58:03 +08:00
CocosRobot aabfdfebed [AUTO]: updating luabinding automatically 2014-07-17 07:46:20 +00:00
CocosRobot 1544081284 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-17 07:42:19 +00:00
minggo 5c0ac02f70 Merge pull request #7479 from samuele3hu/v3_hot_fix 
Update bindings-generator submodule and update the related Lua bindings for experimental and test cases
 2014-07-17 15:40:07 +08:00
chuanweizhang2013 5d1de7e9a9 console port android 6010 2014-07-17 15:37:37 +08:00
minggo 3b3a29ed68 Merge pull request #7477 from Dhilan007/v3-gc0717 
Fix the y-inverse Joystick bug[IOS].
 2014-07-17 15:13:57 +08:00
minggo 9329c77f2a Merge pull request #7485 from heliclei/save-build-result 
[ci skip][jenkins]record size of libcpp_empty_test.so to database
 2014-07-17 15:12:30 +08:00
samuele3hu db18530d63 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 14:58:50 +08:00
samuele3hu e975b0d5f9 Update experimental lua bindings、related test cases and project setting 2014-07-17 14:54:34 +08:00
heliclei bed47c90fe [ci skip][jenkins]record size of libcpp_empty_test.so to database 2014-07-17 14:52:26 +08:00
minggo b82864f455 Merge pull request #7484 from CocosRobot/update_cocosfiles_1405578501 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-17 14:29:11 +08:00
CocosRobot 924b8b23f2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-17 06:28:22 +00:00
minggo 7ae20bad53 Merge pull request #7482 from CocosRobot/update_lua_bindings_1405577434 
[AUTO]: updating luabinding automatically
 2014-07-17 14:27:15 +08:00
minggo 9f7a9249d0 Merge pull request #7483 from minggo/update-release-note 
[ci skip]Update release note
 2014-07-17 14:18:48 +08:00
minggo 7f0e70e7c1 Update RELEASE_NOTES.md 2014-07-17 14:17:37 +08:00
minggo 7fab752372 update release note 2014-07-17 14:14:19 +08:00