GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
6,416 Commits 14 Branches 0 Tags
1de8581e6d2c860f7c7d85bb56326d360220f69d
Commit Graph

6416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wojtek Figat
1de8581e6d Merge branch 'macos-rider-support' of https://github.com/wackoisgod/FlaxEngine into wackoisgod-macos-rider-support 2023-09-18 12:18:27 +02:00
Wojtek Figat
79bf226fe1 Codestyle fix 2023-09-18 12:11:28 +02:00
Wojtek Figat
0ece806230 Merge branch 'wackoisgod-macos-flex-build-fixes' 2023-09-18 11:49:49 +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
a33647ecf1 Merge branch 'wackoisgod-script-generics-crash' 2023-09-18 11:47:40 +02:00
Wojtek Figat
342877ec42 Merge branch 'script-generics-crash' of https://github.com/wackoisgod/FlaxEngine into wackoisgod-script-generics-crash 2023-09-18 11:47:33 +02:00
Wojtek Figat
e38a8bda7a Codestyle fix for #1425 2023-09-18 11:26:56 +02:00
Wojtek Figat
1f386f9ce0 Merge branch 'wackoisgod-macos-ios-build-issue' 2023-09-18 11:25:55 +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
3ac00b1e4e Fixing a crash when generic classes spanned across different assemblies 
This code attempts to resolve an issue where if you had a class in Assembly A and it was generic and you had a class that inherited from it in Assembly B it would not properly resolve these classes, also added an error check for if I was not able to find the TypeIndex then log it and return thus also preventing a crash when it goes to resolve the NativeType
 2023-09-17 20:37:37 -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
Andrew Spiering
76945b9144 MacOS Rider Support 
* Adding in code to properly look for rider on macOS
* Also fixing an issue in the macOS CreateProcess where spaces where not properly escaped for popen(which one should likely use NSTask long term)
 2023-09-17 14:56:22 -07:00
Wojtek Figat
ffec2f751d Merge branch 'wackoisgod-macos-arm-dotnet-fix' 2023-09-17 19:24:07 +02:00
Wojtek Figat
660dc81d8e Merge branch 'macos-arm-dotnet-fix' of https://github.com/wackoisgod/FlaxEngine into wackoisgod-macos-arm-dotnet-fix 2023-09-17 19:23:50 +02:00
Wojtek Figat
c0d5cf8022 Merge branch 'GoaLitiuM-contentdb_delete_fix' 2023-09-17 19:22:08 +02:00
Andrew Spiering
bdd182f3da Fixing x64 editor/runtime on arm64 macs 
* This allows for a much more broader check for the dotnet sdk runtime to support running x64 binaries on arm64
 2023-09-16 18:23:27 -07:00
Ari Vuollet
5ab299fed9 Fix assets getting deleted when modified by external applications 2023-09-16 18:11:22 +03:00
Wojtek Figat
722133165b Fix marshalling Array<Variant> as object[] (C# codegen error) 2023-09-14 13:18:52 +02:00
Wojtek Figat
963c12a75f Merge branch 'RuanLucasGD-add_spline_edit_options' 2023-09-12 22:25:28 +02:00
Wojtek Figat
cb44c9370e Refactor new spline editor to use icons via Tabs control #1292 2023-09-12 22:25:18 +02:00
Wojtek Figat
dbd85fddfe Refactor Editor Tab controls system to allows customizing the tab header controls 2023-09-12 22:24:15 +02:00
Wojtek Figat
3e1940c799 Add new spline icons #1292 2023-09-12 22:18:26 +02:00
Wojtek Figat
2a8e35d1ff Format code #1292 2023-09-12 14:38:23 +02:00
Wojtek Figat
f2e6bfdead Merge branch 'add_spline_edit_options' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-add_spline_edit_options 2023-09-12 14:26:39 +02:00
Wojtek Figat
aa34f85b39 Merge branch 'Tryibion-input-editors' 2023-09-12 14:21:39 +02:00
Wojtek Figat
097d26f8cb Codestyle fix #1262 2023-09-12 14:21:27 +02:00
Wojtek Figat
6ece66b018 Merge branch 'input-editors' of https://github.com/Tryibion/FlaxEngine into Tryibion-input-editors 2023-09-12 14:09:49 +02:00
Wojtek Figat
9bbdf16623 Fix potential content tree freeze when toggling engine/plugins files showing 2023-09-12 14:03:53 +02:00
Wojtek Figat
04be05239a Merge branch 'Tryibion-lods' 2023-09-12 13:56:52 +02:00
Wojtek Figat
3170142171 Merge branch 'lods' of https://github.com/Tryibion/FlaxEngine into Tryibion-lods 2023-09-12 13:56:42 +02:00
Wojtek Figat
44eba3fdae Fix missing xml comment line from #1291 2023-09-12 13:54:01 +02:00
Wojtek Figat
a9c8a76f87 Merge branch 'Withaust-layeraddition' 2023-09-12 13:52:30 +02:00
Wojtek Figat
4cae6e50d5 Merge branch 'layeraddition' of https://github.com/Withaust/FlaxEngine into Withaust-layeraddition 2023-09-12 13:52:23 +02:00
Wojtek Figat
7b4c8e391a Minor optimization for clearing collider from simulation events cache 2023-09-12 13:50:50 +02:00
Wojtek Figat
c10658c3fc Fix deserialization, add more docs and tweaks to #1345 2023-09-12 13:50:22 +02:00
Wojtek Figat
452cdfd163 Merge branch 'Tryibion-physics-settings' 2023-09-12 13:03:12 +02:00
Wojtek Figat
1591da75ac Merge branch 'physics-settings' of https://github.com/Tryibion/FlaxEngine into Tryibion-physics-settings 2023-09-12 13:03:04 +02:00
Wojtek Figat
639149b63b Fix crash when toggling WheeledVehicle active state 
#1351
 2023-09-12 11:41:33 +02:00
Wojtek Figat
762960bee1 Merge branch 'Tryibion-plugin-project-creation' 2023-09-11 22:42:55 +02:00
Wojtek Figat
9d494679ac Add formatting MyPlugin.cs for new plugin setup 
#1335
 2023-09-11 22:42:48 +02:00
Wojtek Figat
985d6cc811 Add UTF8 format for created plugin files and format code 
#1335
 2023-09-11 22:32:37 +02:00
Wojtek Figat
99c2adc1f3 Add game settings formatting for created plugin ProjectInfo 
#1335
 2023-09-11 22:32:17 +02:00
Wojtek Figat
776fbe2a7b Fix creating plugin with whitespace or non-ASCII character in the name 
#1335
 2023-09-11 22:30:51 +02:00
Wojtek Figat
2fa7740a0f Merge branch 'plugin-project-creation' of https://github.com/Tryibion/FlaxEngine into Tryibion-plugin-project-creation 2023-09-11 21:48:31 +02:00
Wojtek Figat
0a5f983ff4 Fix error when model is missing in Editor for prefab editor 
#1354
 2023-09-11 21:36:36 +02:00
Wojtek Figat
b7cf0d4420 Merge branch 'NoriteSC-ContentBrowserImprovement' 2023-09-11 20:03:51 +02:00
Wojtek Figat
16fed8927c Refactor #1266 (code quality and simplicity) 2023-09-11 20:02:53 +02:00