Commit Graph

8 Commits

Author SHA1 Message Date
Wojtek Figat
8f1f88b3ba Fix running Flax on Windows with STD console output 2021-05-14 21:44:13 +02:00
Wojtek Figat
ace8295ab7 Merge remote-tracking branch 'origin/master' into localization
# 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-22 16:10:36 +02:00
Wojtek Figat
b2729e35c2 Fixes for UWP build 2021-04-17 19:36:38 +02:00
Wojtek Figat
b0fe4e9945 Merge remote-tracking branch 'origin/master' into 1.2 2021-03-30 17:58:29 +02:00
Wojtek Figat
0754434295 Fix UWP build 2021-03-27 19:27:22 +01:00
Wojtek Figat
cc201e198d Add Switch platform 2021-03-09 14:26:30 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00