DarkRadiant: master f7311ea6

Diff Back to Repository
Author Committer Branch Timestamp Parent
greebo greebo master 05.03.2021 05:21 master afca9c48
Changeset Merge branch 'materialeditor', to base the upcoming changes on the latest main branch

# Conflicts:
# include/ShaderLayer.h
# include/ishaders.h
# radiant/ui/mediabrowser/MediaBrowserTreeView.cpp
# radiantcore/shaders/CShader.h
# test/Materials.cpp
# tools/msvc/DarkRadiant.vcxproj.filters
# tools/msvc/DarkRadiantCore.vcxproj.filters
mod - include/ShaderLayer.h Diff File
mod - include/ishaderexpression.h Diff File
mod - include/ishaders.h Diff File
mod - include/precompiled_interfaces.h Diff File
add - install/bitmaps/soundmap.png Diff File
add - install/bitmaps/soundmap_wave.png Diff File
add - install/bitmaps/videomap.png Diff File
add - install/ui/materialeditor.fbp Diff File
add - install/ui/materialeditor.xrc Diff File
add - libs/materials/ParseLib.h Diff File
mod - libs/wxutil/SourceView.cpp Diff File
mod - libs/wxutil/dataview/ResourceTreeView.cpp Diff File
mod - radiant/CMakeLists.txt Diff File
add - radiant/ui/common/MaterialPopulator.cpp Diff File
add - radiant/ui/common/MaterialPopulator.h Diff File
add - radiant/ui/common/MaterialTreeView.cpp Diff File
add - radiant/ui/common/MaterialTreeView.h Diff File
add - radiant/ui/materials/Binding.h Diff File
add - radiant/ui/materials/ExpressionBinding.h Diff File
add - radiant/ui/materials/MaterialEditor.cpp Diff File
add - radiant/ui/materials/MaterialEditor.h Diff File
add - radiant/ui/materials/MaterialEditorModule.cpp Diff File
mod - radiant/ui/mediabrowser/MediaBrowserTreeView.cpp Diff File
mod - radiant/ui/mediabrowser/MediaBrowserTreeView.h Diff File
mod - radiantcore/imagefile/ImageLoader.cpp Diff File
mod - radiantcore/shaders/CShader.cpp Diff File
mod - radiantcore/shaders/CShader.h Diff File
mod - radiantcore/shaders/CameraCubeMapDecl.cpp Diff File
mod - radiantcore/shaders/CameraCubeMapDecl.h Diff File
mod - radiantcore/shaders/Doom3ShaderLayer.cpp Diff File
mod - radiantcore/shaders/Doom3ShaderLayer.h Diff File
mod - radiantcore/shaders/MapExpression.cpp Diff File
mod - radiantcore/shaders/MapExpression.h Diff File
mod - radiantcore/shaders/ShaderExpression.cpp Diff File
mod - radiantcore/shaders/ShaderExpression.h Diff File
mod - radiantcore/shaders/ShaderTemplate.cpp Diff File
mod - radiantcore/shaders/ShaderTemplate.h Diff File
add - radiantcore/shaders/SoundMapExpression.h Diff File
add - radiantcore/shaders/VideoMapExpression.h Diff File
mod - test/Materials.cpp Diff File
add - test/resources/tdm/materials/parsertest.mtr Diff File
mod - tools/msvc/DarkRadiant.vcxproj Diff File
mod - tools/msvc/DarkRadiant.vcxproj.filters Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File
mod - tools/msvc/libs.vcxproj Diff File
mod - tools/msvc/libs.vcxproj.filters Diff File