pandamicro
|
eacdfbc344
|
Merge pull request #451 from pandamicro/master
Fix EVENT_AFTER_SCENE_LAUNCH not fired isse
|
2016-03-09 17:10:14 +08:00 |
|
pandamicro
|
eba3b4a77c
|
Fix EVENT_AFTER_SCENE_LAUNCH not fired isse
|
2016-03-09 17:06:54 +08:00 |
|
Wang Nan
|
afb7bf4b8f
|
Merge pull request #449 from zilongshanren/fix-bmfont-error-before-3.10
fix jsb bmfont error
|
2016-03-09 14:44:09 +08:00 |
|
zilongshanren
|
3ee39c07d0
|
fix jsb bmfont error
|
2016-03-09 13:45:22 +08:00 |
|
pandamicro
|
f6acca0a77
|
Merge pull request #448 from pandamicro/master
解决 JSB 中场景切换延迟导致的问题
|
2016-03-09 13:34:32 +08:00 |
|
pandamicro
|
3b0d6f9c35
|
Added cc.director.runSceneImmediate API
|
2016-03-09 12:13:57 +08:00 |
|
pandamicro
|
02debeeac2
|
Delay replace/run scene in JSB to avoid issues
|
2016-03-09 12:13:57 +08:00 |
|
pandamicro
|
bf18d343ce
|
Fix recursive invoke will cause callbacksInvoker's remove list be overwrote
|
2016-03-09 12:13:57 +08:00 |
|
Jare Guo
|
a0d787d84a
|
Merge pull request #440 from jareguo/resources
support to load resources dynamically
|
2016-03-09 10:43:19 +08:00 |
|
Jare Guo
|
6b98138063
|
working on using resources:// instead of cc.url.raw in JSB
|
2016-03-09 09:58:10 +08:00 |
|
Jare Guo
|
b67f7384f9
|
support to use resources:// instead of cc.url.raw
|
2016-03-09 09:58:10 +08:00 |
|
Jare Guo
|
d564b77ba3
|
update PR
|
2016-03-09 09:58:10 +08:00 |
|
Jare Guo
|
be9719414e
|
support sprite frame
|
2016-03-09 09:58:10 +08:00 |
|
Jare Guo
|
8902bce59b
|
support to load resources dynamically
|
2016-03-09 09:58:10 +08:00 |
|
Nan Wang
|
2f2535fe35
|
move mask to renderers component menu.
|
2016-03-08 23:08:19 +08:00 |
|
Jare Guo
|
b2d26ed069
|
Merge pull request #447 from zilongshanren/refactor-layout-api
finish rename Layout APIs
|
2016-03-08 15:24:01 +08:00 |
|
zilongshanren
|
ffed75d204
|
finish rename Layout APIs
|
2016-03-08 15:18:54 +08:00 |
|
pandamicro
|
085cd79327
|
Merge pull request #446 from pandamicro/master
Fix cc.loader callback can't acquire result issue
|
2016-03-08 14:35:26 +08:00 |
|
pandamicro
|
551f3718e6
|
Fix cc.loader callback can't acquire result issue
|
2016-03-08 14:31:13 +08:00 |
|
Jare Guo
|
6549b3cdbe
|
Merge pull request #445 from 2youyouo2/master
fixed addClip
|
2016-03-07 18:57:29 +08:00 |
|
2youyouo2
|
b4eb0218e7
|
fixed addClip
|
2016-03-07 18:46:45 +08:00 |
|
Jare Guo
|
a95936de0c
|
Merge pull request #444 from pandamicro/master
Avoid releasing zalgo in cc.loader
|
2016-03-07 18:41:32 +08:00 |
|
pandamicro
|
01cdddb2a2
|
Avoid releasing zalgo in cc.loader
|
2016-03-07 18:38:02 +08:00 |
|
Jare Guo
|
635d9a9b08
|
Merge pull request #443 from jareguo/master
CCClass: export getDefault in edit mode
|
2016-03-07 14:31:27 +08:00 |
|
Jare Guo
|
24e9937fc7
|
CCClass: export getDefault in edit mode
|
2016-03-07 14:12:48 +08:00 |
|
pandamicro
|
cbb0bc893f
|
Merge pull request #442 from pandamicro/master
Improve debug message display
|
2016-03-07 00:50:44 +08:00 |
|
pandamicro
|
97e9cb58b4
|
Improve debug message display
|
2016-03-07 00:49:41 +08:00 |
|
pandamicro
|
9ade7c4f7f
|
Merge pull request #441 from pandamicro/master
添加 Loading 事件支持
|
2016-03-06 23:10:29 +08:00 |
|
pandamicro
|
3fd1a3b749
|
Add before loading event
|
2016-03-06 22:39:34 +08:00 |
|
pandamicro
|
739fba72a1
|
Fix Director event docs
|
2016-03-05 17:31:35 +08:00 |
|
Jare Guo
|
8dce9ed7f0
|
Merge pull request #439 from zilongshanren/support-label-drag-and-drop
fix bmfont color change issue
|
2016-03-04 23:22:09 +08:00 |
|
zilongshanren
|
ca4380b123
|
fix bmfont color change issue
|
2016-03-04 18:16:24 +08:00 |
|
Jare Guo
|
b729884dca
|
Merge pull request #438 from dabingnn/fix_blendfunc_issue_3.3
fix blend func for 3.3 when blend func is not present in JSB
|
2016-03-04 16:31:16 +08:00 |
|
Huabing.Xu
|
df2a5a374e
|
fix blend func for 3.3 when blend func is not present in JSB
|
2016-03-04 16:26:04 +08:00 |
|
Jare Guo
|
9c70825dfc
|
Merge pull request #436 from zilongshanren/fixRange
fix ui range value
|
2016-03-04 11:34:52 +08:00 |
|
zilongshanren
|
89b36a38ce
|
fix ui range value
|
2016-03-04 11:32:29 +08:00 |
|
Jare Guo
|
f17e92ce0a
|
Merge pull request #434 from zilongshanren/fix-editbox-issue
fix editbox capInsets error when bg is empty
|
2016-03-04 10:29:09 +08:00 |
|
Jare Guo
|
dd3881bb2b
|
Merge pull request #435 from knoxHuang/master
add CCSprite isTrimmedMode displayName = "TrimmedMode"
|
2016-03-04 09:45:24 +08:00 |
|
pandamicro
|
182d19b14b
|
Merge pull request #437 from pandamicro/master
Refactor LoadingItem.src to id and url
|
2016-03-04 00:56:36 +08:00 |
|
pandamicro
|
17aa75520d
|
Refactor LoadingItem.src to id and url
|
2016-03-04 00:55:35 +08:00 |
|
knoxHuang
|
3904fb05a9
|
add CCSprite isTrimmedMode displayName = "TrimmedMode"
|
2016-03-03 16:31:52 +08:00 |
|
zilongshanren
|
3ed9e76cb7
|
fix editbox capInsets error when bg is empty
|
2016-03-03 16:00:14 +08:00 |
|
Jare Guo
|
b52852ac05
|
Merge pull request #431 from zilongshanren/fix-button-issues
Fix button issues
|
2016-03-03 15:02:44 +08:00 |
|
Jare Guo
|
f833c54e43
|
Merge pull request #433 from jareguo/master
add inspector for MissingScript
|
2016-03-03 13:45:09 +08:00 |
|
Jare Guo
|
81591b76ab
|
add inspector for MissingScript
|
2016-03-03 13:42:55 +08:00 |
|
pandamicro
|
329728dbc4
|
Merge pull request #432 from pandamicro/master
[JSB] Fix loadImg usage in cc.textureCache
|
2016-03-03 12:06:24 +08:00 |
|
pandamicro
|
068bfa76fa
|
[JSB] Fix loadImg usage in cc.textureCache
|
2016-03-03 12:04:52 +08:00 |
|
pandamicro
|
941fcbeca1
|
Merge pull request #430 from pandamicro/master
Avoid deserialize error cause Scene to be erased
|
2016-03-03 11:49:32 +08:00 |
|
pandamicro
|
3564ff1ed9
|
Avoid deserialize error cause Scene to be erased
|
2016-03-03 11:40:05 +08:00 |
|
zilongshanren
|
46fd75348c
|
clear all the flag when Button is onDisable
|
2016-03-03 11:17:58 +08:00 |
|