Commits · master · Jane Tournois / OpenFlipper

27 May, 2019 3 commits

Updated OM · 0bc1d1cf
Jan Möbius authored May 27, 2019

0bc1d1cf
Merge branch 'fix-qt-glext-warning' into 'master' · 04bd39ca
Jan Möbius authored May 27, 2019
```
Fix warning about glext redefiniton.

See merge request OpenFlipper-Free/OpenFlipper!150
```
04bd39ca

Fix warning about glext redefiniton. · 97a21ccd

Martin Heistermann authored May 27, 2019

Warning was:

/usr/include/x86_64-linux-gnu/qt5/QtGui/qopenglext.h:60: warning: "GL_GLEXT_VERSION" redefined
 #define GL_GLEXT_VERSION 20170325
 /usr/include/GL/glext.h:54: note: this is the location of the previous definition
 #define GL_GLEXT_VERSION 20180725

cf: https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/5479af133ffe6077aab8a8be8f397f246aacb773

97a21ccd

24 May, 2019 8 commits
- Silence some cppcheck warnings · 4414fdfc
  Jan Möbius authored May 24, 2019
  
  4414fdfc
- Silence some cppcheck warnings · 9682aa2f
  Jan Möbius authored May 24, 2019
  
  9682aa2f
- Silence some cppcheck warnings · 80785d64
  Jan Möbius authored May 24, 2019
  
  80785d64
- Silence some cppcheck warnings · 5e111303
  Jan Möbius authored May 24, 2019
  
  5e111303
- Silence some cppcheck warnings · c162cde5
  Jan Möbius authored May 24, 2019
  
  c162cde5
- Silence some cppcheck warnings · 8c8ad188
  Jan Möbius authored May 24, 2019
  
  8c8ad188
- Removed tmp file · 6267eaa9
  Jan Möbius authored May 24, 2019
  
  6267eaa9
- Silence some cppcheck warnings · 0c264d53
  Jan Möbius authored May 24, 2019
  
  0c264d53
16 May, 2019 4 commits
- Merge branch 'matrix-setrowcol' into 'master' · 0ac840a0
  Jan Möbius authored May 16, 2019
```
Matrix3x3T: implement setRow/setCol.

See merge request OpenFlipper-Free/OpenFlipper!149
```
  0ac840a0
- Merge branch 'clippingnode-worldspace' into 'master' · 85ac7336
  Jan Möbius authored May 16, 2019
```
ClippingNode: Operate in world coordinates

See merge request !148
```
  85ac7336
- ClippingNode: perform clipping in world space, not in object space. · cf015c66
  Martin Heistermann authored May 16, 2019
```
This fixes clipping for instanced rendering and other situations with
non-identity model matrices.
```
  cf015c66
- Matrix3x3T: implement setRow/setCol. · 7b584768
  Martin Heistermann authored May 16, 2019
  
  7b584768
02 May, 2019 2 commits
- Merge branch 'glut_primitve_lighting' into 'master' · 05dd27d2
  Jan Möbius authored May 02, 2019
```
choose glut primitve lighting based on draw mode

See merge request OpenFlipper-Free/OpenFlipper!147
```
  05dd27d2
- choose glut primitve lighting based on draw mode · 7dd4c60f
  Max Lyon authored May 02, 2019
  
  7dd4c60f
25 Apr, 2019 1 commit
- Updated changelog plugin noise · f3cf9818
  Jan Möbius authored Apr 25, 2019
  
  f3cf9818
12 Apr, 2019 2 commits
- Updated tested Qt version to 5.12.2 · 2d469a90
  Jan Möbius authored Apr 12, 2019
  
  2d469a90
- Updated qwt path for qt5.12.2 · 69c91dbd
  Jan Möbius authored Apr 12, 2019
  
  69c91dbd
09 Apr, 2019 4 commits
- Updated changelog · ddcf198c
  Jan Möbius authored Apr 09, 2019
  
  ddcf198c
- Merge branch 'GlutPrimitiveNode-ConeSupport' into 'master' · 3467dee4
  Jan Möbius authored Apr 09, 2019
```
add GlutPrimitiveNode-ConeSupport

See merge request OpenFlipper-Free/OpenFlipper!146
```
  3467dee4
- add GlutPrimitiveNode-ConeSupport · e91b1821
  Heng Liu authored Apr 09, 2019
  
  e91b1821
- Merge branch 'python-tests' into 'master' · 5ce2edbd
  Jan Möbius authored Apr 09, 2019
```
pick up tests in Type-* subdirs

See merge request OpenFlipper-Free/OpenFlipper!145
```
  5ce2edbd
08 Apr, 2019 1 commit
- pick up tests in Type-* subdirs · cf5c329b
  Alexander Dielen authored Apr 08, 2019
  
  cf5c329b
19 Mar, 2019 1 commit
- Merge branch 'fake_glew_finder' into 'master' · d7ff25e7
  Jan Möbius authored Mar 19, 2019
```
fake successful finder run for glew

See merge request OpenFlipper-Free/OpenFlipper!144
```
  d7ff25e7
18 Mar, 2019 1 commit
- fake successful finder run for glew · 510d5643
  Max Lyon authored Mar 18, 2019
  
  510d5643
14 Mar, 2019 1 commit

Merge branch 'fix_guard' into 'master' · aed1d11d

Jan Möbius authored Mar 14, 2019

TriangleBSP: fix preprocessor guard

See merge request OpenFlipper-Free/OpenFlipper!143

aed1d11d

13 Mar, 2019 2 commits
- TriangleBSP: fix preprocessor guard · 0fcac05a
  Martin Heistermann authored Mar 13, 2019
  
  0fcac05a
- Merge branch 'feature_plugincommandlineoptions' into 'master' · ab592ac7
  Jan Möbius authored Mar 13, 2019
```
Feature plugincommandlineoptions

See merge request OpenFlipper-Free/OpenFlipper!142
```
  ab592ac7
12 Mar, 2019 1 commit

Merge branch 'master' of... · b1e76344

Kersten Schuster authored Mar 12, 2019

Merge branch 'master' of www.graphics.rwth-aachen.de:OpenFlipper-Free/OpenFlipper into feature_plugincommandlineoptions

b1e76344

08 Mar, 2019 4 commits
- Updated Version to 4.1 · e35e0232
  Jan Möbius authored Mar 08, 2019
  
  e35e0232
- Merge remote-tracking branch 'origin/fix-build-without-python' · 87544470
  Jan Möbius authored Mar 08, 2019
  
  87544470
- Split script widget for python · 9c0de0d5
  Jan Möbius authored Mar 08, 2019
  
  9c0de0d5
- Merge branch 'docs-fix-plugin-build' into 'master' · 4e4cbe13
  Jan Möbius authored Mar 08, 2019
```
docs: fix compilation of example plugins.

See merge request OpenFlipper-Free/OpenFlipper!140
```
  4e4cbe13
07 Mar, 2019 5 commits
- Add missing include, fixes build without python · 7c69fe87
  Martin Heistermann authored Mar 07, 2019
  
  7c69fe87
- docs: fix compilation of example plugins. · 277c9564
  Martin Heistermann authored Mar 07, 2019
```
I didn't check yet if this is enough to make them compile on current OF,
but it's a start.
```
  277c9564
- Updated test generator for python algorithm test · f8e2e049
  Jan Möbius authored Mar 07, 2019
  
  f8e2e049
- Updated changelog · 545cec92
  Jan Möbius authored Mar 07, 2019
  
  545cec92
- Updated changelog · 2f02b5ac
  Jan Möbius authored Mar 07, 2019
  
  2f02b5ac