Jare Guo
|
1f0b5503f0
|
Merge commit 'aaa2ac73b9dc0b05bf3d1b05342d10676e0ad432' into temp2
# Conflicts:
# cocos2d/core/platform/CCClass.js
# cocos2d/core/platform/CCView.js
# cocos2d/core/platform/_CCClass.js
# jsb/jsb-director.js
|
2017-03-02 14:30:09 +08:00 |
|
pandamicro
|
a9ab402766
|
Merge part of cocos/scripting/js-bindings/scripts to engine/jsb
|
2017-02-24 17:41:57 +08:00 |
|
Jare Guo
|
8da330d3a7
|
Scene now inherit from Node so some Node verification should be refactored
|
2017-01-12 14:47:51 +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 |
|
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
|
54e07aa6ac
|
Fix cc.log issue in JSB
|
2016-09-05 17:50:40 +08:00 |
|
Jare Guo
|
572b9a7bea
|
fix scene list
|
2016-08-22 16:42:47 +08:00 |
|
pandamicro
|
3dfc574f4d
|
Fix game EVENT_HIDE&SHOW not working in JSB
|
2016-08-01 16:20:39 +08:00 |
|
Jare Guo
|
138e87bda7
|
fix addPersistRootNode on JSB
|
2016-07-01 15:43:33 +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 |
|
Nan Wang
|
3f8b93619f
|
add group and collide map to cc.game
|
2016-05-06 15:52:59 +08:00 |
|
Jare Guo
|
0675a9fc8e
|
add inited event for Game
|
2016-04-25 13:55:49 +08:00 |
|
2youyouo2
|
0d86512393
|
fixed jsb on 3.9
|
2016-04-15 10:21:20 +08:00 |
|
pandamicro
|
fc172e086a
|
Replace instead of reattach when scene contains the persist node
|
2016-03-17 10:53:29 +08:00 |
|
pandamicro
|
3d14f13d1e
|
Use id to identify persist root node
|
2016-03-16 22:07:40 +08:00 |
|
Nan Wang
|
3a70ae6060
|
update license file and source code header.
|
2016-03-01 11:04:12 +08:00 |
|
2youyouo2
|
0be3a9b6a9
|
fixed read config
|
2016-02-27 15:00:56 +08:00 |
|
pandamicro
|
0ea99226cc
|
Replace cc.loader with pipeline loader
|
2016-02-25 10:34:09 +08:00 |
|
pandamicro
|
d79cd80b94
|
Fix JSB bugs
|
2016-02-18 23:19:00 +08:00 |
|
pandamicro
|
692cc79500
|
Separate JSB polyfills into different modules
|
2016-01-05 18:11:51 +08:00 |
|