You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Vladimír Vondruš
9ea4f85968
Merge branch 'master' into compatibility
Conflicts:
package/ci/jenkins.xml
src/Magnum/AbstractShaderProgram.cpp
src/Magnum/Math/RectangularMatrix.h
src/Magnum/MeshTools/CompressIndices.h
src/Magnum/Platform/Sdl2Application.h
src/Magnum/Resource.h
src/Magnum/Shader.cpp
src/Magnum/Test/AbstractImageTest.cpp
src/Magnum/Test/AbstractShaderProgramTest.cpp
src/Magnum/Test/MeshTest.cpp
src/Magnum/Text/Text.h
src/Magnum/Timeline.h
src/Test/AbstractShaderProgramGLTest.cpp
src/Test/FramebufferGLTest.cpp
src/Test/MeshGLTest.cpp
|
12 years ago |
| .. |
|
AbstractBoxRenderer.cpp
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
AbstractBoxRenderer.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
AbstractShapeRenderer.cpp
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
AbstractShapeRenderer.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
AxisAlignedBoxRenderer.cpp
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
AxisAlignedBoxRenderer.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
BoxRenderer.cpp
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
BoxRenderer.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
CapsuleRenderer.cpp
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
CapsuleRenderer.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
CapsuleRendererTransformation.h
|
Merge branch 'master' into compatibility
|
12 years ago |
|
CylinderRenderer.cpp
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
CylinderRenderer.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
CylinderRendererTransformation.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
ForceRendererTransformation.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
LineSegmentRenderer.cpp
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
LineSegmentRenderer.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
LineSegmentRendererTransformation.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
PointRenderer.cpp
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
PointRenderer.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
SphereRenderer.cpp
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |
|
SphereRenderer.h
|
Making includes absolute, part 5: absolute includes everywhere.
|
13 years ago |