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

4388 Commits

Author SHA1 Message Date
samuele3hu 3bd195d4ef Add Lua binding for ActionTimeline related and related test cases 2014-06-26 09:51:32 +08:00
minggo 6a3d3aa4a4 Merge pull request #7186 from billtt/v3_fixNodeSetScale 
fix a bug that Node::setScale(float) may not work properly
 2014-06-25 14:41:15 +08:00
CocosRobot 515f967f96 [AUTO]: updating luabinding automatically 2014-06-25 06:17:41 +00:00
minggo e90e7699a6 Merge pull request #7195 from minggo/addChild-override 
override addChild by name
 2014-06-25 14:12:10 +08:00
minggo 728fab706e Merge pull request #7194 from andyque/fixTouchEvent 
fix touch related issue
 2014-06-25 14:05:16 +08:00
andyque 6df8079fd7 closed #5591, fix UIButton setTitleColor & getTitleColor not match 2014-06-25 13:47:29 +08:00
minggo 66703addb2 fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
andyque 78e119ef56 Merge branch 'v3' into fixTouchEvent 
Conflicts:
	cocos/ui/UIWidget.cpp
 2014-06-25 11:10:51 +08:00
andyque 693ec0be29 fix listView Item move respond to click event 2014-06-25 10:50:18 +08:00
andyque 65e4c6f4d5 fix listView item click move 2014-06-25 10:45:08 +08:00
CocosRobot 2cd212b1b0 [AUTO]: updating luabinding automatically 2014-06-24 10:48:02 +00:00
minggo 63d0f66553 Merge pull request #7189 from andyque/feature5161 
replace size with contentSize
 2014-06-24 18:43:33 +08:00
minggo 7155eb4ebb use reference instead 2014-06-24 18:23:10 +08:00
andyque 547ad379ae closed #5589 2014-06-24 15:51:14 +08:00
andyque 4d82673760 issue #5161, replace _size with _contentSize 2014-06-24 15:08:58 +08:00
minggo 3336f7edad use reference instead 2014-06-24 14:53:02 +08:00
minggo 76e2540fd7 Merge pull request #7163 from darkdukey/fixNodeReader 
Fix NodeReader crash
 2014-06-24 10:49:10 +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
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
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
Dale Stammen 44d6248056 added missing cocoloader files 2014-06-23 08:31:29 -07:00
minggo fc7b42c0e5 Merge pull request #7157 from 2youyouo2/v3 
update action timeline
 2014-06-23 18:38:46 +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 a339afb2c0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-23 17:53:41 +08:00
samuele3hu b23e1384f6 Update the implementation of Lua bindings for `lua_cocos2dx_ListView_addScrollViewEventListener` 2014-06-23 17:42:04 +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 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
samuele3hu 0d7c453878 Fix the error that lua binding for create function of Sequence would lead to endless loop 2014-06-23 16:38:35 +08:00
andyque 808c4bd763 remove unused override method 2014-06-23 15:46:07 +08:00
andyque 93319f3a3b fix lua ui binding compile error 2014-06-23 14:56:41 +08:00
boyu0 c40c461848 closed #5541: add warning code and comment. 2014-06-23 13:55:52 +08:00
andyque c9bcbfb265 fix addEventListener hidden problem 2014-06-23 12:09:49 +08:00
andyque 87455b0ecb add constness to some function 2014-06-23 10:12:54 +08:00
andyque 8a463e7964 remove Hungry style 2014-06-23 10:02:09 +08:00
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 2014-06-23 09:37:39 +08:00
Nite Luo 21330860a9 Fix NodeReader will crash when encountered unknown NodeType 2014-06-20 17:24:34 -07:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
Dale Stammen 83c5b7bdb0 updated wp8 precompiled shaders 2014-06-20 09:07:29 -07:00
boyu0 2fc8889791 issue #5541: change RotateTo/RotateBy for Physics. 2014-06-20 18:40:21 +08:00