mafiesto4 312e4ad010 Merge branch 'master' into 1.1 ...

# Conflicts:
#	Source/Engine/Content/JsonAsset.h
#	Source/Engine/Core/Config/Settings.h

2021-02-15 10:40:59 +01:00

..

GUI

Merge remote-tracking branch 'origin/master' into 1.1

2021-01-22 11:31:22 +01:00

Tracks

Fixed a ton of typos

2021-01-05 02:13:15 +01:00

Undo

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

AnimationTimeline.cs

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

Media.cs

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

ParticleSystemTimeline.cs

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

SceneAnimationTimeline.cs

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

Timeline.cs

Fix some editor UI controls visible in Visual Scripting

2021-01-21 14:26:22 +01:00

Track.cs

Fix Editor timeline editor controls API visible in Visual Scripting

2021-02-07 21:41:46 +01:00

TrackArchetype.cs

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

TrackCreateOptions.cs

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00