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

31077 Commits

Author SHA1 Message Date
WenhaiLin 4bd1fa7d37 Fixed crash cause by the case of file name on WIN32. 2015-07-07 10:08:47 +08:00
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
子龙山人 a6b29666c9 Merge pull request #12674 from WenhaiLin/v3-38-issue12673 
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
 2015-07-07 09:50:00 +08:00
pandamicro e73906a119 Merge pull request #12707 from pandamicro/v3.7-release 
[ci skip][Simulator JSB] Fix issue caused by video and web view binding
 2015-07-07 09:48:42 +08:00
子龙山人 de64dbfbb1 Merge pull request #12703 from CocosRobot/update_lua_bindings_1436229517 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-07 09:43:45 +08:00
pandamicro a9f98aefea [Simulator JSB] Fix issue caused by video and web view binding 2015-07-07 09:38:38 +08:00
CocosRobot 4c88db3fb2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-07 00:44:47 +00:00
Ricardo Quesada ed7a841dec Merge pull request #12702 from ricardoquesada/xcode_7_bug_fixes 
compiles on Xcode 7
 2015-07-06 17:30:40 -07:00
Ricardo Quesada ad1fc88fa8 compiles on Xcode 7 2015-07-06 16:30:29 -07:00
Ricardo Quesada df3aa84481 Merge pull request #12701 from ricardoquesada/cmake-no-exceptions 
removes -fno-excpetion and -fexception from cmake
 2015-07-06 13:28:14 -07:00
Ricardo Quesada 4c88be9520 removes -fno-excpetion and -fexception from cmake 2015-07-06 12:09:50 -07:00
子龙山人 6005c42892 Merge pull request #12700 from CocosRobot/update_lua_bindings_1436178667 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-06 21:25:34 +08:00
CocosRobot a4bce56cca [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-06 10:37:24 +00:00
子龙山人 89d40c164e Merge pull request #12697 from jianglong0156/add-remove-key-api 
add UserDefault api deleteValueForKey
 2015-07-06 18:27:04 +08:00
VisualSj 3b69a1726f Fixed a bug that action texture address error 2015-07-06 17:17:20 +08:00
子龙山人 06ea3dce20 Merge pull request #12696 from andyque/improve-template-dialy-build 
[ci skip]fix python syntax error
 2015-07-06 17:10:28 +08:00
andyque 92585d3a8e fix python syntax error 2015-07-06 17:09:55 +08:00
jianglong0156 6f3b977c1e add UserDefault api deleteValueForKey 2015-07-06 17:01:17 +08:00
子龙山人 b2c83b6038 Merge pull request #12695 from andyque/improve-template-dialy-build 
add framework daily build scripts
 2015-07-06 17:00:10 +08:00
XiaoFeng 214684b3be Fix 2015-07-06 16:45:04 +08:00
andyque 881a388892 add framework daily build scripts 2015-07-06 16:43:37 +08:00
XiaoFeng 9fab1e7702 Change to use auto & for each to enum sub items 2015-07-06 16:39:00 +08:00
子龙山人 faab927f1b Merge pull request #12693 from CocosRobot/update_lua_bindings_1436170966 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-06 16:36:44 +08:00
CocosRobot ae860bd6ee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-06 08:29:03 +00:00
子龙山人 17207f14e5 Merge pull request #12689 from fusijie/refine_setAnimationInterval 
Refine setAnimationInterval from double to float.
 2015-07-06 16:18:45 +08:00
XiaoFeng d6fc8ecc94 Fix when use percentage size & position to a UIWidget which parent is a layout component, when change simulator screen size, layout won't effect correctly. 2015-07-06 16:02:19 +08:00
Jacky 4499b60446 Refine setAnimationInterval from double to float. 2015-07-06 14:57:42 +08:00
Neo Kim a01f31c75c Change NULL to nullptr 2015-07-06 15:54:28 +09:00
Neo Kim 69a4a438bb Change Xcode project configurations to use spaces instead of tab as indentation. 2015-07-06 14:54:41 +09:00
Neo Kim c4dc9b04fd Add a guard filtering tries to set same value. 2015-07-06 14:54:28 +09:00
XiaoFeng df2a2d253d Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release 2015-07-06 10:31:09 +08:00
Neo Kim 0ff7aaef95 Modify loop iteration codes 2015-07-06 11:30:24 +09:00
Neo Kim 43308e258a Fix an issue of not releasing Texture instance in ScrollViewBar 2015-07-06 11:29:39 +09:00
Neo Kim a4803c6713 Remove unnecessary commented out code. 2015-07-05 21:30:13 +09:00
子龙山人 731754ccea Merge pull request #12684 from neokim/fix_radio_button_clear_bug 
Fix radio button group clear issue
 2015-07-05 16:36:28 +08:00
Neo Kim 3ab4285960 Refactor code 2015-07-04 16:06:05 +09:00
Neo Kim 6264f7fefb Correct include-related build errors in some platforms 2015-07-04 15:03:05 +09:00
Neo Kim ceeca575f3 Replace 'margin' of scroll bar with 'positionFromCorner' 2015-07-04 14:05:47 +09:00
pandamicro d52006692c Merge pull request #12682 from natural-law/v3.7-release 
[ci skip] Solve the error in simulator.
 2015-07-04 10:39:33 +08:00
Bin Zhang 0bcdf898bf Solve the error in simulator. 2015-07-04 10:17:40 +08:00
Neo Kim f667b085b8 Change not to show scroll bar when the scroll view is initiated. 2015-07-04 09:59:22 +09:00
Neo Kim 9548d85f08 Fix radio button group clear issue 2015-07-04 09:57:54 +09:00
Neo Kim 3b6cd4dffc Modify indentation to comply with the convention 2015-07-04 09:56:53 +09:00
Neo Kim 86cbd59bfd Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
Neo Kim 60c32f6fb5 Refactor some codes 2015-07-04 09:56:53 +09:00
Neo Kim ec45be699d Add UIScrollViewBar class documentation 2015-07-04 09:56:52 +09:00
Neo Kim c093bb18e2 Add scroll bar manipulation methods into ScrollView 2015-07-04 09:56:52 +09:00
Neo Kim 9a11cfd496 Add a way of changing scroll bar width 2015-07-04 09:56:52 +09:00
Neo Kim 2cae17b462 Add scroll bar feature into ScrollView 2015-07-04 09:56:52 +09:00
pandamicro 7f6334a620 Merge pull request #12678 from CocosRobot/update_lua_bindings_1435934564 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-04 08:41:49 +08:00