Commit Graph

116 Commits

Author SHA1 Message Date
pandamicro d6683e9376 Fix compilation issues on win32 2017-01-24 15:26:24 +08:00
pandamicro e37816eab3 Fix AssetsManager issues on x86 platform 2017-01-24 13:29:27 +08:00
knoxHuang 97c717989e fix handleTouchesMove bug for #cocos-creator/fireball/issues/5099 2017-01-20 11:43:08 +08:00
pandamicro a6f038124e Fixed Unknown type TCHAR issue 2017-01-16 16:02:55 +08:00
Nan Wang 20d45b8e08 fixed FileUtils and downloader bindings in windows 2017-01-16 15:47:07 +08:00
pandamicro 7a9e3a3b1d Add FileUtils::listFiles and FileUtils::listFilesRecursively 2017-01-13 10:32:14 +08:00
pandamicro 3eee19339a Fix download resuming issue on Android 2017-01-06 17:00:47 +08:00
zilongshanren 9030bb572a fix mac label outline 2017-01-04 17:07:30 +08:00
zilongshanren d76dae6409 add label outline effect to mac 2016-12-30 18:08:13 +08:00
zilongshanren c76bfb50fe fix label shrink effect infinit loop on Android 4.4.2 2016-12-28 14:49:17 +08:00
pandamicro 178fbe03cb Separate FinalizeHook for ref objects and non ref objects 2016-12-17 17:19:10 +08:00
zilongshanren 2789d8f6fe fix editbox can't input on mac 2016-11-14 18:08:13 +08:00
Nan Wang 9a934c8b46 Merge branch 'v1.3' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-11-07 15:21:33 +08:00
zilongshanren b289d6010e fix editbox sierra 2016-11-01 22:29:42 +08:00
James Chen 725aa66556 Updates lite audio engine sources from upstream (cocos2d-x). 2016-10-28 11:30:29 +08:00
zilongshanren 1a34550c01 fix label font color issue 2016-10-22 09:33:47 +08:00
pandamicro f88c6fa3cc Support webp in native 2016-10-19 18:36:35 +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
zhangbin ddda30122d Solve the error application name of Android Studio project. 2016-10-10 13:44:38 +08:00
zilongshanren 8ec54e67c5 fix ios label shrink issue 2016-09-22 14:51:09 +08:00
pandamicro c4fb2500f2 Fix compilation issues of CCGLView 2016-09-08 10:01:19 +08:00
Nan Wang ef368ef409 merged v1.2 2016-09-07 18:47:59 +08:00
zilongshanren 0b658267be fix textChange event 2016-09-05 17:01:38 +08:00
zilongshanren b2c56ff88a fix editbox issue 2016-09-05 16:48:45 +08:00
zilongshanren 727ac643b4 fix Android compile and running issues 2016-09-02 17:38:31 +08:00
pandamicro 651551055a Fix mac simulator 2016-09-02 10:57:21 +08:00
pandamicro 86ae89f85f Fix win32 compilation issues 2016-09-01 10:38:54 +08:00
pandamicro fcbcce65d8 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/CCDevice-android.cpp
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java
	cocos/platform/ios/CCDevice-ios.mm
	cocos/platform/mac/CCDevice-mac.mm
	cocos/platform/win32/CCDevice-win32.cpp
2016-08-31 14:39:08 +08:00
zilongshanren 299280cbe0 fix windows systemfont bold 2016-08-31 11:44:04 -07:00
zilongshanren 81393c3ef4 add android bold support 2016-08-30 15:16:10 +08:00
zilongshanren 5134ca1851 add bold support for iOS 2016-08-30 15:03:20 +08:00
zilongshanren 96d066204d add bold support for mac 2016-08-30 14:41:59 +08:00
Wang Nan 51ec64b6b4 Merge pull request #288 from knoxHuang/v1.2
add enableAntiAlias for Native for fireball/issues/2836
2016-08-29 17:02:22 +08:00
knoxHuang b73e97e403 add enableAntiAlias for Native for fireball/issues/2836 2016-08-29 16:33:52 +08:00
zilongshanren c216e504f1 fix label shrink crash issue 2016-08-29 15:30:12 +08:00
zilongshanren a6c7155922 fix label shrink crash issue 2016-08-29 11:12:01 +08:00
pandamicro 66a38aa3a4 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/2d/CCFastTMXTiledMap.cpp
2016-08-26 20:48:38 +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 1c01a9df2c Fix android compilation issuse 2016-08-26 19:01:13 +08:00
pandamicro 26117d82b3 Fix compilation issues on iOS 2016-08-26 18:52:25 +08:00
pandamicro 9bf561baee Upgrade to v3.13 release 2016-08-26 14:30:32 +08:00
pandamicro a2b0aa034c Fix viewport not supporting retina issue 2016-08-25 17:50:24 +08:00
zhangbin f97b23514b Use java reflection to avoid API level dependent, Use API Level 10. 2016-08-25 09:56:32 +08:00
zilongshanren c18fa069ff fix android isPlaying API 2016-08-16 16:38:40 +08:00
zilongshanren 860428af73 add android support 2016-08-16 16:38:26 +08:00
pandamicro b742058510 Fix all compilation and linking issues 2016-08-16 16:09:39 +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