Commit Graph

402 Commits

Author SHA1 Message Date
Wojtek Figat
248304a78f Fix regression of importing only a single material for models with split objects enabled
#1483
2023-09-22 19:43:00 +02:00
Menotdan
2b1266147c Add new condition from split object bugfix on master. 2023-09-20 11:02:19 -04:00
Wojtek Figat
9f97787099 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-20 16:02:48 +02:00
Wojtek Figat
a56ce92867 Fix crash when importing model with materials and Split Objects enabled 2023-09-19 23:07:10 +02:00
Wojtek Figat
a71de7357c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-19 21:42:53 +02:00
Wojtek Figat
255e47fa1e Fix crash due to invalid message in Assimp 2023-09-19 14:00:37 +02:00
Ruan Lucas
23b6b93726 add collision type to model importer 2023-09-15 19:13:32 -04:00
Menotdan
451900b7ee Merge branch 'FlaxEngine:master' into material_import 2023-09-15 02:17:34 -04:00
Wojtek Figat
6bdbaecc18 Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Source/Engine/Physics/PhysX/SimulationEventCallbackPhysX.cpp
2023-09-13 10:29:28 +02:00
Chandler Cox
44598d4741 Small change in showing target error 2023-08-26 17:07:04 -05:00
Chandler Cox
8e1cac7d2f Add to be able to choose sloppy mesh simplification or not in model import settings for LODs. 2023-08-15 21:34:07 -05:00
Menotdan
af3d9d0eb3 Re-implement functionality for importing materials as instances. 2023-08-09 15:28:47 -04:00
Menotdan
9156e7727b Merge commit 'refs/pull/1115/head' of https://github.com/FlaxEngine/FlaxEngine into material_import1.6
Repair merge
2023-08-09 15:28:15 -04:00
Wojtek Figat
04963fef18 Various code fixes and tweaks 2023-07-02 15:46:29 +02:00
Wojtek Figat
9f313491b8 Fix game compilation error 2023-06-13 15:45:08 +02:00
Wojtek Figat
979168e82c Refactor various Editor APIs to use auto-generated bindings instead of manual code 2023-06-12 14:34:07 +02:00
Wojtek Figat
f552dd0c28 Merge remote-tracking branch 'origin/master' into 1.6 2023-06-10 23:29:22 +02:00
Ruan Lucas
c22eae0e2d fix crash when import model with option to generate lod and lods amount = 1 2023-06-03 22:18:18 -04:00
Menotdan
284c3d832a fix a couple of bugs with importing without material instances 2023-05-22 14:26:20 -04:00
Menotdan
4acfffeaf4 Make it so the material instances get linked to the material slots. 2023-05-22 13:51:13 -04:00
Menotdan
37fe1154a3 Importing as instances works now 2023-05-22 10:12:00 -04:00
Menotdan
f03bb60d5b Figured out where I actually need to add code, and added code there. 2023-05-21 00:20:54 -04:00
Menotdan
89ce2b087e Add parameter for AddMaterial() as an experiment, messing around with ideas. 2023-05-20 00:13:45 -04:00
Menotdan
9a71e0274f Add required options for material instance importing. 2023-05-20 00:03:40 -04:00
Wojtek Figat
71a5d56105 Add support for importing skeleton-only as Skinned Model (eg. from animation file to have skeleton for retargeting) 2023-05-04 15:43:44 +02:00
Wojtek Figat
390460907d Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
2023-04-22 18:59:41 +02:00
Wojtek Figat
1ffe8a7b60 Add OpenAL AL_SOFT_source_spatialize extension support for stereo spatial audio playback
Add `AllowSpatialization` option to `AudioSource`
2023-04-20 15:01:22 +02:00
Wojtek Figat
91c017713c Merge remote-tracking branch 'origin/master' into 1.6 2023-04-13 12:12:33 +02:00
Wojtek Figat
a379c551cb Fix memory leak when exporting png texture via stb 2023-04-13 11:21:15 +02:00
Wojtek Figat
0ba261d338 Add iOS platform (refactor Mac into shared Apple platform impl) 2023-03-15 20:58:23 +01:00
Wojtek Figat
b2f7ffa545 Add BC4, BC5 and BC7 formats decompression support on non-Windows platforms 2023-02-28 15:51:05 +01:00
Wojtek Figat
aa1a0ea4a2 Fix Flipbook material node bug when frames X was different than Y 2023-02-17 11:27:41 +01:00
Wojtek Figat
7a2023ead6 Add option for importing scale tracking to animation asset 2023-02-07 09:39:31 +01:00
Wojtek Figat
0709288eac Revert Depth Offset (wrong impl, can be done later) 2023-01-31 14:22:37 +01:00
Wojtek Figat
a219a3d2eb Add **Depth Offset to materials** 2023-01-29 22:09:51 +01:00
Wojtek Figat
50fb39d238 Merge remote-tracking branch 'origin/master' into 1.5 2023-01-15 12:44:45 +01:00
Wojtek Figat
f127bbebe1 Refactor enum flags with __underlying_type and new EnumHasAnyFlags/EnumHasAllFlags
Fixes #832
Closes #886
2023-01-15 12:44:39 +01:00
Wojciech Figat
986fa13585 Reuse texture sampling code for procedural sampling node #872 2023-01-13 11:37:53 +01:00
Wojciech Figat
2d44ae3a4d Merge branch 'stochastic-sampling-node' of https://github.com/Swiggies/FlaxEngine into Swiggies-stochastic-sampling-node 2023-01-13 10:40:16 +01:00
Wojciech Figat
a7e428a21c Merge branch 'master' into 1.5
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
#	Source/Engine/Core/Config/GraphicsSettings.cpp
#	Source/Engine/Engine/PostProcessEffect.cs
#	Source/Engine/Graphics/GPUResourcesCollection.cpp
#	Source/Engine/Graphics/GPUResourcesCollection.h
#	Source/Engine/Graphics/PostProcessBase.h
#	Source/FlaxEngine.Gen.cs
2023-01-10 15:37:55 +01:00
Wojciech Figat
9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
Olly Rybak
9099197a88 Added ability to change sample method 2022-12-27 22:26:01 +11:00
Olly Rybak
a2f52edd47 Updated description & comments 2022-12-26 20:44:53 +11:00
Olly Rybak
bba136c9fe Added comment to denote which node it is 2022-12-26 20:35:22 +11:00
Olly Rybak
5022e05c25 Added Stochastic Sampling material node 2022-12-23 21:04:13 +11:00
Wojtek Figat
8918c71312 Update old header usage 2022-12-22 19:31:01 +01:00
Wojciech Figat
7f0c73606c Improve naming various GPU resources 2022-12-09 11:27:41 +01:00
Wojtek Figat
98c29c4a4e Optimize compilation time 2022-12-03 10:42:58 +01:00
Wojciech Figat
66d01d8d7f Merge remote-tracking branch 'origin/master' into 1.5 2022-12-01 12:10:41 +01:00
Wojtek Figat
f5ed9292e7 Merge branch 'master' into 1.5 2022-11-29 23:19:01 +01:00