Commit Graph

7 Commits

Author SHA1 Message Date
Wojtek Figat
8bce445ab0 Refactor Collider base class to improve code sharing across collider shape types 2021-02-10 14:33:16 +01:00
Wojtek Figat
23652d1bc5 Merge remote-tracking branch 'origin/master' into 1.1
# Conflicts:
#	Source/Engine/Input/Input.cpp
2021-02-02 10:29:52 +01:00
Wojtek Figat
1bd639c86d Fix including CharacterController.h in game code 2021-02-01 23:38:16 +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
4d2d801bf4 Fix typos 2020-12-21 14:53:33 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00