Wang Nan
|
20874ca2e4
|
Merge pull request #702 from VisualSJ/master_2535_2
remove useSystemFont from CCGLabel
|
2016-05-20 16:40:55 +08:00 |
|
Wang Nan
|
7c58d0d9ed
|
Merge pull request #697 from dabingnn/label_outline_native
add wrapper for native outline api
|
2016-05-20 15:34:34 +08:00 |
|
ViusualSJ
|
306a61707a
|
remove useSystemFont from CCGLabel
|
2016-05-20 15:28:51 +08:00 |
|
pandamicro
|
e86e846a74
|
Support auto rotate canvas when screen orientation isn't correct
|
2016-05-20 10:58:52 +08:00 |
|
Huabing.Xu
|
2f522f0ba4
|
add wrapper for native outline api
|
2016-05-19 14:52:42 +08:00 |
|
Jare Guo
|
880f0e28ca
|
add preloadScene
|
2016-05-13 17:37:16 +08:00 |
|
Wang Nan
|
5d9ce5d57e
|
Merge pull request #669 from cocos-creator/v1.0
merge V1.0
|
2016-05-13 13:45:01 +08:00 |
|
Jare Guo
|
10a71746e1
|
fix jsb tex-sprite-frame polyfill
|
2016-05-12 13:58:15 +08:00 |
|
Wang Nan
|
53dde5d944
|
Merge pull request #655 from cocos-creator/v1.0
merge V1.0
|
2016-05-11 17:38:11 +08:00 |
|
Nan Wang
|
3e396e3080
|
merged v1.0
|
2016-05-11 17:29:17 +08:00 |
|
Jare Guo
|
93c0a98631
|
fix asset initialization in jsb
|
2016-05-11 17:22:02 +08:00 |
|
Wang Nan
|
aeb5b65c38
|
Merge pull request #651 from 2youyouo2/collider
Collider
|
2016-05-11 14:05:18 +08:00 |
|
2youyouo2
|
a26c56891d
|
refine collider
|
2016-05-11 10:47:19 +08:00 |
|
2youyouo2
|
9fac8dc3df
|
refine code
|
2016-05-10 15:18:15 +08:00 |
|
2youyouo2
|
168cbb0504
|
refine code
|
2016-05-10 11:53:38 +08:00 |
|
2youyouo2
|
0b843d5f99
|
fixed jsb image
|
2016-05-09 14:20:19 +08:00 |
|
knoxHuang
|
99972b8380
|
transplant MotionStreak
|
2016-05-06 18:48:33 +08:00 |
|
Nan Wang
|
3f8b93619f
|
add group and collide map to cc.game
|
2016-05-06 15:52:59 +08:00 |
|
2youyouo2
|
8361570a29
|
refine collider
|
2016-04-29 11:28:03 +08:00 |
|
Jare Guo
|
7d62a07905
|
should not remove sp.ANIMATION_EVENT_TYPE
still used in jsb_spine.js
|
2016-04-28 23:24:54 +08:00 |
|
2youyouo2
|
7ce6b87403
|
add collider manager
|
2016-04-27 17:21:45 +08:00 |
|
Jare Guo
|
3f1b682d19
|
Merge commit '0d438a748a5aae594e29344fffe4ea040e235c81'
# Conflicts:
# cocos2d/core/components/CCRendererInSG.js
# cocos2d/core/load-pipeline/asset-table.js
# cocos2d/tilemap/CCTiledMap.js
# jsb/jsb-editbox.js
|
2016-04-27 10:01:06 +08:00 |
|
pandamicro
|
0d438a748a
|
Merge pull request #628 from jareguo/v1.0
hide pushScene in doc
|
2016-04-26 14:41:10 +08:00 |
|
knoxHuang
|
20b1f00710
|
fix spriteFrame.insetTop undefined error
|
2016-04-26 13:57:00 +08:00 |
|
zilongshanren
|
e5fe29878b
|
fix editbox begin and end callback not called.
|
2016-04-25 17:57:55 +08:00 |
|
Jare Guo
|
c7e4a2bd9b
|
scene loading flag should reset before callback
|
2016-04-25 17:54:46 +08:00 |
|
knoxHuang
|
02d5cbec01
|
Synchronization spriteFrame web and jsb code
|
2016-04-25 16:21:42 +08:00 |
|
Jare Guo
|
4b45975ed8
|
minor update
|
2016-04-25 14:34:07 +08:00 |
|
Jare Guo
|
0675a9fc8e
|
add inited event for Game
|
2016-04-25 13:55:49 +08:00 |
|
knoxHuang
|
481e5c3c60
|
fix atlases sprite display bug
|
2016-04-25 13:51:10 +08:00 |
|
2youyouo2
|
ebc999da13
|
load version polyfills first
|
2016-04-18 10:11:17 +08:00 |
|
2youyouo2
|
0d86512393
|
fixed jsb on 3.9
|
2016-04-15 10:21:20 +08:00 |
|
knoxHuang
|
c29f8b6b8e
|
Repair sprite-frame can not be displayed
|
2016-04-14 09:46:37 +08:00 |
|
zilongshanren
|
897806994f
|
fix jsb editbox missing API issue (#583)
|
2016-04-11 17:44:26 +08:00 |
|
Jare Guo
|
79f4667636
|
formatStr should support type number as first argument
|
2016-04-08 14:58:46 +08:00 |
|
pandamicro
|
cf77995a94
|
Fix socket io variable name conflict in JSB
|
2016-03-25 20:49:10 +08:00 |
|
zilongshanren
|
83c30ea536
|
fix editbox maxLength
|
2016-03-24 18:01:41 +08:00 |
|
Jare Guo
|
51c5e1a2ba
|
add cc.loader.loadRes, remove "resources://" protocol
|
2016-03-22 15:40:50 +08:00 |
|
pandamicro
|
6c0626f4e5
|
Merge pull request #515 from pandamicro/v1.0
Fix Rect width exceeds maximum margin issue in JSB
|
2016-03-22 00:14:54 +08:00 |
|
pandamicro
|
5934f04fbd
|
Fix Rect width exceeds maximum margin issue in JSB
|
2016-03-22 00:07:48 +08:00 |
|
Jare Guo
|
d41b71dcf1
|
Merge pull request #514 from zilongshanren/add-label-unit-tests
fix bmfont set file crash
|
2016-03-21 22:02:16 +08:00 |
|
zilongshanren
|
4c904649d0
|
fix bmfont set file crash
|
2016-03-21 21:50:37 +08:00 |
|
pandamicro
|
8336701b0e
|
Fix issue caused by pauseTarget fix
|
2016-03-21 18:13:31 +08:00 |
|
pandamicro
|
e670400a42
|
[JSB] Fix a small issue in pauseTarget
|
2016-03-21 17:39:52 +08:00 |
|
pandamicro
|
8beba0ea48
|
Fix clearInterval not working issue
|
2016-03-21 17:07:43 +08:00 |
|
pandamicro
|
4f880c39b6
|
[JSB] Fix pauseTarget before node onEnter not working issue
|
2016-03-21 16:48:51 +08:00 |
|
pandamicro
|
755f89dc3b
|
Fix audio loading in JSB
|
2016-03-21 12:44:25 +08:00 |
|
Jare Guo
|
da8f896a19
|
update jsb-director
|
2016-03-19 13:52:39 +08:00 |
|
pandamicro
|
34956900b1
|
Fix sprite frame can't be inited with a single texture in JSB
|
2016-03-19 00:38:32 +08:00 |
|
pandamicro
|
e550592f1b
|
Merge pull request #497 from pandamicro/v1.0
Fix EaseAction issue in JSB
|
2016-03-18 12:00:41 +08:00 |
|