GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
694980160bb06fc5543d4b140604a62c4ae64a2e
FlaxEngine/Source/Engine/Render2D
History
Wojtek Figat 694980160b Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Source/Editor/CustomEditors/CustomEditorsUtil.cs
#	Source/Engine/Networking/NetworkReplicator.cpp
#	Source/Engine/Scripting/ManagedCLR/MUtils.cpp
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
2023-05-24 23:28:38 +02:00
..
Font.cpp
Fix text words wrapping deadlock
2023-05-12 14:14:11 +02:00
Font.h
Fix output log text ranges to handle line ending
2023-05-17 12:23:01 +02:00
FontAsset.cpp
Refactor enum flags with __underlying_type and new EnumHasAnyFlags/EnumHasAllFlags
2023-01-15 12:44:39 +01:00
FontAsset.cs
Update copyright year
2023-01-10 15:29:37 +01:00
FontAsset.h
Update copyright year
2023-01-10 15:29:37 +01:00
FontManager.cpp
Refactor enum flags with __underlying_type and new EnumHasAnyFlags/EnumHasAllFlags
2023-01-15 12:44:39 +01:00
FontManager.h
Update copyright year
2023-01-10 15:29:37 +01:00
FontReference.cs
Update copyright year
2023-01-10 15:29:37 +01:00
FontTextureAtlas.cpp
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
FontTextureAtlas.h
Update copyright year
2023-01-10 15:29:37 +01:00
IncludeFreeType.h
Update copyright year
2023-01-10 15:29:37 +01:00
Render2D.Build.cs
Update copyright year
2023-01-10 15:29:37 +01:00
Render2D.cpp
Rename DepthTestEnable to DepthEnable in Graphics PSO to match actual logic
2023-01-31 14:04:00 +01:00
Render2D.cs
Merge branch '1.5' into dotnet7
2023-01-10 15:49:44 +01:00
Render2D.h
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
RotatedRectangle.h
Update copyright year
2023-01-10 15:29:37 +01:00
SpriteAtlas.cpp
Merge branch 'master' into 1.5
2023-01-10 15:37:55 +01:00
SpriteAtlas.cs
Update copyright year
2023-01-10 15:29:37 +01:00
SpriteAtlas.h
Update copyright year
2023-01-10 15:29:37 +01:00
TextLayoutOptions.cs
Update copyright year
2023-01-10 15:29:37 +01:00
TextLayoutOptions.h
Update copyright year
2023-01-10 15:29:37 +01:00
TextRange.cs
Update copyright year
2023-01-10 15:29:37 +01:00