Commit Graph

380 Commits

Author SHA1 Message Date
pandamicro b162e21a93 Update license and API language declaration (#7750)
* Update licenses

* Update license for audio

* Update license for core/3d

* Update license for animation, assets, asset-manager, components, data

* update license for event, geometry, gfx

* update license for core modules

math, memop, pipeline, platform, primitive, renderer, scene-graph, utils, value-types

* Update license for core

* Update license for particle and particle-2d

* Update license for particle part2

* Update license for physics and physics-2d

* Update license for all modules in cocos

* Update license for exports

* Fix API doc language declaration
2020-11-10 17:36:31 +08:00
yufang.wu 623ef85041 Sync the PR of 2D. (#7730)
* Sync the pr #7262 and #7315 of 2D.

* Commit changes
2020-11-08 22:43:51 +08:00
zhefeng.zhang 153b7d0876 sync 2d pr 7211 (#7715) 2020-11-07 11:35:38 +08:00
Jare Guo a0d5508779 simplify attribute implements (sync #5040) (#7679) 2020-11-05 17:37:56 +08:00
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
Jare Guo 0319477911 fix decorator warning of ValueTypes (#7553)
* fix decorator warning of ValueTypes (sync #6285)

* refresh copyright
2020-10-21 16:31:41 +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
ChiaNing 15a1806d18 API doc format change (#7456) 2020-09-28 16:52:52 +08:00
Yun Hsiao Wu dfc3d141f2 GFX Descriptor Set (#7101)
* gfx: descriptor sets

* gfx: descriptor set, singular

* better structure

* adapt upper layers: first pass

finally all compiler errors cleared.

OKAY IT'S HAPPENING EVERYBODY STAY THE ****ING CALM

* adapt upper layers: second pass

THERE AND BACK AGAIN

* unified light pass & shadow shader

* gfx: descriptor set & pipeline layout

* light pass: better structure

* light pass: dynamic uniform

* even more type checking for memory pools

* Fix particleSystem and lineComponent.

* delete comment

* guard pool init param

* Fix trail module error.

* delete space

* light pass: instancing & batching support

* don't polyfill gfx stuff inside EffectAsset

* better light pass structure

* fix spot light culling

Co-authored-by: caryliu <caryliu1999@gmail.com>
2020-08-13 18:21:15 +08:00
SB baa2102339 Update 2020-08-06 17:41:06 +08:00
SB f0882d6272 Optimize some documents 2020-08-06 17:23:06 +08:00
GengineJS 72f14dc806 [Feature] Adding isPlaying judgement to support the function of gameview (#6990)
* [Modify] the systemevent adds the function of isplaying judgment

* [Feature] the ui adds the function of isplaying judgment

* [Modify] Add GameView environment

* [Optimize] Optimize the gameView conditions

* [Optimize] Complement the gameView environment
2020-07-21 17:36:07 +08:00
SijieWang 4d0c9c0249 Replace methods that cannot be used (#6743) 2020-05-27 17:35:34 +08:00
Leslie Leigh (李的序) 5e2adea787 Rename internal usages of global variable 'cc' into 'legacyGlobalExpo… (#6680)
* Rename internal usages of global variable 'cc' into 'legacyGlobalExports'

* Fix CI

* Rename 'legacyGlobalExports' -> 'legacyCC'
2020-05-14 15:46:45 +08:00
SijieWang b215a60e3e Delete some of the Editor references (#5345)
* Delete some of the Editor references

* review code

* test case
2019-09-09 09:58:31 +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
Yun Hsiao Wu ff19a901c1 refine details (#5164)
* effect adapt

* restore tslint

* refine math constants
2019-08-15 21:52:32 -05:00
Yun Hsiao Wu 5f651dad6f fix circular ref (#5131)
* fix circular ref

* remove tslint usage
2019-08-08 21:25:54 -05:00
ChiaNing c855545cf3 BaseNode cleanup remove (#5011)
* BaseNode cleanup remove

* BaseNode cleanup remove
2019-07-30 15:51:07 +08:00
pandamicro 2c5dfc03ca Remove 2d legacy (#4796)
* Remove 2d codes

* Remove CCCamera
2019-07-02 19:10:07 +08:00
ChiaNing 9b3858a3e7 API-Doc format modify (#4761) 2019-07-01 09:33:24 +08:00
Yun Hsiao Wu ab20e4fe2b vmath docs (#4620)
* mat4 vec4

* minor

* vec3, mat3, quat

* color4, vec2
2019-06-14 11:25:48 +08:00
Leslie Leigh 1c967ed52f modify CCNodePool, change rigidbodycomponent implement (#3979) 2019-03-07 15:19:57 +08:00
Yun Hsiao Wu e130583211 node pool (#3976) 2019-03-07 12:47:44 +08:00
Knox 747b74ae0f fix spine display bug in mask (#3223)
* fix spine display bug in mask

* refine code

* refine code
2018-09-10 17:19:26 +08:00
ColinCollins 1d8f3bb5f9 remove cc.info (#3128) 2018-08-21 19:29:48 +08:00
pandamicro ffc98f9fb2 Fix spine debug draw not showing in release (#3118) 2018-08-20 16:00:32 +08:00
pandamicro 328ca0fea7 Support skeleton debug draw in release mode (#3099) 2018-08-16 14:13:38 +08:00
pandamicro 2a43707cae Upgrade Mask with new graphics implementation (#3096) 2018-08-16 00:52:47 +08:00
pandamicro 411e52b580 Fix user reported issues (#3081)
* Upgrade render engine to fix some issues

* preserve drawing buffer in qqplay

* Fix label issue when using system font and fontFamily is not set

* Secure Editbox _impl access

* Fix Joint.getReactionForce

* Remove cc.director.getProjection usage

* Fix particle system color type issue in editor

* Apply Skeleton frame when changing animation in editor

* Fix docs, improve deprecation
2018-08-14 10:25:21 +08:00
yinkaile e1b213592f improve graphics (#3060)
* improve graphics

* fixed spine debug draw

* refine graphics
2018-08-10 19:08:06 +08:00
pandamicro 82ce09cf67 Fix spine issues for v2.0 (#3058)
* Fix Texture2D API deprecation message

* Fixed spine render data being overwritten issue

* Fix Skeleton update modify node status during rendering

* Fix spine setMix usage
2018-08-09 00:28:51 +08:00
pandamicro c02cfd206c Remove deprecated setAnimationListener in spine 2018-08-02 13:40:01 +08:00
pandamicro f41979ac69 Issue fixes (#3038)
* Secure PrivateNode _updateLocalMatrix

* Fix Label not responding to node size change issue

* Fix spine skeleton API usage issue

* Support lazy load texture for bmfont
2018-07-31 20:31:19 +08:00
pandamicro 985479e766 Fix user reported issues in spine & editbox (#3019)
* Fix spine null material issue caused by empty frame

* Secure label access in Editbox
2018-07-26 20:23:19 +08:00
yinkaile 5fcc88ada2 fixed change armatureName has no effect (#3006) 2018-07-24 21:51:12 +08:00
pandamicro c4593dd23b Fix beta user reported issues in Label & Spine (#3008)
* Fix label dark border issue

* Secure Skeleton listener setting
2018-07-24 09:47:13 +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
yinkaile edf97a422d fixed mesh buffer usage (#2996) 2018-07-19 11:13:27 +08:00
pandamicro 1102e50750 Fix user reported issues (#2995)
* Cleanup code & fix api doc

* Fix plist parser require issue

* Fix spine null material issue

* Fix Sprite null material issue

* Fix uninit editbox updateString issue
2018-07-19 00:01:20 +08:00
pandamicro eeac56e7cc Merge pull request #2989 from cocos-creator/next
Merge next to v2.0 release
2018-07-17 16:52:06 +08:00
pandamicro 4180152cdf Fix beta users reported issues (#2979)
* Fix node API docs

* Fix debug panel appear in release mode issue

* Do not alert rotation inconsistency, avoid alert in 3d

* Fix skew not updated issue

* Fix EventTarget not inited in SpriteFrame

* Added Animation.EventType

* Add getQuat & setQuat for 3d node

* do not alert normalize zero vector

* Fix spine assembler rendering issue

* Improve node hitTest & fix mask hitTest

* Add missing Node.once implementation

* Fix EventTarget.once callback parameters

* Improve event API docs

* Fix return type should be vec2 instead of simple object

* Improve showFPS parse
2018-07-16 11:26:17 +08:00
pandamicro 88e58d39b7 Add forceCanvas build option, rearrange modules for canvas renderer (#2969)
* Remove useless requires

* Build engine support forceCanvas to use canvas version render engine

* Rearrange modules, separate webgl & canvas renderer

* Do not create material in canvas

* Cleanup canvas renderers

* Improve modules.json

* Fix unit test

* Fix wechat sub domain build issues

* Make Camera working for canvas render mode

* Fix canvas renderer issues

* Reenable camera in Canvas

* Fix label colorizing issue
2018-07-13 14:13:48 +08:00
pandamicro f1cc4bd5aa Merge remote-tracking branch 'fireball/master' into next 2018-07-02 10:27:46 +08:00
pandamicro c7603a1c63 Refactor engine & game scripts loading process (#2922)
* Remove cc.game.CONFIG_KEY

* Remove cc.game.CONFIG_KEY

* Refactor engine and game scripts loading process

- Make cc.view & cc.director ready when engine loaded
- Load game script before renderer initialize
- Emit EVENT_ENGINE_INITED instead of EVENT_RENDERER_INITED

* Remove cc.macro. ENABLE_GC_FOR_NATIVE_OBJECTS

* Remove cc.loader.resPath usage in VideoPlayerImpl

* deprecated cc.director.getWinSize

* Improve game doc
2018-06-29 16:37:06 +08:00
Knox a4eb3ba811 fix dragonBones parseDragonBonesData bug in jsb (#2892)
* fix dragonBones parseDragonBonesData bug in jsb

* refine code
2018-06-26 16:42:39 +08:00
pandamicro 3e4171ef63 Fix components undo issue in editor (#2871) 2018-06-19 11:29:20 +08:00
pandamicro 03e2af76a5 Merge remote-tracking branch 'fireball/master' into merge 2018-06-15 18:37:33 +08:00
pandamicro 2a3a75e7fb Fix unit test and circle ci (#2858)
* fix test-animation bug (#2787)

* fix unit test (#2840)

* Improve Sprite & SpriteFrame impl

* Add Sprite inset function deprecation

* Fix unit tests

* fixed the circleci failed test but still pass the commit problem (#2814)

* CircleCI test failed but build successfully problem fixed (#2816)

* Fix Skeleton require

* Another Skeleton mistyping

* Fix phantom environment issues
2018-06-14 14:32:23 +08:00
yinkaile e95575c481 move blend factor to CCRenderComponent (#2854)
* move blend factor to CCRenderComponent

* refine code
2018-06-13 16:17:00 +08:00