pandamicro
|
b531040ac4
|
Update licenses
|
2018-03-13 15:52:14 +08:00 |
|
pandamicro
|
77febbfe3d
|
Merge branch 'master' into next
|
2018-03-13 15:07:21 +08:00 |
|
pandamicro
|
4e47017aa4
|
Merge branch 'v1.9'
|
2018-03-13 11:54:54 +08:00 |
|
Jare Guo
|
803a84ab47
|
fix cc._throw
|
2018-03-12 22:22:44 +08:00 |
|
pandamicro
|
5f09233526
|
Improve engine modules
s
|
2018-03-07 18:50:51 +08:00 |
|
pandamicro
|
283f5c17d6
|
Improve render data management by RenderComponent
|
2018-03-07 10:49:58 +08:00 |
|
pandamicro
|
8496e350e7
|
Remove content scale factor usage in tmx parser
|
2018-02-24 11:20:46 +08:00 |
|
pandamicro
|
c816354f69
|
Fix tilemap default anchor point issue
|
2018-02-24 10:52:43 +08:00 |
|
pandamicro
|
6f2f7a6cc9
|
remove sgNode usage
|
2018-02-20 00:12:41 +08:00 |
|
pandamicro
|
14dab8735f
|
Remove _CCClass and all cc._Class usage
|
2018-02-13 12:36:56 +08:00 |
|
Jare Guo
|
a6fb92ad90
|
updating license
|
2018-02-01 09:38:54 +08:00 |
|
Jare Guo
|
bd15543093
|
updating license: Chukong Aipu -> Xiamen Yaji
|
2018-01-31 17:51:49 +08:00 |
|
yinkaile
|
ba202578d6
|
fixed tiledmap
|
2018-01-29 14:51:28 +08:00 |
|
pandamicro
|
7712da14f5
|
Merge remote-tracking branch 'fireball/master' into next
|
2018-01-15 17:51:33 +08:00 |
|
shay_chen
|
b96631a482
|
Merge remote-tracking branch 'cocos-creator/master'
|
2018-01-04 15:08:57 +08:00 |
|
Jare Guo
|
957aa2a6e5
|
Merge pull request #2211 from jareguo/temp
support migration for texture array
|
2017-12-30 15:16:33 +08:00 |
|
shay_chen
|
b5c4f2fae6
|
Delete the calls for object.retain() and object.release()
|
2017-12-27 18:34:35 +08:00 |
|
Jare Guo
|
5706539bd5
|
remove cc._LogInfos, use cc._getError instead
|
2017-12-27 10:55:34 +08:00 |
|
yinkaile
|
2efc147fe2
|
Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
# cocos2d/core/CCDirectorCanvas.js
# cocos2d/core/CCDirectorWebGL.js
# cocos2d/core/base-nodes/CCSGNode.js
# cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js
# cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js
# cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js
# cocos2d/particle/CCParticleSystem.js
|
2017-12-26 16:11:50 +08:00 |
|
yinkaile
|
99cdd33327
|
fixed crashed when switch to the same scene again
|
2017-12-26 15:54:42 +08:00 |
|
Jare Guo
|
e3b7190cd6
|
support migration for texture array
|
2017-12-26 10:00:57 +08:00 |
|
pandamicro
|
a31c515557
|
Merge remote-tracking branch 'fireball/next' into next
|
2017-12-25 14:04:34 +08:00 |
|
yinkaile
|
7cfae81e51
|
support tiledmap
|
2017-12-21 11:39:19 +08:00 |
|
pandamicro
|
45e1b82103
|
Modulize cc.Codec
|
2017-12-18 16:13:43 +08:00 |
|
knoxHuang
|
2223dcd0c8
|
refine code
|
2017-12-18 11:09:48 +08:00 |
|
knoxHuang
|
cf512dd06e
|
remove error info from the engine release for fireball/issues/6721
|
2017-12-15 17:21:06 +08:00 |
|
Jare Guo
|
57d19ebe28
|
use preloaded texture asset for tiled map
|
2017-12-14 19:22:07 +08:00 |
|
Jare Guo
|
012c97152e
|
remove unused property of _ccsg.TMXTiledMap
|
2017-12-14 18:31:01 +08:00 |
|
Jare Guo
|
7834448133
|
Merge branch 'v1.7'
# Conflicts:
# cocos2d/core/load-pipeline/loader.js
|
2017-12-13 14:44:33 +08:00 |
|
Jare Guo
|
96248f80fd
|
Merge commit 'c374c97567a6e6674aca0576a76748b83caa7866' into v1.7-release
# Conflicts:
# cocos2d/core/CCGame.js
# cocos2d/core/platform/CCMacro.js
|
2017-12-13 14:34:03 +08:00 |
|
knoxHuang
|
bf6f79c175
|
fix CCTilemap bug for cocos-creator/engine/issues/2046
|
2017-12-06 17:58:03 +08:00 |
|
pandamicro
|
20564161fd
|
Merge branch 'wegame' into v1.7.1
|
2017-11-30 17:06:27 +08:00 |
|
pandamicro
|
ed145df228
|
Improve ortho tilemap culling calculation
|
2017-11-23 11:21:25 +08:00 |
|
pandamicro
|
a595b8b6db
|
half pixel correction in tilemap
|
2017-11-23 11:21:08 +08:00 |
|
pandamicro
|
c8188b5211
|
Merge remote-tracking branch 'origin/v1.7' into next
|
2017-11-22 13:58:23 +08:00 |
|
Jare Guo
|
1f94081e95
|
sync branch
|
2017-11-21 20:36:39 +08:00 |
|
Jare Guo
|
dbfd31631f
|
Merge pull request #2125 from cocos-creator/v1.7-release
sync branches
|
2017-11-21 20:26:35 +08:00 |
|
knoxHuang
|
0ced01fd8e
|
refine code
|
2017-11-17 11:32:14 +08:00 |
|
knoxHuang
|
afd8d2ce7c
|
fix tilemap layer is empty error
|
2017-11-16 16:26:45 +08:00 |
|
pandamicro
|
b01176e4f0
|
Fix texture options can not be updated issue
|
2017-11-10 12:41:17 +08:00 |
|
pandamicro
|
ea9665bad7
|
Remove queryAllSelector dependencies
|
2017-11-07 16:20:19 +08:00 |
|
pandamicro
|
9626c28485
|
Improve TMXXMLParser error log
|
2017-11-07 15:18:23 +08:00 |
|
pandamicro
|
8cc054c833
|
Fix super calls to old sg components
|
2017-10-26 11:09:58 +02:00 |
|
Jare Guo
|
29ec80449c
|
fix TiledMap break
|
2017-10-11 21:48:36 -05:00 |
|
Jare Guo
|
a815a844f9
|
Merge master
# Conflicts:
# cocos2d/core/textures/CCTexture2D.js
# cocos2d/core/textures/CCTextureCache.js
|
2017-10-07 18:46:57 +08:00 |
|
Jare Guo
|
e0a92f093b
|
Merge pull request #2023 from cocos-creator/master
Sync master
|
2017-10-07 05:40:36 -05:00 |
|
Jare Guo
|
a1c535c6bb
|
update texture in property
|
2017-10-07 16:18:51 +08:00 |
|
pandamicro
|
48faf3ca49
|
Removed SGComponent, ComponentInSG, ComponentUnderSG
|
2017-10-06 17:54:34 +08:00 |
|
pandamicro
|
1abfab8621
|
Refactor textureCache to textureUtil, only cache texture to loader
|
2017-10-06 17:53:07 +08:00 |
|
Jare Guo
|
5c443fecd2
|
remove comments
|
2017-10-01 12:55:09 +08:00 |
|