Commit Graph

4804 Commits

Author SHA1 Message Date
zilongshanren 272167e744 fix editbox black screen issue 2016-12-30 14:51:20 +08:00
knoxHuang a9f67c46fa fix errorBuffer error for XMLHTTPRequest 2016-12-29 14:49:18 +08:00
Wang Nan eaad2251f2 Merge pull request #460 from knoxHuang/develop
fix XMLHTTPRequest onerror no callback for fireball/issues/4582
2016-12-29 11:18:57 +08:00
子龙山人 07a53301d6 Merge pull request #462 from zilongshanren/fix-android-shrink-label-issue
fix label shrink effect infinit loop on Android 4.4.2
2016-12-28 15:18:24 +08:00
zilongshanren c76bfb50fe fix label shrink effect infinit loop on Android 4.4.2 2016-12-28 14:49:17 +08:00
zilongshanren c8a6529bb6 only substract kerning when needed 2016-12-28 14:06:41 +08:00
knoxHuang ced6f3690b update XMLHTTPRequest code 2016-12-28 10:54:12 +08:00
knoxHuang f9ce7d0e5f fix XMLHTTPRequest onerror no callback for fireball/issues/4582 2016-12-27 15:04:24 +08:00
Wang Nan a4b7d28bd3 Merge pull request #458 from natural-law/issue4918
Update the version of glfw for Mac.
2016-12-27 10:29:47 +08:00
Wang Nan 1629d64912 Merge pull request #459 from natural-law/issue4761
Solve the error when running project on iOS device with release mode.
2016-12-27 10:29:14 +08:00
zhangbin 118a806995 Solve the error when running project on iOS device with release mode. 2016-12-26 17:38:35 +08:00
zhangbin 5ceb0856e3 Update the version of glfw for Mac. 2016-12-26 16:44:56 +08:00
Wang Nan a7bb513ca8 Merge pull request #456 from natural-law/issue4921
Improve the usage of addEvent & removeEvent of CCArmatureDisplay.
2016-12-26 09:34:35 +08:00
zilongshanren cdf356e98e fix bmfont trim rendering edge cases 2016-12-23 18:09:11 +08:00
zhangbin c473adea7c Improve the usage of addEvent & removeEvent of CCArmatureDisplay. 2016-12-22 16:38:21 +08:00
zilongshanren c3896621c8 add show FPS on mac simulator 2016-12-22 16:12:56 +08:00
子龙山人 caebd2cfe9 Merge pull request #454 from knoxHuang/develop
add Show FPS for simulator #fireball/issues/4944
2016-12-22 15:18:02 +08:00
knoxHuang 4ee224b05a add Show FPS for simulator #fireball/issues/4944 2016-12-22 15:12:27 +08:00
Wang Nan 7e9973a8b5 Merge pull request #450 from natural-law/issue4891
Update the runtime version of DragonBones.
2016-12-22 14:14:27 +08:00
子龙山人 7572094b1f Merge pull request #449 from zilongshanren/bitmap-font-support-spriteframe
add bitmap font batch rendering
2016-12-22 11:43:05 +08:00
zilongshanren 382de63d07 bmfont spriteframe respect trim 2016-12-22 09:49:41 +08:00
zilongshanren 34a36fcd4a retain fnt spriteframe 2016-12-21 17:28:57 +08:00
zhangbin de4054208f Add js binding for CCFactory::getFactory. 2016-12-21 17:16:46 +08:00
zilongshanren 837b625204 rename function args 2016-12-21 17:14:14 +08:00
zilongshanren 83d61dcbf7 add bitmap font batch rendering 2016-12-21 16:51:04 +08:00
Wang Nan c3de6d4152 Merge pull request #448 from cocos-creator/v1.3
merge V1.3
2016-12-21 14:32:08 +08:00
knoxHuang 8812ead9bf add semicolon import android.os.Bundle for AppActivity 2016-12-20 18:10:18 +08:00
knoxHuang 871732c527 add android.os.Bundle for AppActivity 2016-12-20 17:29:41 +08:00
James Chen b9f5f877d2 [mac, ios] Sync bug fix from https://github.com/cocos2d/cocos2d-x/pull/17011 2016-12-20 15:10:42 +08:00
pandamicro 2c69396f87 Fix rooted wrappers leak issue 2016-12-20 11:37:01 +08:00
pandamicro df1184df20 remove annoying logs for event creation 2016-12-20 11:37:01 +08:00
pandamicro 06ebfdd211 Increase default JS heap to 32 mb 2016-12-20 11:37:01 +08:00
pandamicro fd7dce6d30 Fix crash during Wrappers deallocation (possible to have leak) 2016-12-20 11:37:01 +08:00
pandamicro 1c84b31dcf Fix spine TrackEntry recursive conversion issue by using getter 2016-12-20 11:37:01 +08:00
pandamicro 076599d9c8 Separate FinalizeHook for ref objects and non ref objects 2016-12-20 11:37:01 +08:00
pandamicro a79014a51e Fix cc.director._actionManager and cc.director._scheduler 2016-12-20 11:36:33 +08:00
zhangbin 0b0bc1121c Update the runtime version of DragonBones. 2016-12-20 11:19:07 +08:00
knoxHuang ae13b352ef fix isScheduled error for fireball/issues/4927 2016-12-19 13:46:12 +08:00
pandamicro 4fc4f33a70 Merge pull request #442 from pandamicro/develop
Fix crash issues and improve bindings code
2016-12-19 11:52:52 +08:00
pandamicro 09be783164 Fix rooted wrappers leak issue 2016-12-19 11:31:45 +08:00
pandamicro 55302456de remove annoying logs for event creation 2016-12-17 19:47:15 +08:00
pandamicro fac2390f5f Increase default JS heap to 32 mb 2016-12-17 17:27:19 +08:00
pandamicro 8c96c29a5a Fix crash during Wrappers deallocation (possible to have leak) 2016-12-17 17:24:58 +08:00
pandamicro 319a5030ee Fix spine TrackEntry recursive conversion issue by using getter 2016-12-17 17:21:05 +08:00
pandamicro 178fbe03cb Separate FinalizeHook for ref objects and non ref objects 2016-12-17 17:19:10 +08:00
Nan Wang 563a2621ab merged v1.3 2016-12-16 13:54:56 +08:00
knoxHuang 1223dd2592 rm extra code for AppActivity 2016-12-16 10:35:50 +08:00
Nan Wang 147f0c3315 update version to 1.4.0-lite 2016-12-13 15:38:49 +08:00
Nan Wang d9258d86c5 update engine version to 1.3.3-lite 2016-12-13 10:06:51 +08:00
Wang Nan a3b357a88a Merge pull request #439 from zilongshanren/fix-richtext-label-size
fix richtext custom font issue
2016-12-13 09:45:49 +08:00