Wojtek Figat b73ff9aaf6 Merge branch '1.1' into 1.2 ...

# Conflicts:
#	Source/Platforms/DotNet/Newtonsoft.Json.dll
#	Source/Platforms/DotNet/Newtonsoft.Json.pdb
#	Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll
#	Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll

2021-04-24 12:32:17 +02:00

..

Bindings

Merge branch '1.1' into 1.2

2021-04-24 12:32:17 +02:00

Build

Merge branch 'master' into 1.2

2021-04-13 09:52:03 +02:00

Deploy

Improve deploy of editor on linux

2021-03-28 21:14:03 +02:00

Deps

Fix diff-serialization and deserialization of C# lists

2021-04-20 16:06:32 +02:00

Platforms

Merge branch '1.1' into 1.2

2021-04-24 12:32:17 +02:00

Projects

Fix packaged editor usage

2021-03-16 22:15:46 +01:00

Properties

Bumping all copyright headers to 2021.

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

Utilities

Merge remote-tracking branch 'origin/1.1' into linux-editor

2021-02-16 18:54:25 +01:00

CommandLine.cs

Bumping all copyright headers to 2021.

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

CommandLineAttribute.cs

Bumping all copyright headers to 2021.

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

Configuration.cs

Add support for using other VC++ toolset for Window and add cmd arg for selecting compiler manually

2021-02-17 10:58:58 +01:00

Flax.Build.Build.cs

Bumping all copyright headers to 2021.

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

Flax.Build.csproj

Add Switch platform

2021-03-09 14:26:30 +01:00

Flax.Build.csproj.DotSettings

You're breathtaking!

2020-12-07 23:40:54 +01:00

Globals.cs

Add Switch platform

2021-03-09 14:26:30 +01:00

Log.cs

Merge remote-tracking branch 'origin/master' into linux-editor

2021-02-23 22:29:07 +01:00

LogIndentScope.cs

Bumping all copyright headers to 2021.

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

Program.cs

Add support for custom defines for build system via Flax.Build command line

2021-02-16 13:09:50 +01:00

ProjectInfo.cs

Fix picking game binaries target when EditorTarget is not SetupTargetEnvironment

2021-03-28 23:25:52 +02:00