Commit Graph

7 Commits

Author SHA1 Message Date
Wojtek Figat
fc4dc8cb50 Merge remote-tracking branch 'origin/1.1' into linux-editor
# Conflicts:
#	Source/FlaxEngine.Gen.cs
#	Source/Tools/Flax.Build/Utilities/Utilities.cs
2021-02-16 18:54:25 +01:00
mafiesto4
c7547b3a46 Merge remote-tracking branch 'origin/master' into linux-editor 2021-01-10 09:14:03 +01:00
mafiesto4
efa5d05f5f Fixes for building editor for Linux 2021-01-05 16:23:02 +01:00
VNC
6ab300025b Fixed a ton of typos 2021-01-05 02:13:15 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
4c205be617 Fix code style 2020-12-30 11:20:37 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00