GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
cf3ac7a26ef445cbf703e79c5e3baecfb5a18af2
FlaxEngine/Source/Engine
History
Wojtek Figat cf3ac7a26e Merge remote-tracking branch 'origin/master' into linux-editor 
# Conflicts:
#	Source/Engine/Core/Math/Color.cs
#	Source/Engine/Navigation/Navigation.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
2021-02-23 22:29:07 +01:00
..
Animations
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
Audio
Fixes and tweaks
2021-02-12 10:57:45 +01:00
Content
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
ContentExporters
Add inline for float16 compression and add code reference note
2021-01-12 19:05:17 +01:00
ContentImporters
Fix auto-importing materials and textures from model file with invalid path characters used in name
2021-02-07 12:49:14 +01:00
Core
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
CSG
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-16 18:54:25 +01:00
Debug
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-16 18:54:25 +01:00
Engine
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-16 18:54:25 +01:00
Foliage
Remove Unlink from asset reference
2021-02-10 11:37:14 +01:00
Graphics
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
GraphicsDevice
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-16 18:54:25 +01:00
Input
Merge branch 'master' into 1.1
2021-02-15 10:40:59 +01:00
Level
Update Actor docs for GetScripts to be more precise about search method
2021-02-16 11:00:08 +01:00
Main
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Navigation
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
Particles
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
Physics
Fix compilation
2021-02-16 11:23:47 +01:00
Platform
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
Profiler
Bumping all copyright headers to 2021.
2021-01-02 14:28:49 +01:00
Render2D
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
Renderer
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-16 18:54:25 +01:00
Scripting
Fix building on linux after merge
2021-02-16 19:01:00 +01:00
Serialization
Add SoftObjectReference for lazy references to assets and objects
2021-02-10 11:12:05 +01:00
ShadersCompilation
Merge remote-tracking branch 'origin/master' into linux-editor
2021-01-10 09:14:03 +01:00
ShadowsOfMordor
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-16 18:54:25 +01:00
Streaming
Fixed additional typos
2021-01-05 02:14:21 +01:00
Terrain
Optimize DrawCall to pack indirect draw arg and graphics draw data with union
2021-02-15 11:52:06 +01:00
Threading
Fixed a ton of typos
2021-01-05 02:13:15 +01:00
Tools
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
UI
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
Utilities
Merge remote-tracking branch 'origin/master' into linux-editor
2021-02-23 22:29:07 +01:00
Visject
Merge remote-tracking branch 'origin/1.1' into linux-editor
2021-02-16 18:54:25 +01:00