Skip to content

Commit e88da5a

Browse files
committed
Merge remote-tracking branch 'OpenXRay/dev' into yohji/feat/cmake-windows
2 parents 7a0015a + 5ad9a8b commit e88da5a

File tree

767 files changed

+197
-17443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

767 files changed

+197
-17443
lines changed

Externals/imgui

Submodule imgui updated 48 files

cmake/XRay.Configurations.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ else()
3131
message(WARNING "RelWithDebInfo equals Release in OpenXRay. Please, use Release build type directly.")
3232
set(CMAKE_BUILD_TYPE Release)
3333
endif()
34+
set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "The type of the build." FORCE)
3435
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES})
3536
endif()
3637
unset(is_multi_config)

res/gamedata/configs/grading_cold.ltx

Lines changed: 0 additions & 12 deletions
This file was deleted.

res/gamedata/configs/grading_default.ltx

Lines changed: 0 additions & 12 deletions
This file was deleted.

res/gamedata/configs/grading_filmic01.ltx

Lines changed: 0 additions & 12 deletions
This file was deleted.

res/gamedata/configs/grading_filmic02.ltx

Lines changed: 0 additions & 12 deletions
This file was deleted.

res/gamedata/configs/grading_filmic03.ltx

Lines changed: 0 additions & 12 deletions
This file was deleted.

res/gamedata/configs/grading_hollywood.ltx

Lines changed: 0 additions & 12 deletions
This file was deleted.

res/gamedata/configs/grading_vanilla.ltx

Lines changed: 0 additions & 12 deletions
This file was deleted.

res/gamedata/configs/grading_vibrant.ltx

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)