pandamicro
6101d772a2
Merge remote-tracking branch 'origin/3d-v1.2' into 3d
...
# Conflicts:
# EngineErrorMap.md
# cocos/core/3d/builtin/effects.ts
# cocos/core/data/decorators/property.ts
# cocos/core/pipeline/forward/forward-pipeline.ts
# cocos/core/pipeline/forward/scene-culling.ts
# cocos/core/renderer/scene/model.ts
# cocos/core/renderer/scene/shadows.ts
# cocos/core/renderer/ui/mesh-buffer.ts
# cocos/core/renderer/ui/ui-vertex-format.ts
# cocos/core/scene-graph/scene-globals.ts
# cocos/terrain/terrain.ts
# cocos/ui/assembler/graphics/webgl/graphics-assembler.ts
# cocos/ui/components/graphics.ts
# editor/assets/default_prefab/3d/Capsule.prefab.meta
# editor/assets/default_prefab/3d/Cone.prefab.meta
# editor/assets/default_prefab/3d/Cube.prefab.meta
# editor/assets/default_prefab/3d/Cylinder.prefab.meta
# editor/assets/default_prefab/3d/Plane.prefab.meta
# editor/assets/default_prefab/3d/Quad.prefab.meta
# editor/assets/default_prefab/3d/Sphere.prefab.meta
# editor/assets/default_prefab/3d/Torus.prefab.meta
# editor/assets/default_prefab/Camera.prefab.meta
# editor/assets/default_prefab/Terrain.prefab.meta
# editor/assets/default_prefab/effects/Particle System.prefab.meta
# editor/assets/default_prefab/light/Directional Light.prefab.meta
# editor/assets/default_prefab/light/Sphere Light.prefab.meta
# editor/assets/default_prefab/light/Spot Light.prefab.meta
# editor/assets/default_prefab/ui/Button.prefab.meta
# editor/assets/default_prefab/ui/Canvas.prefab.meta
# editor/assets/default_prefab/ui/EditBox.prefab.meta
# editor/assets/default_prefab/ui/Label.prefab.meta
# editor/assets/default_prefab/ui/Layout.prefab.meta
# editor/assets/default_prefab/ui/Mask.prefab.meta
# editor/assets/default_prefab/ui/ProgressBar.prefab.meta
# editor/assets/default_prefab/ui/ScrollView.prefab.meta
# editor/assets/default_prefab/ui/Slider.prefab.meta
# editor/assets/default_prefab/ui/Sprite.prefab.meta
# editor/assets/default_prefab/ui/Toggle.prefab.meta
# editor/assets/default_prefab/ui/ToggleContainer.prefab.meta
# editor/assets/default_prefab/ui/Widget.prefab.meta
2020-10-21 18:35:11 +08:00
Knox
7b5132a6fd
support for adding widgets to the canvas ( #7547 )
...
* support for adding widgets to the canvas
* refine code
* refine code
* refine code
* refine code
* refine code
* refine code
2020-10-21 16:36:51 +08:00
Leslie Leigh (李的序)
114746ec50
Remove es5 cc class ( #7504 )
...
* Remove empty comments
* Remove CCClass() style class declaration
* Optimize
2020-10-19 11:51:37 +08:00
Jare Guo
2cdc3d1b8b
Refine EngineErrorMap and sync 2D changes ( #7542 )
...
* refine Color.toCSS/toHex (sync #6216 #6207 )
* refine component.resetInEditor (sync #6244 )
* Revert "Improve error maps (#5527 )"
This reverts commit 224cea23ab#7103 )"
This reverts commit 3240dba206#6271 )
2020-10-16 10:55:32 +08:00
Jare Guo
a0a992de5d
remove asserts from addChild & sync 2D changes ( #7479 )
...
* remove asserts from addChild
* expose js._registeredClassIds & js._registeredClassNames (sync #3174 )
To unload scripts dynamically.
Also revert part of changes from https://github.com/cocos-creator/engine/pull/3204/files#diff-cabe5229c3c6e31339220008e54fe853L421
* remove unused code (sync #3174 )
* minor tweak (sync #3421 )
* should not invoke component if destroy() called before node activating (sync #3430 )
* node should removed and destroyed with scene (sync #3456 #3483 )
* fix WebGL detection on Android browsers (sync #3510 )
* remove redundant right shift for bitwise operation (sync #3754 )
* fix label blur when using dark font color (sync #3949 )
* refine tooltip of Block Input Event (sync #4053 )
* fix IE/Edge exception when output log/warn before engine initialization(sync #4447 , #4500 )
* sync class, attribute (#4689 , #4712 , #4781 , #4712 )
* fix loading unknown texture format (sync #4820 )
* prefer toLowerCase to toLocaleLowerCase + sync #5114
* optimize bezier calculation (sync #5155 )
* fix potential memory leak in scene-editor (sync #5643 )
* fix _posDirty error of Mask on native platform (sync #6168 )
2020-10-15 17:28:14 +08:00
Jare Guo
0b1fa249da
bug fixes and sync remain codes
...
fuck
2020-09-28 16:37:24 +08:00
Jare Guo
1f5c1bb0c9
embed -dynamic interface into -compiled to support ts declare and use an unify Details class
2020-09-27 19:25:00 +08:00
minggo
6e71962fb9
merge v1.2
2020-09-10 11:41:20 +08:00
Leslie Leigh (李的序)
a333b0b564
Handle WebGL context lost event ( #7291 )
...
* Handle WebGL context lost event
* Fix
2020-09-08 14:08:20 +08:00
pandamicro
1d2a82d957
Merge branch '3d-v1.2' into merge1.2
...
# Conflicts:
# cocos/core/3d/framework/mesh-renderer.ts
# cocos/core/components/ui-base/ui-renderable.ts
# cocos/core/pipeline/forward/forward-pipeline.ts
# cocos/core/pipeline/forward/scene-culling.ts
# cocos/core/pipeline/render-additive-light-queue.ts
# cocos/core/pipeline/render-stage.ts
# cocos/core/pipeline/shadow/shadow-flow.ts
# cocos/core/renderer/core/memory-pools.ts
# cocos/core/renderer/scene/camera.ts
# cocos/core/renderer/scene/model.ts
# cocos/core/renderer/scene/render-scene.ts
# cocos/core/root.ts
# cocos/particle/billboard.ts
# cocos/terrain/terrain.ts
# cocos/ui/components/button.ts
# package-lock.json
# package.json
# tests/general/sealed-global-variables.json
2020-09-02 18:39:09 +08:00
Knox
3d9cd319ee
add video player component ( #7226 )
...
* add video player component
* refine code
* refine code
* refine code
* refine code
* refine code
* refine code
* refine code
2020-09-02 15:42:33 +08:00
pandamicro
3240dba206
Component rename for new standard and 2d compatibility ( #7103 )
...
* Rename ui related components
* Rename files
* Remove Useless errors
* Fix sealed names
* Fix sealed global variables
* Fix circular reference
* Refactor more component names
* Rename particle and animation related component
* export scene and models sub module in renderer
* Rename ModelComponents to Model
* Refactor LightComponents to Light
* Refactor CameraComponent to Camera
* Refactor ConstraintComponents to Constraint and rename physics comps
* Cleanup and fix issues
* Small fixes
* Refactor Model to MeshRenderer
* Final touch
* Fix data class export
* Better deprecation to cover all old usage
* Simpler and better deprecation with js.setClassAlias
* Fix ci
* Fix editor issue
2020-09-02 15:31:49 +08:00
Leslie Leigh (李的序)
bc5b531191
Add decorator @editable @serializable ( #7178 )
2020-09-02 11:44:12 +08:00
Knox
b8d0026694
sync #3d-tasks/issues/3962 ( #7232 )
...
* sync #3d-tasks/issues/3962
https://github.com/cocos-creator/engine/pull/5598
https://github.com/cocos-creator/engine/pull/6575
https://github.com/cocos-creator/engine/pull/6333
https://github.com/cocos-creator/engine/pull/4003
https://github.com/cocos-creator/engine/pull/4240
https://github.com/cocos-creator/engine/pull/5444
https://github.com/cocos-creator/engine/pull/5178
https://github.com/cocos-creator/engine/pull/5656
https://github.com/cocos-creator/engine/pull/5672
https://github.com/cocos-creator/engine/pull/3515
https://github.com/cocos-creator/engine/pull/3617
https://github.com/cocos-creator/engine/pull/3802
https://github.com/cocos-creator/engine/pull/4152
* refine code
2020-08-27 19:51:43 +08:00
PP
f9a6fd59b2
error when design resolution is invalid ( #7063 )
2020-08-03 19:17:53 +08:00
pandamicro
dbf4519339
Properly deprecate UI related API in Node ( #6754 )
...
* Properly deprecate UI related API in Node
* UI transform property access fix
* UI transform property access fix for widget
2020-06-23 11:44:43 +08:00
Yun Hsiao Wu
69db70a910
Merge remote-tracking branch 'origin/3d' into 3d
2020-06-03 16:22:00 +08:00
Leslie Leigh (李的序)
db885e32d1
Warn if morph target count is overflow ( #6622 )
2020-04-28 14:48:01 +08:00
pandamicro
c47e1a1d1b
Merge branch '3d' into 3d-gfx
...
# Conflicts:
# cocos/core/game.ts
# cocos/core/pipeline/batched-buffer.ts
# cocos/core/platform/view.ts
# gulpfile.js
2020-03-26 11:06:40 +08:00
jiaxin.lai
aa0eb1bdaf
cylinder collider ( #6416 )
...
* stash
* stash
* stash
* stash
* fix z direction
* impl cannon cylinder
* stash
* stash
* stash
* fix memory leak
* update @cocos/ammo
* add error map
* update package-lock
* tweaks
2020-03-25 18:35:27 +08:00
Leslie Leigh (李的序)
ebf45b15ae
Bump eslint; Optimize an error string; Add assert functions ( #6398 )
...
* Bump eslint; Optimize an error string; Add assert functions
* Add comment
* Add license
2020-03-23 19:08:16 +08:00
ChiaNing
644218fd09
Sprite Frame change ( #6336 )
...
* sprite-frame change
* spriteframe update
* set texture fix
* can render fix
* spriteframe textureLoaded fix
* update
* update
* texture loaded update
* refresh texture add
* format fix
2020-03-20 19:37:50 +08:00
jiaxin.lai
a4af34630f
integrate trimesh shape of ammo & cannon ( #6232 )
...
* stash
* cannon impl
* ammo mesh collider
* finish ammo mesh collider
* cannon trimesh shape
* tweaks
* tweaks
* tweaks
* update @cocos/ammo & @cocos/cannon
* fix ci
* naming norm
* use config object
* renaming
* naming norm
* naming norm
* tweaks
* stash
* stash
* stash
* add error map
* export impl
* update package-lock
* export impl of world
* tweaks
2020-03-15 19:41:16 +08:00
pandamicro
3329c133b8
Native GFX engine adaptation ( #6267 )
...
* Remove profiler in jsb
* GFX JSB initialization
* Report error when root initialization failed
* Fix define inconsistance with native
2020-03-06 23:15:46 +08:00
Leslie Leigh (李的序)
c394f27923
Fix compatibility with old-school cc.Class() ( #5936 )
2019-12-20 15:01:59 +08:00
Yun Hsiao Wu
10c49e68f6
[chore] misc opts ( #5898 )
...
* pipeline linter fix
* instance support
* reuse render obejcts
* fix ci
* fix model ID
2019-12-18 14:35:34 +08:00
Lelie Leight (李的序)
ce99665e6e
Convert vertex index to short if platform does not support int ( #5837 )
...
* Convert vertex index to short if platform does not support int
* Circular reference
2019-12-04 17:21:13 +08:00
JoneLau
b92d852e73
fix buffer overflow in ui static component ( #5775 )
2019-11-29 13:46:47 +08:00
JoneLau
e4f0efd2cc
remove uicomponent's priority to uitransform and canvas sort in event ( #5762 )
2019-11-26 10:02:01 +08:00
Lelie Leight (李的序)
d446a357ce
Warn on explicit undefined type ( #5770 )
2019-11-23 18:17:45 +08:00
Lelie Leight (李的序)
ef1b6582ef
standalone decorators ( #5640 )
2019-10-30 17:41:30 +08:00
pandamicro
0e9567b5e3
Forbidden adding component to scene ( #5622 )
...
* Fix typo in event listener
* Fix Scheduler.schedule parameter issue
* Move event processing from Node to BaseNode
* Scene inherit from BaseNode instead of Node
* Forbidden adding component to scene
2019-10-25 19:02:42 +08:00
Lelie Leight (李的序)
1e62004e12
add extendsEnum() to support extending of enumerations ( #5454 )
...
typo
update
update
Update button-component.ts
Update toggle-component.ts
Update toggle-component.ts
Update toggle-component.ts
Update button-component.ts
Update toggle-component.ts
Update button-component.ts
2019-10-17 09:57:17 +08:00
pandamicro
224cea23ab
Improve error maps ( #5527 )
...
# Conflicts:
# cocos/core/platform/debug.ts
2019-10-12 14:29:48 +08:00
Santy-Wang
d9c903de5b
adjust warning information about load resouces
2019-09-26 14:18:05 +08:00
Yun Hsiao Wu
a7fa5916f9
effect: indirect property ( #5449 )
...
* better texture size check
* effect: indirect property
* change to error ID
2019-09-24 11:22:24 +08:00
ChiaNing
3af7e4d9ce
fix widget target haven't UITransformComponent error ( #5427 )
2019-09-19 19:35:52 +08:00
Lelie Leight (李的序)
fb77e09720
export what should be exported ( #5346 )
...
* export what should be exported
* fix
* fix
2019-09-06 15:13:45 +08:00
pandamicro
9f89b0ef24
New module division ( #5285 )
...
* Temp
* temp
* move ui core
* Arrange ui and terrain
* Fix import path for all modules except core
* Move primitives into core
* Fix debug.getError
* Move audio-downloader to audio module
* export game from game.ts
* Migrate load-pipeline to ts
* Fix core modules and cleanup
* Move animation into core
* Fix module exports
* Fix director issue
* Remove most cc.director usage
* Fix ts issues
* Fix issues for unit test and editor running
* Revert removing deprecated import
* tweaks
* tweaks
* Fix ci
* Fix ci
* Add modules in module division
* Upgrade coordinates-converts-utils
2019-08-30 11:35:22 +08:00
pandamicro
8367e8b036
Fix EventManager listener order issue ( #5127 )
...
* Remove useless base node apis to reduce properties
* Add BaseNode _siblingIndex to avoid indexOf check
* Fix EventManager listener order issue
* Fix ci
* Fix node removal issue
* Fix siblingIndex for deserialized node
2019-08-09 16:58:45 +08:00
Leslie Leigh
4b802a9273
sync ccclass from creator v2.2.0 ( #4719 )
...
* sync ccclass from creator v2.2.0
* ccclass fixes
2019-07-01 14:54:15 +08:00
Yun Hsiao Wu
af2789ffd9
pass
2019-01-02 18:19:17 +08:00
Yun Hsiao Wu
367ae4ad3c
render to texture ( #3662 )
2018-12-21 14:16:24 +08:00
Leslie Leigh
4da594d906
impl texture2d using imageasset ( #3488 )
...
* impl texture2d using imageasset
* texture-cube
* fix issue comment
* remove initWithElement and initWithData; fix issue comment
* define TextureUpdateOpts in gfx/texture-2d.js
* optimize some `new ImageAsset`; optimize image-asset; add updateMipmaps() to Texture2D
* use onLoaded, remove hack
2018-11-14 22:29:37 +08:00
pandamicro
e77527763f
Support loading ttf with loader, adapt Label & RichText ( #3170 )
...
* Make ttf font occupied by loader
* Remove font downloader
* Add font loader
* Support loading ttf with loader, adapt Label & RichText
* Fix log functions before resetDebugSetting
* fix loader unit test
* Fix load font with md5 cache
* Fix Label & RichText lazy loading
2018-08-31 13:29:40 +08:00
Jare Guo
07ec50ebab
Merge pull request #3161 from cocos-creator/v1.10-release
...
sync branch
2018-08-29 19:56:18 +08:00
ColinCollins
bd6cceaf6b
remove the emoji ( #3148 )
2018-08-28 10:18:04 +08:00
pandamicro
1ec38cc239
Fix beta user reported issues ( #3004 )
...
* Fix doc, error & cleanup code
* Fix render component nested in mask issue
* Fix multiple spine textures rendering issue
* Box2d stability
* Upgrade renderer.js to 1.8.6
* Avoid particle default values override custom issue
* Fix ParticleSystem restore issue in editor
* Fix enumerate scene.active issue
* Fix error map with new ids
2018-07-23 17:25:54 +08:00
pandamicro
efaf0c5d4d
Merge remote-tracking branch 'fireball/master' into next
2018-05-24 19:04:55 +08:00
pandamicro
45cf7dc1e1
Fix issues of animation state and private node ( #2717 )
...
* Fix private node position update issue
* Fix animation state event API issues
* Remove useless constant
* Improve PrivateNode doc and fix its zIndex
2018-05-23 09:56:36 +08:00
