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

21398 Commits

Author SHA1 Message Date
samuele3hu 6319a3d646 Update bindings-generator submodule 2014-06-24 11:09:36 +08:00
samuele3hu 03a4e014e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-24 11:04:38 +08:00
Huabing.Xu 740372ceb3 new version of rendering for tile map 2014-06-24 11:04:17 +08:00
minggo aa7e48794b [ci skip] 2014-06-24 10:50:09 +08:00
minggo 76e2540fd7 Merge pull request #7163 from darkdukey/fixNodeReader 
Fix NodeReader crash
 2014-06-24 10:49:10 +08:00
minggo 8f0d23df60 Merge pull request #7185 from CocosRobot/update_cocosfiles_1403578075 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-24 10:48:41 +08:00
CocosRobot 7f104f4bf7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-24 02:47:56 +00:00
minggo d9c99e6251 [ci skip] 2014-06-24 10:47:50 +08:00
minggo 4bb6545250 Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics 
closed #5541: Add rotation action support for physics.
 2014-06-24 10:46:10 +08:00
minggo 375f01b6cc Merge pull request #7183 from CocosRobot/update_lua_bindings_1403577263 
[AUTO]: updating luabinding automatically
 2014-06-24 10:43:03 +08:00
minggo ad64cf7e94 Merge pull request #7176 from CocosRobot/update_cocosfiles_1403520184 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-24 10:42:51 +08:00
CocosRobot 879862b993 [AUTO]: updating luabinding automatically 2014-06-24 02:35:55 +00:00
boyu0 f2ecb31958 closed #5541: add more warning for unsupported functions. 2014-06-24 10:33:21 +08:00
minggo 66763bd400 Merge pull request #7180 from MSOpenTech/wp8-v3 
WP8 v3 broken build fix
 2014-06-24 10:31:56 +08:00
minggo 9c130e7aa2 Merge pull request #7181 from CocosRobot/update_cocosfiles_1403577062 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-24 10:31:39 +08:00
CocosRobot cb9e5c2d77 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-24 02:31:03 +00:00
minggo 0a61932730 [ci skip] 2014-06-24 10:30:36 +08:00
minggo 6394c62c40 Merge pull request #7131 from samuele3hu/v3_lua_fix 
Add Lua binding for Animation3D and Animate3D ,and add related test case.
 2014-06-24 10:29:28 +08:00
andyque 199ad9c623 issue #5161, replace deprecated methods 2014-06-24 10:18:01 +08:00
samuele3hu e34fcf05f6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-24 10:14:53 +08:00
samuele3hu 50f82ce1d0 Fix compile error for lua bindings in the different platforms 2014-06-24 10:12:32 +08:00
Zhou Yuntao 50a1449af9 fix a bug that Node::setScale(float) may not work properly if (_scaleX != _scaleY || _scaleX != _scaleZ) 2014-06-24 10:05:52 +08:00
andyque 312ab4f396 Merge branch 'v3' into feature5161 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
 2014-06-24 09:51:18 +08:00
yangxiao ace56df74d batch sprite3D rendering 2014-06-24 09:27:10 +08:00
yangxiao c03ac80700 Sprite3D render batch, not finished 2014-06-23 23:58:45 +08:00
Dale Stammen 87a6b83001 added missing files for wp8 2014-06-23 08:35:39 -07:00
Dale Stammen 44d6248056 added missing cocoloader files 2014-06-23 08:31:29 -07:00
yangxiao c65e5d6872 simplify shader, bath sprite3D render 2014-06-23 19:08:26 +08:00
CocosRobot 8038db923c [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-23 10:43:05 +00:00
minggo fc7b42c0e5 Merge pull request #7157 from 2youyouo2/v3 
update action timeline
 2014-06-23 18:38:46 +08:00
minggo a2ebf315ba Merge pull request #7123 from andyque/cleanupBinaryLoader 
cocostudio binary parser
 2014-06-23 18:38:02 +08:00
andyque 7eae7625c1 Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 18:30:03 +08:00
andyque d2680f2884 fix windows compile error 2014-06-23 18:29:23 +08:00
samuele3hu 9a3720b1f7 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-23 18:07:20 +08:00
minggo 9a88a658a1 Merge pull request #7172 from CocosRobot/update_lua_bindings_1403516101 
[AUTO]: updating luabinding automatically
 2014-06-23 18:02:23 +08:00
samuele3hu a339afb2c0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-23 17:53:41 +08:00
minggo 47e60c9f73 Merge pull request #7173 from samuele3hu/v3_bug_fix 
Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and update related test cases
 2014-06-23 17:52:13 +08:00
samuele3hu a73e7c643b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix 2014-06-23 17:43:07 +08:00
samuele3hu b23e1384f6 Update the implementation of Lua bindings for `lua_cocos2dx_ListView_addScrollViewEventListener` 2014-06-23 17:42:04 +08:00
CocosRobot 6681d26540 [AUTO]: updating luabinding automatically 2014-06-23 09:37:28 +00:00
minggo 886b66f759 Merge pull request #7167 from heliclei/post-build-mail 
[ci skip] Send email notification if pull request build fail
 2014-06-23 17:30:29 +08:00
samuele3hu 9126608138 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix 2014-06-23 17:30:24 +08:00
samuele3hu dce4c8a0a8 Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases 2014-06-23 17:29:56 +08:00
minggo 8991ff739b [ci skip] 2014-06-23 17:22:56 +08:00
minggo 7ef217ee4d Merge pull request #7168 from andyque/fixListView 
fix addEventListener hidden problem
 2014-06-23 17:20:56 +08:00
andyque 3e5ab0ec8e fix linux compile error 2014-06-23 17:09:54 +08:00
andyque dcc650a6f8 fix android compile error 2014-06-23 17:04:59 +08:00
andyque ce58c2ddd6 remove unused header file 2014-06-23 16:53:06 +08:00
minggo dc96be969f [ci skip] 2014-06-23 16:45:47 +08:00
minggo 87dd434045 Merge pull request #7170 from samuele3hu/v3SequenceCreate 
Fix the error that lua binding for create function of Sequence would lead to endless loop
 2014-06-23 16:44:05 +08:00