ed
|
2a4c67f680
|
Merge remote-tracking branch 'arnaud-jamin/main'
# Conflicts:
# Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp
# Plugins/Cog/Source/CogDebug/Private/CogDebugLog.cpp
# Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp
# Plugins/Cog/Source/CogWindow/Private/CogWindow_Settings.cpp
# Plugins/Cog/Source/ThirdParty/ImGui/imconfig.h
# Plugins/Cog/Source/ThirdParty/ImGui/imgui.cpp
# Plugins/Cog/Source/ThirdParty/ImGui/imgui.h
# Plugins/Cog/Source/ThirdParty/ImGui/imgui_demo.cpp
# Plugins/Cog/Source/ThirdParty/ImGui/imgui_draw.cpp
# Plugins/Cog/Source/ThirdParty/ImGui/imgui_internal.h
# Plugins/Cog/Source/ThirdParty/ImGui/imgui_tables.cpp
# Plugins/Cog/Source/ThirdParty/ImGui/imgui_widgets.cpp
# Plugins/Cog/Source/ThirdParty/ImGui/imstb_textedit.h
# Plugins/Cog/Source/ThirdParty/ImGui/imstb_truetype.h
# Plugins/Cog/Source/ThirdParty/ImPlot/README.md
# Plugins/Cog/Source/ThirdParty/ImPlot/TODO.md
# Plugins/Cog/Source/ThirdParty/ImPlot/implot.cpp
# Plugins/Cog/Source/ThirdParty/ImPlot/implot.h
# Plugins/Cog/Source/ThirdParty/ImPlot/implot_demo.cpp
# Plugins/Cog/Source/ThirdParty/ImPlot/implot_internal.h
# Plugins/Cog/Source/ThirdParty/ImPlot/implot_items.cpp
# Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h
|
2025-01-17 16:11:13 -05:00 |
|
ed
|
bfaed4d42d
|
missing category specifier
|
2024-10-08 17:46:28 -04:00 |
|
ed
|
66caf73df9
|
Merge remote-tracking branch 'arnaud-jamin/main'
# Conflicts:
# Plugins/Cog/Source/CogCommon/Public/CogCommonLogCategory.h
|
2024-10-08 17:38:02 -04:00 |
|
ed
|
eb543ffdd8
|
fixers (possible)
|
2024-10-08 17:37:02 -04:00 |
|
ed
|
cdae61e8ec
|
Update readme.
|
2024-04-09 16:18:03 -04:00 |
|
ed
|
1bf26e3ecb
|
Updates for compilation in 5.4 as an engine plugin
|
2024-04-09 15:28:56 -04:00 |
|
ed
|
16f2f36400
|
Update ignores
|
2024-04-09 14:23:25 -04:00 |
|
ed
|
c8505ea859
|
Make packaging script for making releases
|
2024-04-09 14:20:02 -04:00 |
|
ed
|
12f61cab03
|
moving thirdparty plugin deps (will be assume to already exist)
|
2024-04-09 14:10:25 -04:00 |
|