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

1816 Commits

Author SHA1 Message Date
Neo Kim 97acf52cc8 PageView - Replace the legacy methods of `PageView` with the ones of `ListView`. 2015-10-28 16:56:34 +09:00
Neo Kim e567259826 PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`. 2015-10-28 16:56:34 +09:00
Neo Kim a09f2af14c PageView - Trivial change on test code 2015-10-28 16:56:34 +09:00
pandamicro aa9f0d5bd5 Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist 
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
 2015-10-27 17:28:22 +08:00
mogemimi 73c0ce1a9a Replace String::createWithFormat() with StringUtils::format() 2015-10-16 15:02:14 +09:00
pandamicro efeb6a44fb Merge pull request #14143 from MSOpenTech/v3-win10-curl 
V3 win10 curl
 2015-10-16 13:35:48 +08:00
pandamicro e789ab97be Merge pull request #14139 from super626/v3 
fix obb performance test
 2015-10-15 16:00:51 +08:00
Dale Stammen 3e3e47de10 added Win10 UWP curl support 2015-10-14 16:47:52 -07:00
yangxiao 85f40de424 fix obb performance test 2015-10-14 13:43:02 +08:00
XiaoFeng 767a4afb9f Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1 2015-10-14 09:16:34 +08:00
pandamicro f64105b3dc Merge pull request #14047 from liamcindy/v3.9 
update for light3d reader
 2015-10-10 11:43:05 +08:00
pandamicro c2571f950c Merge pull request #14003 from zilongshanren/fixWebViewCallback 
fix ui::WebView callback operate OpenGL issue.
 2015-10-10 11:32:02 +08:00
Joachim Grill 79656ffe13 fixed typo, indentation 2015-09-29 16:50:14 +02:00
Joachim Grill 80ca579a01 added Sprite test case which loads PolygonInfo of sprite from plist file 2015-09-29 15:44:13 +02:00
Liam 8368762b37 update for light3D 2015-09-29 18:33:28 +08:00
Michael Kösel 744b7f54c9 Fix wrong debug check 2015-09-26 16:58:26 +02:00
zilongshanren bee52e378d fix ui::WebView callback operate OpenGL issue. 
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
 2015-09-23 11:22:36 +08:00
zilongshanren 1c40f7b61b CCScrollView should override removeChild 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/8396
 2015-09-21 11:35:11 +08:00
pandamicro fa9afd6c2b Merge pull request #13953 from himynameschris/fix-socketio 
Fix socketio to work with servers v1.0+
 2015-09-20 23:15:27 +08:00
geron-cn f93cfac0f7 rename setAnimationEndCallFunc 2015-09-20 16:24:41 +08:00
geron-cn 0cfc33e4d3 format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770 2015-09-20 12:34:34 +08:00
Chris Hannon e7c2436d85 fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings) 
Signed-off-by: Chris Hannon <chris@channon.us>
 2015-09-19 20:31:48 -04:00
pandamicro 6bf54a3eda Merge pull request #13770 from geron-cn/v3 
add  Frame End Call Back and Animation Clip End Call Back
 2015-09-19 00:24:21 +08:00
pandamicro 0cbc1e5f40 Merge pull request #13923 from WenhaiLin/v3-physics-refine 
Refine components to improve physics performance
 2015-09-18 21:56:36 +08:00
pandamicro add24ccf95 Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug 
Revert "remove CCClippingRectangleNode transform error support."
 2015-09-18 21:43:42 +08:00
WenhaiLin a17a702cd1 Refine components to improve performance 2015-09-18 14:34:02 +08:00
yangxiao 36d4f5564d merge cocos 2015-09-18 14:08:33 +08:00
pandamicro 3f5df0ccc3 Merge pull request #13647 from super626/motionstreak3d 
Motionstreak3d
 2015-09-18 11:59:33 +08:00
偶尔e网事 eb480fb021 Revert "remove CCClippingRectangleNode transform error support." 2015-09-18 11:31:37 +08:00
yangxiao 6f1b04fd89 merge cocos 2015-09-18 09:37:26 +08:00
pandamicro ded9a9e6d4 Merge pull request #13893 from yangws/downloader 
Remove AssetsManager dependence with CRUL.
 2015-09-17 22:18:56 +08:00
Vincent Yang 5eafc93d86 Remove AssetsManager dependence with CRUL. 2015-09-17 16:52:31 +08:00
pandamicro 1eeafed072 Merge pull request #13884 from yangws/v3 
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
 2015-09-17 16:32:56 +08:00
pandamicro 5b99ada936 Merge pull request #13842 from yangws/issue_13818 
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong
 2015-09-17 16:23:25 +08:00
yangxiao 572ee3adb2 merge cocos 2015-09-17 14:24:01 +08:00
Vincent Yang 4b83240bed Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null. 2015-09-17 11:20:36 +08:00
andyque 1be5402050 Merge branch 'v3' into addiOSMultiline-support 
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
 2015-09-16 21:49:55 +08:00
pandamicro 0479cca364 Merge pull request #13832 from yangws/downloader 
Restructure CCDownloader implement on iOS and Android don't use libcurl.
 2015-09-16 14:01:28 +08:00
Vincent Yang c85dc71846 Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong. 2015-09-16 11:07:37 +08:00
yangxiao ea538cd9da merge cocos 2015-09-16 10:37:24 +08:00
Vincent Yang 848fa2c0d0 Merge cocos2d. 2015-09-15 18:30:45 +08:00
子龙山人 f2bee23696 Merge pull request #13789 from neokim/fix-13668 
Fix for #13668
 2015-09-15 18:28:24 +08:00
子龙山人 73d2c5d1b8 Merge pull request #13577 from fusijie/fix_13454 
Fixed sprite debug draw.
 2015-09-15 14:24:23 +08:00
andyque 556175df1e add iOS EditBox multiline support 
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.

Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
 2015-09-15 13:52:39 +08:00
andyque 2fea4db9fc fix ui::Button title location issue 2015-09-15 13:37:32 +08:00
Vincent Yang ebf308d88c Test case Downloader Test restructured. 2015-09-14 15:33:34 +08:00
Neo Kim 3fff195c20 Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary. 2015-09-13 22:32:22 +09:00
子龙山人 96d6221daf Merge pull request #13723 from neokim/add_scroll_to_item_and_magnetic_scroll_into_listview 
Add scrolling to item and magnetic scroll into ListView
 2015-09-11 17:48:40 +08:00
Neo Kim 22b2f8b7b3 ListView - Change the order of test cases and fix for windows builds. 2015-09-11 16:00:53 +09:00
geron-cn 966e568051 add ActionTimeline Frame End Call Back and Animation Clip End Call Back 2015-09-10 18:29:09 +08:00