69e54d7f88
Fixing an issue if running an x64 machine already
2023-09-17 15:53:48 -07:00
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
mafiesto4
ffec2f751d
Merge branch 'wackoisgod-macos-arm-dotnet-fix'
2023-09-17 19:24:07 +02:00
mafiesto4
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
mafiesto4
c0d5cf8022
Merge branch 'GoaLitiuM-contentdb_delete_fix'
2023-09-17 19:22:08 +02:00
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
GoaLitiuM
5ab299fed9
Fix assets getting deleted when modified by external applications
2023-09-16 18:11:22 +03:00
mafiesto4
722133165b
Fix marshalling Array<Variant> as object[] (C# codegen error)
2023-09-14 13:18:52 +02:00
mafiesto4
963c12a75f
Merge branch 'RuanLucasGD-add_spline_edit_options'
2023-09-12 22:25:28 +02:00
mafiesto4
cb44c9370e
Refactor new spline editor to use icons via Tabs control #1292
2023-09-12 22:25:18 +02:00
mafiesto4
dbd85fddfe
Refactor Editor Tab controls system to allows customizing the tab header controls
2023-09-12 22:24:15 +02:00
mafiesto4
3e1940c799
Add new spline icons #1292
2023-09-12 22:18:26 +02:00
mafiesto4
2a8e35d1ff
Format code #1292
2023-09-12 14:38:23 +02:00
mafiesto4
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
mafiesto4
aa34f85b39
Merge branch 'Tryibion-input-editors'
2023-09-12 14:21:39 +02:00
mafiesto4
097d26f8cb
Codestyle fix #1262
2023-09-12 14:21:27 +02:00
mafiesto4
6ece66b018
Merge branch 'input-editors' of https://github.com/Tryibion/FlaxEngine into Tryibion-input-editors
2023-09-12 14:09:49 +02:00
mafiesto4
9bbdf16623
Fix potential content tree freeze when toggling engine/plugins files showing
2023-09-12 14:03:53 +02:00
mafiesto4
04be05239a
Merge branch 'Tryibion-lods'
2023-09-12 13:56:52 +02:00
mafiesto4
3170142171
Merge branch 'lods' of https://github.com/Tryibion/FlaxEngine into Tryibion-lods
2023-09-12 13:56:42 +02:00
mafiesto4
44eba3fdae
Fix missing xml comment line from #1291
2023-09-12 13:54:01 +02:00
mafiesto4
a9c8a76f87
Merge branch 'Withaust-layeraddition'
2023-09-12 13:52:30 +02:00
mafiesto4
4cae6e50d5
Merge branch 'layeraddition' of https://github.com/Withaust/FlaxEngine into Withaust-layeraddition
2023-09-12 13:52:23 +02:00
mafiesto4
7b4c8e391a
Minor optimization for clearing collider from simulation events cache
2023-09-12 13:50:50 +02:00
mafiesto4
c10658c3fc
Fix deserialization, add more docs and tweaks to #1345
2023-09-12 13:50:22 +02:00
mafiesto4
452cdfd163
Merge branch 'Tryibion-physics-settings'
2023-09-12 13:03:12 +02:00
mafiesto4
1591da75ac
Merge branch 'physics-settings' of https://github.com/Tryibion/FlaxEngine into Tryibion-physics-settings
2023-09-12 13:03:04 +02:00
mafiesto4
639149b63b
Fix crash when toggling WheeledVehicle active state
...
#1351
2023-09-12 11:41:33 +02:00
mafiesto4
762960bee1
Merge branch 'Tryibion-plugin-project-creation'
2023-09-11 22:42:55 +02:00
mafiesto4
9d494679ac
Add formatting MyPlugin.cs for new plugin setup
...
#1335
2023-09-11 22:42:48 +02:00
mafiesto4
985d6cc811
Add UTF8 format for created plugin files and format code
...
#1335
2023-09-11 22:32:37 +02:00
mafiesto4
99c2adc1f3
Add game settings formatting for created plugin ProjectInfo
...
#1335
2023-09-11 22:32:17 +02:00
mafiesto4
776fbe2a7b
Fix creating plugin with whitespace or non-ASCII character in the name
...
#1335
2023-09-11 22:30:51 +02:00
mafiesto4
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
mafiesto4
0a5f983ff4
Fix error when model is missing in Editor for prefab editor
...
#1354
2023-09-11 21:36:36 +02:00
mafiesto4
b7cf0d4420
Merge branch 'NoriteSC-ContentBrowserImprovement'
2023-09-11 20:03:51 +02:00
mafiesto4
16fed8927c
Refactor #1266 (code quality and simplicity)
2023-09-11 20:02:53 +02:00
mafiesto4
2ddb44afa8
Merge branch 'ContentBrowserImprovement' of https://github.com/NoriteSC/FlaxEngineFork into NoriteSC-ContentBrowserImprovement
...
# Conflicts:
# Source/Editor/Windows/ContentWindow.cs
2023-09-11 15:39:48 +02:00
mafiesto4
59c460ccbc
Format code
2023-09-11 15:08:13 +02:00
mafiesto4
748ff3b8a5
Optimize CultureInfoEditor and TagEditor performance when searching entries by text
2023-09-11 15:07:37 +02:00
mafiesto4
829d3b3642
Add editor shortcuts usability when toolstrip or main menu controls are focused
2023-09-11 15:07:06 +02:00
mafiesto4
48d4a51c1b
Fix crash when boxing native array to managed value
2023-09-11 15:06:26 +02:00
mafiesto4
1134cfa6a6
Fix using ManagedDictionary when item value type is array
...
#1305
2023-09-11 15:05:46 +02:00
mafiesto4
9afa98e905
Fix Random Range nodes in CPU particles/script graphs when using int
...
#1341
2023-09-11 13:59:10 +02:00
mafiesto4
fb27606541
Add missing Particle Scale getter node to Particle Emitter graph
...
#1343
2023-09-11 13:54:44 +02:00
mafiesto4
716e643f2a
Fix applying prefab changes to nesting prefab instances
...
#1256
2023-09-10 21:07:41 +02:00
mafiesto4
ae27d51dc6
Fix building for Android with the latest Java version (update to Gradle 8.3)
2023-09-10 14:53:58 +02:00
mafiesto4
a4312590e7
Fix debug draw leftover from 9da686cd52
...
#1369 #1365
2023-09-10 13:34:46 +02:00
8008f05d64
Merge branch 'master' into layeraddition
2023-09-10 13:39:31 +03:00
mafiesto4
328bfa8322
Merge branch 'Tryibion-sort-projects'
2023-09-10 12:06:30 +02:00
Andrew Spiering
mafiesto4
GoaLitiuM