Merge remote-tracking branch 'origin/master' into 1.8

# Conflicts:
#	Flax.flaxproj
This commit is contained in:
Wojtek Figat
2024-02-26 19:49:39 +01:00
2740 changed files with 5217 additions and 3615 deletions

View File

@@ -4,10 +4,10 @@
"Major": 1,
"Minor": 8,
"Revision": 0,
"Build": 6504
"Build": 65045
},
"Company": "Flax",
"Copyright": "Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.",
"Copyright": "Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.",
"GameTarget": "FlaxGame",
"EditorTarget": "FlaxEditor",
"Configuration": {