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

33656 Commits

Author SHA1 Message Date
zilongshanren 830eb3433f Merge pull request #14786 from liamcindy/v3_ui_widget 
fix uiWidget clipping error with Node
 2015-12-23 18:57:15 +08:00
xiaofeng11 519e69813d Merge pull request #14785 from xiaofeng11/v3.10 
Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash
 2015-12-23 18:43:07 +08:00
XiaoFeng c181390881 Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash 2015-12-23 18:39:06 +08:00
Liam bcc2ed0e2a update for scrollView test 2015-12-23 18:14:09 +08:00
Liam 0cac519e5c fix uiWidget clipping error with Node 2015-12-23 16:05:52 +08:00
zilongshanren 851d288d0b Merge pull request #14781 from zilongshanren/rollbackSlider 
Rollback slider and loadingbar in non scale9 mode
 2015-12-23 15:04:55 +08:00
zilongshanren 2a2f184449 refine code with DRY. 2015-12-23 14:43:25 +08:00
zilongshanren 847094ec7d ui::loadingBar -> add flip logic back 2015-12-23 14:34:36 +08:00
pandamicro 45d1d655cc Merge pull request #14779 from xiaofeng11/v3.10 
Bug fix & update
 2015-12-23 12:35:52 +08:00
pandamicro d11b2b4bfd Merge pull request #14782 from geron-cn/v3.10 
update submodule: web
 2015-12-23 12:34:24 +08:00
XiaoFeng 3fd8f36a90 Limit force GC in menu item only work in lua-binding 2015-12-23 12:30:59 +08:00
geron-cn 26bd2b8212 update submodule 2015-12-22 21:43:10 +08:00
geron-cn 86ccf28343 update submodule: web 2015-12-22 21:25:21 +08:00
zilongshanren d4a5d0da44 rollback uislider 2015-12-22 20:03:56 +08:00
zilongshanren ab77e8c520 Revert "loading bar use new scale9 feature" 
This reverts commit a671bf7ce9.
 2015-12-22 19:53:24 +08:00
pandamicro 1ac13efacc Merge pull request #14780 from VisualSJ/v3.10 
Close webgl dedicated test in canvas mode
 2015-12-22 19:09:17 +08:00
VisualSj 1c60ae6ff1 Close webgl dedicated test in canvas mode 2015-12-22 19:07:46 +08:00
XiaoFeng 82867b0073 Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click 
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
 2015-12-22 18:41:44 +08:00
zilongshanren 7d730d7c21 Update CHANGELOG 2015-12-22 13:46:29 +08:00
zilongshanren 064cd8d04f Merge pull request #14722 from newnon/v3.10_webp_improvement 
WebP loading improvements WebP loaded as premultiplied alpha if it has
 2015-12-22 13:43:11 +08:00
zilongshanren 9347335fad Merge pull request #14767 from xiaofeng11/v3.10_logChange 
[ci skip] remove duplicate change log
 2015-12-22 13:41:39 +08:00
xiaofeng11 954a54f7bb Merge pull request #14770 from pandamicro/v3.10 
Fix VS crash issue caused by unsupported macro syntax
 2015-12-22 09:42:24 +08:00
pandamicro a91a669972 Fix VS crash issue caused by unsupported macro syntax 
piece of shit...
 2015-12-21 22:44:59 +08:00
pandamicro baa6028e42 Merge pull request #14769 from CocosRobot/update_lua_bindings_1450697623 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-21 21:34:47 +08:00
CocosRobot 30f3096c92 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-21 11:36:07 +00:00
zilongshanren 8eda79eb32 Merge pull request #14768 from liamcindy/v3_ui_BMFont 
add interface for BMFont
 2015-12-21 19:30:10 +08:00
zilongshanren fa172b9da9 Merge pull request #14765 from liamcindy/v3_ui_js 
update for js uiTextAtlasTest
 2015-12-21 19:17:41 +08:00
Liam 98a6558018 add interface for BMFont 2015-12-21 18:49:46 +08:00
肖峰 a6a9e30287 remove duplicate change log 2015-12-21 17:00:20 +08:00
fanli 81f9d20158 update for js uiTextAtlasTest 2015-12-21 16:29:16 +08:00
zilongshanren fe0bd66698 Merge pull request #14753 from xiaofeng11/v3.10_logChange 
[ci skip]Update change log and authors
 2015-12-21 14:43:10 +08:00
pandamicro 8d8ac60625 Merge pull request #14761 from pandamicro/v3.10 
Correct return type to adopt GC Rooting API
 2015-12-21 11:46:59 +08:00
pandamicro 4e36e24993 Correct return type to adopt GC Rooting API 2015-12-21 10:42:54 +08:00
肖峰 23c51145ec update changeling 2015-12-21 10:12:24 +08:00
pandamicro 80973677ed Improve UICheckBox issue 2015-12-20 21:13:16 +08:00
Sergey a342866083 Test for WebP with & without alpha 2015-12-20 14:22:04 +03:00
肖峰 7b8db23a9e Update change log and authors 2015-12-20 15:34:21 +08:00
pandamicro f747075a83 Merge pull request #14748 from pandamicro/v3.10 
Temporary disable forceGC on win32
 2015-12-19 23:27:12 +08:00
pandamicro 8f836162aa Temporary disable forceGC on win32 2015-12-19 22:45:57 +08:00
pandamicro 386b850871 Fix issue in MenuItem init usage 2015-12-19 22:45:22 +08:00
pandamicro ae48253da6 Fix UI addEventListener issue 2015-12-19 22:44:25 +08:00
pandamicro e9bddf0c6d Merge pull request #14747 from liamcindy/v3_ui_js 
fix scrpite sameples error with controlButton
 2015-12-19 22:26:38 +08:00
fanli ffbac99dc5 fix script samples error with controlButton 2015-12-19 22:22:41 +08:00
xiaofeng11 ef3bb81be6 Merge pull request #14746 from zilongshanren/v3.10 
fix lua focus test
 2015-12-19 19:14:30 +08:00
zilongshanren ac4f66fff2 fix lua focus test 2015-12-19 18:32:43 +08:00
pandamicro a165ecb1e9 Merge pull request #14745 from pandamicro/v3.10 
Upgrade bindings generator
 2015-12-19 18:09:09 +08:00
zilongshanren f43379a313 Merge pull request #14744 from CocosRobot/update_lua_bindings_1450516210 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-19 17:19:08 +08:00
pandamicro 4f94b03b86 Upgrade bindings generator 2015-12-19 17:18:39 +08:00
CocosRobot 0f90f74df9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-19 09:12:27 +00:00
zilongshanren 94ee0734a5 Merge pull request #14721 from newnon/v3.10_slider_missprint 
slider misprint fix
 2015-12-19 17:06:26 +08:00