Commit Graph

52 Commits

Author SHA1 Message Date
zilongshanren 6d0fc9dcbf fix videoplayer crash issue 2017-01-18 18:16:19 +08:00
zilongshanren 272167e744 fix editbox black screen issue 2016-12-30 14:51:20 +08:00
zilongshanren 83d61dcbf7 add bitmap font batch rendering 2016-12-21 16:51:04 +08:00
zilongshanren 2789d8f6fe fix editbox can't input on mac 2016-11-14 18:08:13 +08:00
zilongshanren b289d6010e fix editbox sierra 2016-11-01 22:29:42 +08:00
zilongshanren be642ec1af add ready to play event 2016-10-17 11:59:38 +08:00
zilongshanren 65a677e51a improve VideoPlayer 2016-10-14 18:16:40 +08:00
zilongshanren 58be2ff238 add metaloaded and click event 2016-10-14 11:37:31 +08:00
zilongshanren f4f247ca5f fix win32 compile error 2016-09-05 17:14:59 -07:00
zilongshanren b2c56ff88a fix editbox issue 2016-09-05 16:48:45 +08:00
zilongshanren fd1b18524b fix iOS/Mac editbox issue 2016-09-05 16:04:51 +08:00
zilongshanren c50da0fca5 use v1.2 editbox implementation 2016-09-05 15:40:22 +08:00
pandamicro 2763b53ac1 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java
2016-08-26 19:11:51 +08:00
pandamicro 9bf561baee Upgrade to v3.13 release 2016-08-26 14:30:32 +08:00
zilongshanren ca1a3d8870 fix android isPlaying API 2016-08-16 14:49:48 +08:00
zilongshanren c6ee3598d3 add android support 2016-08-16 12:01:23 +08:00
pandamicro 7bfc19497b Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-08-16 11:34:42 +08:00
zilongshanren d5fbdb1e53 add currentTime and duration in iOS 2016-08-15 19:55:13 +08:00
pandamicro 1dd701936b Fix compilation issues on Mac 2016-08-11 13:57:51 +08:00
pandamicro 5011a758cc Upgrade cocos/ui to v3.13 2016-08-07 22:18:28 +08:00
zilongshanren 190a94fbcc modify the line truncate mode 2016-08-04 15:52:13 +08:00
zilongshanren 190e15d52c fix editbox password alignment 2016-08-04 15:10:31 +08:00
Nan Wang d4ea8e046d fix editbox win32 return callback function 2016-07-21 15:50:52 +08:00
zilongshanren 862e868666 add return key event 2016-07-19 16:42:54 +08:00
minggo 722708380f Merge pull request #216 from minggo/uiwidget-missing-properties-clone
fix missing properties for clone
2016-07-18 18:01:40 +08:00
minggo 1d4c64d163 fix missing properties for clone 2016-07-18 15:53:31 +08:00
zilongshanren 4cf595a653 improve mac single line editbox 2016-07-18 11:39:21 +08:00
zilongshanren a20d7b97cb fix jsb editbox label alignment 2016-07-15 18:27:32 +08:00
zilongshanren 0b69cec407 sync editbox changes from cocos2d-x 2016-06-24 17:33:58 +08:00
zilongshanren 6e5b266496 add all lowercase support 2016-06-24 15:30:59 +08:00
Wenhai Lin 94c6dcdf6a Replace CCAssert macros with CCASSERT 2016-05-18 13:50:49 +08:00
Wenhai Lin 73fc83b6ef Fixed compile fail on WIN32 2016-05-12 19:24:42 +08:00
Wenhai Lin 850c479516 Sync Bug fix:
1. HttpClient: remove Content-Type limitation
2.VideoPlayer/WebView: hide system native control when the Node leaves the 'stage'
2016-05-12 14:26:28 +08:00
Wenhai Lin 52332dce9e Fixed possible crash on exit. 2016-05-09 16:37:55 +08:00
Wenhai Lin e3431f9259 Avoid creating short-term temporary Vec2 objects 2016-05-06 11:21:11 +08:00
Wenhai Lin 4d87be5c76 Refine EditBox(sync from cocos2d-x) 2016-05-04 16:08:46 +08:00
Wenhai Lin 26e7dcc49e Fixed the initial placeholder of ui::TextField is incorrect. 2016-05-04 15:43:21 +08:00
Wenhai Lin 73314ab526 Reduce unnecessary c_str() calls 2016-05-04 10:53:35 +08:00
Wenhai Lin 5159d14367 Bug fix 2016-04-28 23:37:21 +08:00
Wenhai Lin 4d7038bdb6 Fixed the software keyboard gets opened by call EditBox::setVisible(true) on Android. (#47) 2016-04-27 20:04:20 +08:00
Wenhai Lin 43e89ca5fa Fixed warns 2016-04-27 13:55:14 +08:00
Wenhai Lin 94501cc8f1 Bug fix and stability improvements 2016-04-25 15:56:03 +08:00
Wenhai Lin a50b000b17 Fixed memory leak and warns 2016-04-21 23:47:26 +08:00
Wenhai Lin 83fc6fd1a8 Bug fix:
1.Fixed crash in win for rich text
2.Fixed crash when custom SSL certificate is set on iOS
3.Fixed SocketIO crash on reconnect
4.Fixed ActionManager memory leak
5.Fixed crash in MenuItem::activate
6.Fixed crash on exit game
7.Fixed crash in TableView::updateCellAtIndex
8.Fixed crash in RichText on window
2016-04-21 15:19:47 +08:00
Wenhai Lin 47e5688a9d Bug fix:
1.Fixed fail to add component for node
2.Fixed crash on exit
3.Fixed FileUtils::isDirectoryExist may return the error result in iOS/Mac
2016-04-20 17:36:59 +08:00
Wenhai Lin 822966e820 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into md 2016-04-19 10:05:02 +08:00
Wenhai Lin 48dbfc4609 Fixed typo in UILayout using clipping rect x instead of y coordinate 2016-04-18 11:50:04 +08:00
Wenhai Lin efc97073e3 Fixed memory leak 2016-04-18 11:06:14 +08:00
2youyouo2 a6db08343c sync cocos2d/cocos2d-x#15293 2016-04-12 10:29:43 +08:00
Wenhai Lin ec1a1d65b7 Remove unnecessary 'void' modifier 2016-04-07 23:13:19 +08:00