Wojtek Figat 6cdd56ad11 Merge branch 'colorPickerAlwaysChangesColor' of https://github.com/Arcnor/FlaxEngine into Arcnor-colorPickerAlwaysChangesColor ...

# Conflicts:
#	Source/Editor/Options/InterfaceOptions.cs

2024-07-25 10:06:05 +02:00

..

Editor

Merge branch 'colorPickerAlwaysChangesColor' of https://github.com/Arcnor/FlaxEngine into Arcnor-colorPickerAlwaysChangesColor

2024-07-25 10:06:05 +02:00

Engine

Merge branch 'lightmap-material-nodes' of https://github.com/Swiggies/FlaxEngine into Swiggies-lightmap-material-nodes

2024-07-25 09:25:15 +02:00

Platforms

Update Assimp for Mac

2024-07-02 11:29:56 +02:00

Shaders

Merge branch 'grid-update' of https://github.com/Swiggies/FlaxEngine into Swiggies-grid-update

2024-06-10 23:17:39 +02:00

ThirdParty

Update Assimp to v5.4.1

2024-07-02 09:59:30 +02:00

Tools

Fix statically linked binary modules not getting compiled

2024-07-20 15:41:26 +03:00

.editorconfig

…

flax.natvis

…

FlaxEditor.Build.cs

Merge remote-tracking branch 'origin/master' into 1.8

2024-02-26 19:49:39 +01:00

FlaxEngine.pch.h

Update year in copyright note

2024-02-26 19:53:58 +01:00

FlaxEngine.rc

…

FlaxGame.Build.cs

Merge remote-tracking branch 'origin/master' into 1.8

2024-02-26 19:49:39 +01:00

FlaxTests.Build.cs

Update year in copyright note

2024-02-26 19:00:48 +01:00

Icon.ico

…

Logo.png

…

resource.h

…