Commit Graph

774 Commits

Author SHA1 Message Date
Wojtek Figat
1c20398d8c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-22 22:43:29 +02:00
Wojtek Figat
da00d3b971 Merge branch 'csproj_file_structure' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-csproj_file_structure 2023-09-22 13:02:20 +02:00
Wojtek Figat
787479357e Codestyle fix #1495 2023-09-22 12:57:07 +02:00
Wojtek Figat
0fbb3f4414 Merge branch 'macos-csproj-fix' of https://github.com/wackoisgod/FlaxEngine into wackoisgod-macos-csproj-fix 2023-09-22 12:51:08 +02:00
Wojtek Figat
62c2008cbc Fix crash in C# JobSystem.Dispatch due to GC collecting Delegate object 2023-09-22 12:50:50 +02:00
Wojtek Figat
abcfc8af35 Add using exact C# method profiler data for profiler events in overriden thunk method callbacks 2023-09-22 12:04:41 +02:00
Andrew Spiering
ab7ca683bb Addressing Feedback
* use a better method of getting Editor binary folder
2023-09-22 02:59:38 -07:00
Andrew Spiering
1537f49e73 Fixing Editor Path
* Again the path was hardcoded to win64
2023-09-22 02:41:09 -07:00
Andrew Spiering
017967d5f8 Fixing non-windows platforms csproj files
* Seems there was a hardcoded path ? for the prebuilt binaries for the FlaxEngine dll
2023-09-22 02:13:49 -07:00
bf68d17afe Create VS folder structure for BuildScripts and FlaxEngine source files 2023-09-21 19:44:21 +03:00
Wojtek Figat
38671e0e01 Merge branch 'default_configurations_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-default_configurations_fix 2023-09-21 11:28:59 +02:00
Wojtek Figat
d94c0d3323 Fix C#-only game projects to reference precompiled DLLs instead of FlaxEngine.csproj 2023-09-21 11:26:04 +02:00
Wojtek Figat
a420ca72d6 Fix Visual Studio solution project to ensure that main project is the first one 2023-09-21 11:23:57 +02:00
ed51791b58 Prevent generating VS configurations for Win32 and engine projects 2023-09-21 01:00:04 +03:00
Wojtek Figat
bcce08e81c Codestyle fix and doc 2023-09-20 22:14:54 +02:00
Andrew Spiering
821c373ae2 Allow for better support for running on m1/2 machines
* So we need to account for 2 possible situations where you are running under and emulated process and a native process with a different target host in this case x64
2023-09-20 09:12:48 -07:00
Wojtek Figat
9f97787099 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-20 16:02:48 +02:00
Wojtek Figat
34a36d822a Improve parsing command line in build tools when using lots of quotes 2023-09-20 10:06:16 +02:00
Wojtek Figat
d9333018c2 Merge branch 'unix-dotnet-location' of https://github.com/Crawcik/FlaxEngine into Crawcik-unix-dotnet-location
# Conflicts:
#	Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
2023-09-19 22:00:36 +02:00
Wojtek Figat
a71de7357c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-19 21:42:53 +02:00
Wojtek Figat
f845344d03 Add internal access level to Scripting API members (field, properties and functions) 2023-09-19 20:39:48 +02:00
Wojtek Figat
b8a626c95d Merge branch 'dotnet8_compat_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet8_compat_fix 2023-09-18 17:27:02 +02:00
Wojtek Figat
79bf226fe1 Codestyle fix 2023-09-18 12:11:28 +02:00
Wojtek Figat
c63e2802a1 Merge branch 'macos-flex-build-fixes' of https://github.com/wackoisgod/FlaxEngine into wackoisgod-macos-flex-build-fixes 2023-09-18 11:49:43 +02:00
Wojtek Figat
e38a8bda7a Codestyle fix for #1425 2023-09-18 11:26:56 +02:00
Andrew Spiering
97f595922e Fixing broken build
Have to actually set it to true
2023-09-17 23:11:23 -07:00
Andrew Spiering
9f4429f87c When building the engine if you don't have iOS SDK Installed then don't build it
Currently when you try and build macOS editor it assumes you also want to build iOS because of the way this check works which assumes if you have Xcode Installed you are ready to go. This really should not be the case, so instead lets check to see if you have the iophonesdk installed for your current Xcode if not then skip it.
2023-09-17 22:26:50 -07:00
Andrew Spiering
824ee9ec7f Fixing a typo :/ 2023-09-17 18:48:54 -07:00
Andrew Spiering
69e54d7f88 Fixing an issue if running an x64 machine already 2023-09-17 15:53:48 -07:00
Andrew Spiering
183ab7738f Fixing Flex Build issues on M1/2 macs
* This resolves some issues where if you are building the actual C# dlls you also need them to be x64 based if you are targeting an x64 based target. This is a little complicated here because we set all this up ahead of time assuming that all the targets are compatible but in this case they are not so, just following what other places in the code are doing around this specifically dotnet AOT.
2023-09-17 15:42:26 -07:00
785943bef8 Add missing marshaller methods for compatibility 2023-09-16 16:00:12 +03:00
Crawcik
1dd7a27568 Checking for executable 2023-09-14 23:19:36 +02:00
Crawcik
64a5d895bd Better version checking 2023-09-14 23:18:12 +02:00
Crawcik
73bf28dc47 Change of priorities on RID 2023-09-14 22:37:56 +02:00
Crawcik
6dd0957c4a Adding better finding dotnet root location for mac&unix 2023-09-14 22:34:03 +02:00
Wojtek Figat
35609c9883 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-14 13:25:59 +02:00
Wojtek Figat
722133165b Fix marshalling Array<Variant> as object[] (C# codegen error) 2023-09-14 13:18:52 +02:00
Wojtek Figat
81a2898d4e Add double-reference support for scripting function parameters to move value 2023-08-28 14:19:02 +02:00
Wojtek Figat
0c206564be Fix generic typename to be properly converted to C# 2023-08-24 13:02:29 +02:00
Wojtek Figat
de6254b5a5 Various fixes for scripting bindings codegen 2023-08-19 17:00:05 +02:00
Wojtek Figat
e36bf6e19a Add MarshalAs tag to APi structs/classes for custom marshaling via implicit casting 2023-08-19 16:59:39 +02:00
Wojtek Figat
32c47949fa Fix error when scripting structure uses StringAnsi field 2023-08-18 13:32:06 +02:00
Wojtek Figat
f088f2b61d Merge remote-tracking branch 'origin/master' into 1.7 2023-08-18 10:33:51 +02:00
Wojtek Figat
1948a84301 Add crash to soft-return if managed event bind target object native instance is gone
#1278
2023-08-14 18:40:03 +02:00
Wojtek Figat
0e2d1b6ad2 Merge remote-tracking branch 'origin/master' into 1.7 2023-08-14 18:14:59 +02:00
5e3018817c Fix marshalling issue with PostFxMaterialSettings Materials 2023-08-14 18:25:48 +03:00
Wojtek Figat
5ae27a0e92 Code style fix 2023-08-14 15:25:12 +02:00
Wojtek Figat
22a1f433a1 Merge branch 'intellisense_stdcpp' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-intellisense_stdcpp 2023-08-14 15:09:00 +02:00
e6878942f9 Fix missing C++ standard version in VC++ projects intellisense options 2023-08-13 21:33:17 +03:00
3df044d07b Add build option to change code optimization level in C# modules 2023-08-13 21:29:38 +03:00