Commit Graph

6788 Commits

Author SHA1 Message Date
Menotdan
074dc2c58d Merge branch 'FlaxEngine:master' into visject_grid_snap 2023-10-03 23:30:18 -04:00
Wojtek Figat
167fead18d Backport 0f53d0461f 2023-10-03 12:24:06 +02:00
Wojtek Figat
58c6e0cd15 Backport dde6cbeb14 2023-10-03 12:23:36 +02:00
Wojtek Figat
ee83c60e1f Backport 756d9b28aa 2023-10-03 12:23:13 +02:00
Wojtek Figat
78b08b4552 Backport ccceff4f78 2023-10-03 12:22:35 +02:00
Wojtek Figat
2caa168dd9 Fix using DefaultFrameRate for animation imported with Assimp
#1444
2023-10-03 10:00:57 +02:00
Wojtek Figat
8007417fe5 Fix applying scale to imported models with Assimp
#1445 #1443
2023-10-03 09:50:50 +02:00
Wojtek Figat
94611c7f7e Merge branch 'Tryibion-input' 2023-10-02 21:30:41 +02:00
Wojtek Figat
3a2ff0f4a2 Merge branch 'input' of https://github.com/Tryibion/FlaxEngine into Tryibion-input 2023-10-02 21:30:31 +02:00
Wojtek Figat
4149da5f9e Fix crash when generating project files with toolchain setup that fails
#1537
2023-10-02 18:57:40 +02:00
Chandler Cox
4e42f84873 Fix bug in depreciated triggered action placement. 2023-10-02 08:39:13 -05:00
Wojtek Figat
dd66ee3521 Add using text Show in Finder on macOS in Editor 2023-10-02 13:26:26 +02:00
Wojtek Figat
5fe135e10b Fix updating Content folder name when renamed in Finder on macOS 2023-10-02 13:11:20 +02:00
Wojtek Figat
8a9d0271a3 Add ignoring ’.DS_Store’ files in Content on macOS 2023-10-02 13:04:21 +02:00
Wojtek Figat
b9198fc7a1 Merge remote-tracking branch 'origin/master' 2023-10-02 12:54:41 +02:00
Wojtek Figat
8bafdb0b78 Remove std::function usage from ArrayExtensions 2023-10-02 12:52:44 +02:00
Wojtek Figat
41f005f95b Fix typo from 17291a8a13 2023-10-02 12:49:02 +02:00
Wojtek Figat
17291a8a13 Fix Cannot find compatible metal driver on macOS due to the newest Vulkan SDK regression
#1469
2023-10-02 12:48:14 +02:00
Wojtek Figat
1156f72fbe Add versions sorting to VulkanSDK selection on macOS 2023-10-02 12:40:37 +02:00
Wojtek Figat
70f0fbe954 Fix crash on Vulkan when drawing shader without binding proper constant Buffer
#1289
2023-10-02 11:37:24 +02:00
Wojtek Figat
0ea3cb0d69 Improve workflow with Android project generated after #1570 2023-10-02 11:05:19 +02:00
Menotdan
1b12ccd180 Remove extra spacing on copyright notice. 2023-10-02 00:36:07 -04:00
Menotdan
8cf6134f8b Cleanup. 2023-10-02 00:34:14 -04:00
Menotdan
8ba1878657 Cleanup Logs. 2023-10-02 00:18:16 -04:00
Menotdan
d9f3fe186d Implement function to properly get the size of the value editor for an InputBox. 2023-10-02 00:13:29 -04:00
Menotdan
032793d202 Merge branch 'visject_grid_snap' of https://github.com/Menotdan/FlaxEngine into visject_grid_snap
Merge master to bring everything up to date.
2023-10-01 23:32:27 -04:00
Menotdan
4e45ac6ef4 Merge branch 'FlaxEngine:master' into visject_grid_snap 2023-10-01 23:32:21 -04:00
Wojtek Figat
652510ee50 Minor codestyle tweaks for #1420 2023-10-01 21:55:20 +02:00
Wojtek Figat
9b605f445c Merge branch 'RedTheKitsune-better-missing-script-handling' 2023-10-01 21:12:07 +02:00
Wojtek Figat
ae654c2f0a Merge branch 'better-missing-script-handling' of https://github.com/RedTheKitsune/FlaxEngine into RedTheKitsune-better-missing-script-handling 2023-10-01 21:07:34 +02:00
Wojtek Figat
b492c9421b Fix Tag deserialization in cooked game
#1534
2023-10-01 21:02:08 +02:00
Wojtek Figat
6d92d0b58f Merge branch 'RuanLucasGD-Remove-Background_From-CollisionDataWindow' 2023-10-01 12:35:27 +02:00
Wojtek Figat
2db55a3711 Merge branch 'Remove-Background_From-CollisionDataWindow' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-Remove-Background_From-CollisionDataWindow 2023-10-01 12:35:22 +02:00
Wojtek Figat
8de9e06b58 Merge branch 'Tryibion-main-win' 2023-10-01 12:33:59 +02:00
Wojtek Figat
fc499b763d Merge branch 'main-win' of https://github.com/Tryibion/FlaxEngine into Tryibion-main-win 2023-10-01 12:33:54 +02:00
Wojtek Figat
9acff68209 Merge branch 'Tryibion-rot-around-fix' 2023-10-01 12:32:51 +02:00
Wojtek Figat
4f5e7988c9 Merge branch 'rot-around-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-rot-around-fix 2023-10-01 12:32:42 +02:00
Wojtek Figat
20797fce5a Merge branch 'Tryibion-base-win-size' 2023-10-01 12:30:19 +02:00
Wojtek Figat
883abc2f3b Merge branch 'base-win-size' of https://github.com/Tryibion/FlaxEngine into Tryibion-base-win-size 2023-10-01 12:30:14 +02:00
Wojtek Figat
1e96bb7647 Merge branch 'GoaLitiuM-vs_android_intellisense_fix' 2023-10-01 12:29:43 +02:00
Wojtek Figat
ec7dcc4cfb Merge branch 'vs_android_intellisense_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-vs_android_intellisense_fix 2023-10-01 12:29:36 +02:00
Wojtek Figat
acc7d0893f Merge branch 'GoaLitiuM-vscode_csharp_build_tasks' 2023-10-01 12:28:38 +02:00
Wojtek Figat
3ae0e4f65e Merge branch 'vscode_csharp_build_tasks' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-vscode_csharp_build_tasks 2023-10-01 12:28:30 +02:00
Wojtek Figat
92382b42c4 Merge branch 'GoaLitiuM-assembly_load_fix' 2023-10-01 12:28:09 +02:00
Wojtek Figat
7dc3a3c1a2 Merge branch 'assembly_load_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-assembly_load_fix 2023-10-01 12:27:54 +02:00
Wojtek Figat
3f8c91c83a Merge branch 'GoaLitiuM-build_engine_bindings' 2023-10-01 12:27:22 +02:00
Wojtek Figat
5832d995eb Merge branch 'build_engine_bindings' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-build_engine_bindings 2023-10-01 12:27:14 +02:00
Wojtek Figat
3754b5c958 Merge branch 'GoaLitiuM-sln_generation_fix2' 2023-10-01 12:26:44 +02:00
Wojtek Figat
6e47db0ebe Merge branch 'sln_generation_fix2' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sln_generation_fix2 2023-10-01 12:26:39 +02:00
Wojtek Figat
38cf756f1f Merge branch 'Tryibion-blur-fix' 2023-10-01 12:25:44 +02:00