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

# Conflicts: # Flax.flaxproj
2024-02-26 19:49:39 +01:00
parent 10180de9c6 7f935ab57a
commit 14902dc29e
2740 changed files with 5217 additions and 3615 deletions
--- a/Source/Platforms/Android/Binaries/Project/app/src/main/java/com/flaxengine/GameActivity.java
+++ b/Source/Platforms/Android/Binaries/Project/app/src/main/java/com/flaxengine/GameActivity.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.

 package com.flaxengine;