Commit Graph

238 Commits

Author SHA1 Message Date
Wang Nan ae545eacb9 Merge pull request #1405 from jareguo/temp2
initialization callback for game.run should be invoked before cc.game.EVENT_GAME_INITED
2016-12-29 15:25:55 +08:00
zhangbin 5d64ffa913 Remove the usage of bind in DragonBones addEvent on JSB. 2016-12-29 12:01:14 +08:00
Jare Guo 5f51d3a764 initialization callback for game.run should be invoked before cc.game.EVENT_GAME_INITED 2016-12-29 10:01:37 +08:00
zhangbin 058121c1ad Mixin CCArmatureDisplay with EventTarget in jsb environment. 2016-12-22 16:39:58 +08:00
zilongshanren 0d0d18c1b7 add bmfont batch rendering
commit 68c7b5ed8e174238514b4b680634f197a976de60
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Dec 21 11:19:21 2016 +0800

    finish web bmfont batch

commit 3d038e14128a375848efec99f3706c0e252cdbd0
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 16 17:25:05 2016 +0800

    bitmap support spriteframe on web

commit 87d371410de223956c50bd5a4b85958973181c11
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 16 16:42:51 2016 +0800

    make bitmap depends on spriteframe
2016-12-21 16:49:09 +08:00
Nan Wang 52b1a7658c fix merge conflict of CCLoader getReferenceKey 2016-12-16 10:53:37 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
pandamicro a09f36187b Refactor cc.loader to use url as reference key
Deprecate any external id usage, user should use uuid / url to load
Always use url as reference key, when only uuid is available, copy uuid to url
2016-12-15 12:33:19 +08:00
Wang Nan bd2770d02f Merge pull request #1340 from knoxHuang/v1.3_fixBug
fix CCSystemEvent cc._EventListenerKeyboard.LISTENER_ID error for JSB
2016-12-09 11:02:50 +08:00
knoxHuang 01e0e9d031 add LISTENER_ID for jsb-event 2016-12-09 10:10:20 +08:00
Jare Guo 1fb594a2e4 add paramater of Director._loadSceneByUuid 2016-12-08 15:59:50 +08:00
zilongshanren f82062160a fix label jsb resize height dimensions issue 2016-11-23 14:46:32 +08:00
zilongshanren 8ff6679935 improve jsb label polyfill 2016-11-16 11:56:46 +08:00
zilongshanren de2e981423 fix label outline color error 2016-11-16 11:36:02 +08:00
knoxHuang abb655c274 fix RotateTo bug for fireball/issues/4610 2016-11-14 09:53:55 +08:00
pandamicro dba5cf9960 Undo rebind removeListeners 2016-11-06 17:01:49 +08:00
pandamicro 30653200f0 Forbid adding event listener with Component 2016-11-06 16:50:57 +08:00
pandamicro 660382a7d7 Always use uuid for depend keys
f
2016-10-26 00:26:11 +08:00
pandamicro d276e8eabb Fix X5 touch issue by adding TOUCH_TIMEOUT 2016-10-24 02:42:11 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
zilongshanren 1484a038b9 add ready to play event to videoplayer 2016-10-17 12:04:35 +08:00
zilongshanren f01e116190 improve web videoplayer 2016-10-14 18:01:00 +08:00
zilongshanren d7e2e48792 tweak EditBox default input flag 2016-10-11 17:49:34 +08:00
zilongshanren ad5b21ff9b improve editbox maxLength settings 2016-10-11 14:32:01 +08:00
zhangbin 4f53640c0a Solve the error in runtime environment. 2016-10-09 16:47:09 +08:00
zilongshanren 0f69c2b882 improve docs 2016-10-09 10:19:05 +08:00
zilongshanren 005e4fcac8 add method to change tabIndex and focus 2016-10-08 18:33:32 +08:00
VisualSJ b6e8ef6236 Moving audio deprecated interface 2016-09-29 16:40:54 +08:00
VisualSJ ee41bc2a38 audio compatibility 2016-09-29 12:04:07 +08:00
knoxHuang f75058c20b add player_CCSystemEvent for fireball/issues/4237 2016-09-27 11:00:54 +08:00
zhangbin 2d2b52f3c4 Output tips when cc._RendererInSG onEnabled if the node has actions. 2016-09-23 17:15:30 +08:00
Wang Nan 71b6a59046 Merge pull request #1140 from cocos-creator/v1.2
merge V1.2
2016-09-22 14:13:42 +08:00
Nan Wang 8cab855130 add mutable-forward-iterator require to jsb predefine 2016-09-21 15:52:23 +08:00
zhangbin 899f121859 Improve the implementation of showing Object Group in TiledMap. 2016-09-13 16:12:12 +08:00
knoxHuang d013bde0fc fix FlipX and FilpY bug for #fireball/issues/4156 2016-09-13 14:19:33 +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
pandamicro 4bdf2446c9 Fix cc.log issue 2016-09-07 09:52:06 +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