Author |
Committer |
Branch |
Timestamp |
Parent |
greebo |
greebo |
master |
22.03.2021 10:28 |
master 66987e21 |
Changeset |
Merge branch 'materialeditor2' |
mod - .gitignore |
Diff
File |
mod - include/ibrush.h |
Diff
File |
mod - include/iglrender.h |
Diff
File |
mod - include/imodel.h |
Diff
File |
mod - include/imodelcache.h |
Diff
File |
mod - include/irender.h |
Diff
File |
mod - include/ishaderexpression.h |
Diff
File |
mod - include/ishaders.h |
Diff
File |
mod - include/modelskin.h |
Diff
File |
mod - include/precompiled_interfaces.h |
Diff
File |
add - install/bitmaps/cube.png |
Diff
File |
add - install/bitmaps/invisible.png |
Diff
File |
add - install/bitmaps/sphere.png |
Diff
File |
add - install/bitmaps/tiles.png |
Diff
File |
add - install/bitmaps/visible.png |
Diff
File |
mod - install/games/darkmod.game |
Diff
File |
add - install/resources/preview/cube.ase |
Diff
File |
add - install/resources/preview/room_cuboid.ase |
Diff
File |
add - install/resources/preview/sphere.ase |
Diff
File |
add - install/resources/preview/tiles.ase |
Diff
File |
mod - install/ui/materialeditor.fbp |
Diff
File |
mod - install/ui/materialeditor.xrc |
Diff
File |
mod - libs/materials/ParseLib.h |
Diff
File |
mod - libs/util/ScopedBoolLock.h |
Diff
File |
mod - libs/wxutil/dataview/ResourceTreeViewToolbar.cpp |
Diff
File |
mod - libs/wxutil/dataview/ResourceTreeViewToolbar.h |
Diff
File |
mod - libs/wxutil/preview/GuiRenderer.cpp |
Diff
File |
mod - libs/wxutil/preview/RenderPreview.cpp |
Diff
File |
mod - libs/wxutil/preview/RenderPreview.h |
Diff
File |
mod - radiant/CMakeLists.txt |
Diff
File |
mod - radiant/camera/CamWnd.cpp |
Diff
File |
mod - radiant/ui/common/ShaderSelector.cpp |
Diff
File |
mod - radiant/ui/materials/Binding.h |
Diff
File |
add - radiant/ui/materials/CheckBoxBinding.h |
Diff
File |
mod - radiant/ui/materials/ExpressionBinding.h |
Diff
File |
mod - radiant/ui/materials/MaterialEditor.cpp |
Diff
File |
mod - radiant/ui/materials/MaterialEditor.h |
Diff
File |
mod - radiant/ui/materials/MaterialEditorModule.cpp |
Diff
File |
add - radiant/ui/materials/MaterialPreview.cpp |
Diff
File |
add - radiant/ui/materials/MaterialPreview.h |
Diff
File |
add - radiant/ui/materials/RadioButtonBinding.h |
Diff
File |
add - radiant/ui/materials/SpinCtrlBinding.h |
Diff
File |
add - radiant/ui/materials/TestModelSkin.h |
Diff
File |
mod - radiantcore/CMakeLists.txt |
Diff
File |
mod - radiantcore/brush/Brush.h |
Diff
File |
mod - radiantcore/model/ModelCache.cpp |
Diff
File |
mod - radiantcore/model/ModelCache.h |
Diff
File |
mod - radiantcore/model/export/WavefrontExporter.cpp |
Diff
File |
mod - radiantcore/model/md5/MD5ModelLoader.cpp |
Diff
File |
mod - radiantcore/model/md5/MD5ModelLoader.h |
Diff
File |
mod - radiantcore/model/picomodel/PicoModelLoader.cpp |
Diff
File |
mod - radiantcore/model/picomodel/PicoModelLoader.h |
Diff
File |
mod - radiantcore/rendersystem/OpenGLRenderSystem.cpp |
Diff
File |
mod - radiantcore/rendersystem/OpenGLRenderSystem.h |
Diff
File |
mod - radiantcore/rendersystem/backend/OpenGLShader.cpp |
Diff
File |
mod - radiantcore/rendersystem/backend/OpenGLShader.h |
Diff
File |
mod - radiantcore/rendersystem/backend/OpenGLShaderPass.cpp |
Diff
File |
mod - radiantcore/rendersystem/backend/OpenGLShaderPass.h |
Diff
File |
mod - radiantcore/shaders/CShader.cpp |
Diff
File |
mod - radiantcore/shaders/CShader.h |
Diff
File |
mod - radiantcore/shaders/Doom3ShaderLayer.cpp |
Diff
File |
mod - radiantcore/shaders/Doom3ShaderLayer.h |
Diff
File |
mod - radiantcore/shaders/Doom3ShaderSystem.cpp |
Diff
File |
mod - radiantcore/shaders/Doom3ShaderSystem.h |
Diff
File |
add - radiantcore/shaders/ExpressionSlots.cpp |
Diff
File |
add - radiantcore/shaders/ExpressionSlots.h |
Diff
File |
mod - radiantcore/shaders/MapExpression.cpp |
Diff
File |
mod - radiantcore/shaders/ShaderExpression.cpp |
Diff
File |
mod - radiantcore/shaders/ShaderExpression.h |
Diff
File |
mod - radiantcore/shaders/ShaderLibrary.cpp |
Diff
File |
mod - radiantcore/shaders/ShaderTemplate.cpp |
Diff
File |
mod - radiantcore/shaders/ShaderTemplate.h |
Diff
File |
add - radiantcore/shaders/TextureMatrix.cpp |
Diff
File |
add - radiantcore/shaders/TextureMatrix.h |
Diff
File |
mod - radiantcore/skins/Doom3SkinCache.cpp |
Diff
File |
mod - radiantcore/skins/Doom3SkinCache.h |
Diff
File |
mod - test/Materials.cpp |
Diff
File |
mod - test/resources/tdm/materials/parsertest.mtr |
Diff
File |
add - test/resources/tdm/materials/tables.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/include.vcxproj |
Diff
File |
mod - tools/msvc/properties/DarkRadiant Base Debug Win32.props |
Diff
File |
mod - tools/msvc/properties/DarkRadiant Base Debug x64.props |
Diff
File |