Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
7,437 Commits 15 Branches 23 Tags
1.7.6404
Commit Graph

227 Commits

Author SHA1 Message Date
mafiesto4 52a621de42 Add color, emissive and opacity parameters setup for auto-imported material instances 2023-10-17 22:45:22 +02:00
mafiesto4 90427da42f Add SubAssetFolder to model import option to redirect auto-imported materials and textures location 2023-10-17 09:59:21 +02:00
mafiesto4 2f3929efe0 Fix Height Layer Blend material node codegen when alpha is constant 
#1705
 2023-10-14 18:03:51 +02:00
mafiesto4 09f2be907e Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Flax.flaxproj
 2023-10-09 12:40:47 +02:00
mafiesto4 cd889604e1 Fix build regression 2023-10-06 16:02:31 +02:00
mafiesto4 e29d3d02a2 Refactor audio clip import settings to use auto-generated bindings via AudioTool 2023-10-06 14:08:48 +02:00
mafiesto4 560f699dd8 Fix various issues with OpenAL buffers playback (do proper bit convertion) 2023-10-06 13:59:03 +02:00
mafiesto4 e6c45fccb3 Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Source/Engine/Level/Actors/AnimatedModel.cpp
 2023-10-05 10:44:03 +02:00
mafiesto4 7777f73c26 Fix warning 2023-10-04 20:20:35 +02:00
mafiesto4 f46cc32715 Cleanup code #1115 2023-10-04 20:15:23 +02:00
mafiesto4 c46303018e Merge branch 'material_import' of https://github.com/Menotdan/FlaxEngine into Menotdan-material_import 2023-10-04 19:59:42 +02:00
mafiesto4 a5374920bd Merge branch 'import_mesh_with_collision_type_as_convex' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-import_mesh_with_collision_type_as_convex 2023-10-04 17:39:39 +02:00
mafiesto4 bed736a8ee Add support for importing embedded textures via Assimp importer 
#669
 2023-10-04 15:16:10 +02:00
mafiesto4 d68c65d9d6 Fix build regression from 9fa709aa79 2023-10-04 13:50:15 +02:00
mafiesto4 25e1c3deaf Merge branch 'restore_message_clearer' of https://github.com/Menotdan/FlaxEngine into Menotdan-restore_message_clearer 2023-10-04 13:28:40 +02:00
mafiesto4 9fa709aa79 Fix importing skinned models with meshes that don't have valid skinning to properly link into the node's bone 
#1525
 2023-10-04 12:42:11 +02:00
mafiesto4 52b9a995ad Fix bone Offset Matrix from fbx when using root RotationMatrix 
#1525
 2023-10-04 10:01:17 +02:00
mafiesto4 68a713fb95 Fix model importer to use precomputed Offset Matrix for skeletal model bones 
#1525
 2023-10-03 22:30:58 +02:00
mafiesto4 2caa168dd9 Fix using DefaultFrameRate for animation imported with Assimp 
#1444
 2023-10-03 10:00:57 +02:00
mafiesto4 8007417fe5 Fix applying scale to imported models with Assimp 
#1445 #1443
 2023-10-03 09:50:50 +02:00
mafiesto4 8bafdb0b78 Remove std::function usage from ArrayExtensions 2023-10-02 12:52:44 +02:00
Menotdan 10ea0b0665 Make it clearer what "Restore Materials on Reimport" means. 2023-10-02 03:32:11 -04:00
Menotdan 0f53c486ed Fixed formatting to match master branch 2023-09-26 00:05:50 -04:00
Menotdan fdf760f483 Merge branch 'master' of https://github.com/Menotdan/FlaxEngine into material_import 
Merge Upstream Changes.
 2023-09-25 23:51:34 -04:00
mafiesto4 1c20398d8c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-22 22:43:29 +02:00
mafiesto4 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
mafiesto4 9f97787099 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-20 16:02:48 +02:00
mafiesto4 a56ce92867 Fix crash when importing model with materials and Split Objects enabled 2023-09-19 23:07:10 +02:00
mafiesto4 a71de7357c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-19 21:42:53 +02:00
mafiesto4 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
mafiesto4 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
Tryibion 44598d4741 Small change in showing target error 2023-08-26 17:07:04 -05:00
Tryibion 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
mafiesto4 04963fef18 Various code fixes and tweaks 2023-07-02 15:46:29 +02:00
mafiesto4 9f313491b8 Fix game compilation error 2023-06-13 15:45:08 +02:00
mafiesto4 979168e82c Refactor various Editor APIs to use auto-generated bindings instead of manual code 2023-06-12 14:34:07 +02:00
mafiesto4 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
mafiesto4 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