Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
# Conflicts:
#	Source/Editor/Viewport/MainEditorGizmoViewport.cs
This commit is contained in:
Ari Vuollet
2026-02-03 17:39:43 +02:00
parent feceb4e00f b1f85b7462
commit f870fc3ae2
173 changed files with 8848 additions and 3046 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Flax.flaxproj
+1 -1
View File
@@ -4,7 +4,7 @@
"Major": 1,
"Minor": 11,
"Revision": 0,
"Build": 6805
"Build": 6806
},
"Company": "Flax",
"Copyright": "Copyright (c) 2012-2025 Wojciech Figat. All rights reserved.",