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

22173 Commits

Author SHA1 Message Date
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
CocosRobot fda93df648 [AUTO]: updating luabinding automatically 2014-07-17 06:12:42 +00:00
Huabing.Xu 3c6e87d34e Merge branch 'v3' into v3_dll 
Conflicts:
	cocos/base/ccUtils.h
 2014-07-17 14:12:10 +08:00
samuele3hu ab0fe54d32 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 14:11:15 +08:00
minggo 5e18c914b9 Merge pull request #7481 from andyque/fixFastTiledMap 
change FastTileMap to TileMap
 2014-07-17 14:07:06 +08:00
andyque 4f5cd2a368 change FastTileMap to TileMap 2014-07-17 14:09:53 +08:00
minggo d8dfec7cff update release note 2014-07-17 14:03:35 +08:00
Huabing.Xu 0f89c6c8b5 add dependency for lua iOS targets 2014-07-17 13:58:50 +08:00
minggo 2b3fbd743a Merge pull request #7478 from Dhilan007/v3-320final 
update test case of game controller[lua]
 2014-07-17 13:37:49 +08:00
minggo 0fe0be18e8 Merge pull request #7475 from CocosRobot/update_lua_bindings_1405566114 
[AUTO]: updating luabinding automatically
 2014-07-17 13:37:20 +08:00
minggo c6349ef246 Merge pull request #7480 from visiblelight/wp8_fast_tmx_fix 
disable FastTileMapTest on WP8
 2014-07-17 13:35:52 +08:00
samuele3hu 5682a983bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 12:57:31 +08:00
vision c29766a4ad disable FastTileMapTest on WP8 2014-07-17 12:56:58 +08:00
samuele3hu 6516039604 Update bindings-generator submodule 2014-07-17 12:56:00 +08:00
samuele3hu eb8d1d70f7 Update the FastTileMapTest and VideoPlayerTest 2014-07-17 12:55:28 +08:00
samuele3hu 6f109f330f Update the related Lua bindings for experimental 2014-07-17 12:54:50 +08:00
Huabing.Xu 02c61af9fd add cocosStudio cocosBuilder cocosGUI iOS target 2014-07-17 12:06:20 +08:00
minggo a85e54cb69 [ci skip] 2014-07-17 12:03:59 +08:00
minggo f5e7d1ef7b Merge pull request #7469 from Mazyod/optional-scrollview-delegate 
Make the scrollView delegate methods optional
 2014-07-17 11:59:43 +08:00
minggo d8a2acfdea [ci skip] 2014-07-17 11:57:11 +08:00
minggo 258361b429 [ci skip] 2014-07-17 11:53:47 +08:00
minggo 7ef77027d1 [ci skip] 2014-07-17 11:50:09 +08:00
minggo 9a3886dca6 [ci skip] 2014-07-17 11:47:38 +08:00
Dhilan007 6429cf06fb update test case of game controller[lua] 2014-07-17 11:26:26 +08:00
Dhilan007 a457db53b0 Fix the y-inverse Joystick bug[IOS]. 2014-07-17 11:14:53 +08:00
minggo e58626c11c Merge pull request #7476 from Dhilan007/v3-gc0717 
Fixed bugs[Ouya controller]
 2014-07-17 11:12:31 +08:00