Merge branch 'main' into feature/NK-138-nuake-runtime

# Conflicts: # Editor/Runtime.cpp
2026-09-21 20:08:40 +03:00 · 2023-08-07 19:07:01 -04:00
parent a5227cfb12 5a62afe6d3
commit 88bf953102
146 changed files with 25057 additions and 10847 deletions
--- a/premake5.lua
+++ b/premake5.lua
@@ -161,6 +161,11 @@ project "Editor"
    objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
 	debugdir ("%{prj.name}")

+    defines 
+    {
+        
+    }
+
    files
    {
        "%{prj.name}/Editor.cpp",