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

21363 Commits

Author SHA1 Message Date
CocosRobot 68649695b2 [AUTO]: updating luabinding automatically 2014-06-25 09:17:16 +00:00
minggo ae346a741e [ci skip] 2014-06-25 17:14:57 +08:00
minggo f1943ca350 Merge pull request #7203 from samuele3hu/v3_ui_focus 
Add coco studio ui focus test cases for Lua and add deprecated support for some functions
 2014-06-25 17:12:06 +08:00
samuele3hu ca56aaa0d8 Update bindings-generator submodule 2014-06-25 16:23:26 +08:00
andyque a4bd3879ac fix ListView addChild problem 2014-06-25 16:17:16 +08:00
samuele3hu 5f63514d6b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_focus 2014-06-25 15:15:05 +08:00
samuele3hu 3a0e750926 Add deprecated support for lua binding of `getSize` and `setSize` of Widget 2014-06-25 15:13:08 +08:00
samuele3hu 5c765f6883 Add coco studio ui focus test cases for Lua 2014-06-25 15:08:59 +08:00
minggo 2c6abb94d4 [ci skip] 2014-06-25 14:43:27 +08:00
minggo 07c5e219d5 [ci skip] 2014-06-25 14:42:12 +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
minggo 986f77a827 Merge pull request #7156 from samuele3hu/v3_keypad_fix 
Update controller.lua for CocosIDE’s need
 2014-06-25 14:40:08 +08:00
minggo e44dafb9f9 [ci skip] 2014-06-25 14:33:42 +08:00
zhangcheng bdf7be6fa0 1. add classname = "" log. 2014-06-25 14:32:38 +08:00
minggo 5f569cb423 Merge pull request #7193 from samuele3hu/v3_ui_binary 
Add UI Editor test cases for Lua
 2014-06-25 14:30:34 +08:00
minggo 71f92a41b5 Merge pull request #7198 from CocosRobot/update_lua_bindings_1403676931 
[AUTO]: updating luabinding automatically
 2014-06-25 14:29:40 +08:00
CocosRobot 515f967f96 [AUTO]: updating luabinding automatically 2014-06-25 06:17:41 +00:00
minggo 5dcc6e6707 [ci skip] 2014-06-25 14:13:50 +08:00
minggo e90e7699a6 Merge pull request #7195 from minggo/addChild-override 
override addChild by name
 2014-06-25 14:12:10 +08:00
minggo 7eb6ed75b8 Merge pull request #7197 from andyque/dimissListViewFocus 
dimiss ListView focus tests
 2014-06-25 14:11:36 +08:00
minggo cd2d56f5d9 [ci skip] 2014-06-25 14:11:16 +08:00
andyque 634f1b58c4 add todo to reminder me 2014-06-25 14:10:53 +08:00
minggo 728fab706e Merge pull request #7194 from andyque/fixTouchEvent 
fix touch related issue
 2014-06-25 14:05:16 +08:00
andyque 1902fdc9f4 dimiss ListView focus tests 2014-06-25 14:04:32 +08:00
XiaoYang 118d325284 Merge pull request #43 from lvlonggame/v3 
modify binary loader and add boss.c3b model.
 2014-06-25 14:02:47 +08:00
minggo e2fd768989 [ci skip] 2014-06-25 13:59:41 +08:00
minggo 85671fb586 Merge pull request #7196 from andyque/issue5591 
closed #5591, fix UIButton setTitleColor & getTitleColor not match
 2014-06-25 13:57:06 +08:00
andyque 6df8079fd7 closed #5591, fix UIButton setTitleColor & getTitleColor not match 2014-06-25 13:47:29 +08:00
lvlong 7331ef49b6 don't rotate girl model 2014-06-25 13:29:45 +08:00
lvlong 8cc4520deb add boss.c3b 2014-06-25 13:22:04 +08:00
lvlong 658a955e36 modify skindata binary reading 2014-06-25 13:20:42 +08:00
XiaoYang 3b06c8e398 Merge pull request #42 from lvlonggame/v3 
modify bundle3D
 2014-06-25 12:49:40 +08:00
zhangcheng 644b61e261 1. add SceneBinary to 2.x 2014-06-25 11:58:36 +08:00
lvlong da835cb837 modify origin-pos stuff 2014-06-25 11:35:55 +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
Huabing.Xu c1b5984ce8 using stable sort for quads 2014-06-25 11:08:47 +08:00
Huabing.Xu 1919ebc61f add fast tmx files to Xcode project file 2014-06-25 11:08:28 +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
yangxiao db60512c4b Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-25 10:24:28 +08:00
lvlong 984e9079a7 modify bundle3d 2014-06-25 10:13:11 +08:00
Huabing.Xu 290897af14 Merge branch 'v3' into fast_tmx 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-06-25 10:10:08 +08:00
Huabing.Xu bda9708206 clean up Fast TMX code2 2014-06-25 10:06:37 +08:00
Huabing.Xu 67f83f43b0 clean up Fast TMX code 2014-06-25 10:04:20 +08:00
samuele3hu 617e2bc592 Add a newline 2014-06-25 09:36:34 +08:00
samuele3hu ea99c08d0e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_binary 2014-06-25 09:31:57 +08:00
samuele3hu 300821e61f Add UI Editor test case for Lua 2014-06-25 09:29:06 +08:00
lvlong ab910dfe19 reader test 2014-06-25 09:13:24 +08:00
yangxiao 2e4c801b2f load originpose 2014-06-24 23:33:30 +08:00