Commit Graph

203 Commits

Author SHA1 Message Date
zhangbin 899f121859 Improve the implementation of showing Object Group in TiledMap. 2016-09-13 16:12:12 +08:00
zhangbin 28fa0aab1b Merge branch 'master' of github.com:cocos-creator/engine into issue3120
# Conflicts:
#	cocos2d/tilemap/CCSGTMXObjectGroup.js
2016-09-09 16:58:21 +08:00
Jare Guo 6e0f299d2b support premultipliedAlpha on spine 2016-09-07 16:31:01 +08:00
Wang Nan 40f5f45e75 Merge pull request #1057 from VisualSJ/master_audioEngine
Master audio engine
2016-09-07 10:57:17 +08:00
VisualSJ 2bc87645f2 review code and support jsb 2016-09-06 18:22:54 +08:00
VisualSJ c1f319721f Merge branch 'master' of github.com:cocos-creator/engine into master_audioEngine 2016-09-05 18:47:32 +08:00
VisualSJ bd1d89ae98 review code 2016-09-05 18:46:56 +08:00
pandamicro 54e07aa6ac Fix cc.log issue in JSB 2016-09-05 17:50:40 +08:00
Nan Wang 6acbbe6373 merged v1.2 2016-09-05 12:06:47 +08:00
knoxHuang dccf301be3 fix targetedAction error for fireball/issues/4129 2016-09-05 10:55:18 +08:00
knoxHuang 6286c73b60 fix show and hide ToggleVisibility error for fireball/issues/4128 2016-09-02 11:39:22 +08:00
pandamicro 922c7420ae Fix initDebugSettings in jsb 2016-09-01 10:53:03 +08:00
pandamicro a5a0e308a7 Upgrade API with v3.13 2016-09-01 10:53:03 +08:00
pandamicro 61e699eaa2 Improve Action management in JSB 2016-09-01 10:53:03 +08:00
Nan Wang 2ec8bf2c6b merged 2016-08-31 14:30:54 +08:00
zilongshanren 66fa31d3e1 add bold/italic/underline support 2016-08-30 11:06:32 +08:00
Jare Guo 572b9a7bea fix scene list 2016-08-22 16:42:47 +08:00
Wang Nan b588dc20b8 Merge pull request #1050 from cocos-creator/v1.2
merge V1.2
2016-08-19 15:41:03 +08:00
Jare Guo d60eda10aa Merge branch 'v1.1' into v1.2
# Conflicts:
#	cocos2d/core/base-ui/CCWidgetManager.js
2016-08-16 14:12:49 +08:00
Jare Guo 7bab9fc148 auto release cached SpriteFrame 2016-08-15 11:03:15 +08:00
zhangbin 356e5590d6 Solve the error when rendering Object group in native. 2016-08-12 16:07:11 +08:00
Wang Nan b474a9dd57 Merge pull request #1029 from pandamicro/v1.2
Fix some issues introduced in v1.2
2016-08-12 11:51:32 +08:00
Jare Guo 788b48852a improve api document for auto release 2016-08-12 11:16:24 +08:00
Wang Nan f8f9f72878 Merge pull request #1027 from cocos-creator/v1.2
merge V1.2
2016-08-12 09:39:58 +08:00
pandamicro 6b1c8bb568 Fix small API issues 2016-08-11 15:44:50 +08:00
knoxHuang 7e8c1a0cd8 add syncPositionUpdate for CardinalSplineTo fireball/issues/3956 2016-08-11 10:08:17 +08:00
knoxHuang 17e31566c1 fix runAction error for fireball/issues/3891 2016-08-09 16:57:16 +08:00
knoxHuang 08f5810fd2 fix runAction “too much recursion” error for fireball/issues/3922 2016-08-09 14:26:11 +08:00
knoxHuang 2e671e1d80 Uniform SocketIO emit interfaces parameter for fireball/issues/3872 2016-08-04 16:17:38 +08:00
pandamicro 3dfc574f4d Fix game EVENT_HIDE&SHOW not working in JSB 2016-08-01 16:20:39 +08:00
pandamicro c70058964d Fix Event.EventTouch is undefined issue in JSB 2016-07-29 18:49:46 +08:00
pandamicro 3b75a0ab9d Fix memory leak caused by event listener 2016-07-29 18:49:45 +08:00
Wang Nan fd129e5ba6 Merge pull request #964 from knoxHuang/master
fix JSB scheduleOnce will repeat for #fireball/issues/3768
2016-07-27 18:32:26 +08:00
knoxHuang 3bbecf49b5 fix JSB scheduleOnce will repeat for #fireball/issues/3768 2016-07-27 17:40:27 +08:00
zilongshanren 408519bbac fix ttf dynamic load issue on jsb 2016-07-27 15:38:46 +08:00
knoxHuang 9ecc4d226b fix cc.hide、cc.show、cc.toggleVisibility Web no effect for issues/3698 2016-07-27 12:51:08 +08:00
zilongshanren bf082642ff fix web enum on Mac and Windows
1. add more events to webview
2016-07-25 17:55:13 +08:00
zilongshanren f738204e1b fix a few webview related issues 2016-07-25 15:46:26 +08:00
zilongshanren bcb269cfa4 Merge remote-tracking branch 'fireball/master' into add-webview-support 2016-07-25 10:49:34 +08:00
zilongshanren a5deddc3b3 improve webivew 2016-07-25 10:49:17 +08:00
knoxHuang 9cb440197c fix schedule bug for #fireball/issues/3686 2016-07-22 11:33:02 +08:00
pandamicro 911991d7d3 Revert downloadText overload 2016-07-21 16:04:11 +08:00
pandamicro e59bf5e742 Fix texture pixelWidth & pixelHeight property issue in JSB 2016-07-21 10:39:34 +08:00
pandamicro e161341df9 Update JSB downloaders 2016-07-21 10:39:07 +08:00
knoxHuang ae8f7abebf fix Bezier node's coordinates when no sync bug for #fireball/issues/3660 2016-07-20 11:10:09 +08:00
Nan Wang 1f7adb2c5c merge v1.1 fixes 2016-07-19 10:04:06 +08:00
Jare Guo 768ac4d28c should not destroy persistRootNode 2016-07-16 17:00:50 +08:00
Jare Guo ef436d9da4 deferred load scene's raw asset 2016-07-08 17:15:57 +08:00
knoxHuang 9a768031ff fix Follow error for runtime #fireball/issues/3492 2016-07-08 15:16:49 +08:00
pandamicro aca5a40551 Add runtime polyfill for remote image loading 2016-07-08 12:26:37 +08:00