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

20552 Commits

Author SHA1 Message Date
minggo f4afb93211 [ci skip] 2014-06-09 15:28:13 +08:00
minggo 8a3e64918d Merge pull request #7014 from andyque/ImproveUIText 
improve UIText
 2014-06-09 15:27:04 +08:00
minggo b47cc9ceb1 Merge pull request #7016 from CocosRobot/update_lua_bindings_1402298385 
[AUTO]: updating luabinding automatically
 2014-06-09 15:22:08 +08:00
CocosRobot e1a43d8ac4 [AUTO]: updating luabinding automatically 2014-06-09 07:20:59 +00:00
minggo 4e299099d2 [ci skip] 2014-06-09 15:19:58 +08:00
minggo de15833e6a [ci skip] 2014-06-09 15:18:22 +08:00
minggo ecf32bcbf7 Merge pull request #7015 from andyque/improveUITextField 
add getStringLength to UITextField
 2014-06-09 15:16:47 +08:00
andyque d46025af64 Merge branch 'improvement/COC-3' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into improveUITextField 
Conflicts:
	cocos/ui/UITextField.h
 2014-06-09 14:46:04 +08:00
andyque b7c8759f3b modify outline size parameter 2014-06-09 14:37:56 +08:00
andyque c387ae3bc7 add text effect test 2014-06-09 14:34:46 +08:00
minggo 2230431582 [ci skip] 2014-06-09 14:21:14 +08:00
Dhilan007 c109cff099 update Xcode project. 2014-06-09 14:18:05 +08:00
andyque a52532c3c5 Merge branch 'feature/COC-5' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into ImproveUIText 
Conflicts:
	cocos/ui/UIText.cpp
 2014-06-09 14:17:57 +08:00
minggo 59c7b7e9a0 Merge pull request #7004 from Dhilan007/v3-labelfix 
close issue#5158:Label's display may go bonkers if using outline feature.
 2014-06-09 14:17:46 +08:00
Dhilan007 791737befa update test cast of label. 2014-06-09 13:41:32 +08:00
minggo 6a4322eeac [ci skip] 2014-06-09 11:49:25 +08:00
minggo 48443b8d52 Merge pull request #7008 from visiblelight/ProgramState 
Fix issue 5393
 2014-06-09 11:47:57 +08:00
minggo 939ee6c7fa Merge pull request #7011 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-06-09 11:41:58 +08:00
minggo aa0387c05c Merge pull request #7009 from CocosRobot/update_cocosfiles_1402283562 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-09 11:41:38 +08:00
minggo 81b80593e1 Merge pull request #7010 from CocosRobot/update_lua_bindings_1402283659 
[AUTO]: updating luabinding automatically
 2014-06-09 11:41:17 +08:00
vision 361bfad5f8 initilization missed. 2014-06-09 11:39:19 +08:00
boyu0 dff0fada28 issue #4437: fix some bugs. 2014-06-09 11:36:44 +08:00
zhangbin 07aaa6fabe Update the reference of submodule cocos2d-console. 2014-06-09 11:27:01 +08:00
CocosRobot 638f7f12c5 [AUTO]: updating luabinding automatically 2014-06-09 03:15:50 +00:00
CocosRobot 70a4fd173c [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-09 03:12:43 +00:00
minggo 24f7c9019a Merge pull request #7005 from andyque/refactorUITouchEvent 
refactor UI framework touch handling
 2014-06-09 11:11:40 +08:00
vision ae16c88538 Save the bound texture unit so that the sampler can be updated dynamiclly. 2014-06-09 10:58:28 +08:00
minggo 19a96c66fb Merge pull request #7007 from CocosRobot/update_cocosfiles_1402282382 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-09 10:53:33 +08:00
CocosRobot b2ca17e00b [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-09 02:53:03 +00:00
minggo e057a6c7c7 Merge pull request #7006 from natural-law/v3 
Update the reference of submodule plugin-x.
 2014-06-09 10:51:56 +08:00
andyque 6bc82ef5ab restore UIScrollView constructor and destructor to public 2014-06-09 10:47:02 +08:00
andyque c4f5e71bbd restore Widget's constructor and destructor to public 2014-06-09 10:41:17 +08:00
andyque 1a933807b5 remove UIInterface.h header file 2014-06-09 10:35:54 +08:00
zhangbin 5ec3c71b8c Update the reference of submodule plugin-x. 2014-06-09 10:23:40 +08:00
andyque 7a25fbfe29 refactor touch event 2014-06-09 10:23:11 +08:00
Dhilan007 4e0759533b close issue#5158:Label's display may go bonkers if using outline feature. 2014-06-09 10:12:22 +08:00
minggo 0cd42a3f39 Merge pull request #7002 from CocosRobot/update_lua_bindings_1402278357 
[AUTO]: updating luabinding automatically
 2014-06-09 09:47:33 +08:00
minggo 46ed99f611 Merge pull request #7001 from CocosRobot/update_lua_bindings_1402278332 
[AUTO]: updating luabinding automatically
 2014-06-09 09:47:10 +08:00
CocosRobot c1b7b76f92 [AUTO]: updating luabinding automatically 2014-06-09 01:47:01 +00:00
minggo 575c5101c7 Merge pull request #6999 from iSevenDays/patch-12 
fix assertions
 2014-06-09 09:46:55 +08:00
CocosRobot c604c09069 [AUTO]: updating luabinding automatically 2014-06-09 01:46:34 +00:00
minggo 7e6fc3b9ac Merge pull request #7000 from iSevenDays/patch-13 
Possible use of null pointer.
 2014-06-09 09:46:14 +08:00
minggo fa74de8511 Merge pull request #6993 from Teivaz/v3 
* Set COCOS2D_VERSION to 3.2.0
 2014-06-09 09:43:50 +08:00
minggo ccff80df2f Merge pull request #6991 from andyque/fixUIFrameColorAndOpacity 
fix UI frame cascade color and opacity
 2014-06-09 09:42:47 +08:00
Anton Sokolchenko 1a16dd02f8 Possible use of null pointer. 
Or maybe better to add CCASSERT.
 2014-06-09 02:12:17 +03:00
Anton Sokolchenko 3edef12094 Update CCControlButton.cpp 2014-06-09 02:07:43 +03:00
Anton Sokolchenko f5efc49903 fix assertions 
'label' could be not caught after previous assertions
 2014-06-09 02:04:44 +03:00
Sergey 904f157c2c move node from one parent to another fix 2014-06-07 12:25:20 +04:00
boyu0 fc5e58b521 issue #4437: add dirty tag. 2014-06-06 18:03:44 +08:00
oleksandr.kuznietsov 2640938c68 * Set COCOS2D_VERSION to 3.2.0 2014-06-06 12:58:32 +03:00