Commit Graph

13 Commits

Author SHA1 Message Date
Wojtek Figat
6cbeac6537 Merge remote-tracking branch 'origin/master' into 1.1
# Conflicts:
#	Source/Engine/Navigation/NavMesh.cpp
#	Source/Engine/Navigation/NavMeshBuilder.cpp
2021-01-22 11:31:22 +01:00
Wojtek Figat
a3fa8ff9f0 Optimize some includes 2021-01-12 19:17:08 +01:00
Wojtek Figat
45211fa61c Merge remote-tracking branch 'origin/master' into navigation-features 2021-01-12 12:04:20 +01:00
Wojtek Figat
ba1a246a90 Merge branch 'typo-fix' of git://github.com/VNNCC/FlaxEngine into VNNCC-typo-fix 2021-01-11 15:33:45 +01:00
mafiesto4
f10c6b4ff6 Fix Linux build 2021-01-05 19:51:47 +01:00
Wojtek Figat
be319c446d Refactor settings types to use scripting API 2021-01-05 14:14:34 +01:00
VNC
6ab300025b Fixed a ton of typos 2021-01-05 02:13:15 +01:00
Wojtek Figat
cc8e78b505 Merge remote-tracking branch 'origin/master' into navigation-features
# Conflicts:
#	Source/Editor/Content/Settings/NavigationSettings.cs
#	Source/Engine/Engine/PhysicalMaterial.cs
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
2021-01-04 14:31:56 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
05790ab9a1 Fix code style 2020-12-30 22:56:17 +01:00
Wojtek Figat
4c205be617 Fix code style 2020-12-30 11:20:37 +01:00
Wojtek Figat
cea1a67749 Refactor game settings to support using API bindings 2020-12-21 14:53:27 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00