Commits · 8a4be778ffbbe5a35130cdbdfcb3ce8f0bfb0ea3 · OpenFlipper-Free / OpenFlipper

28 Mar, 2018 1 commit
- use 4x msaa by default also on osx · 8a4be778
  Martin Schultz authored Mar 28, 2018
  
  8a4be778
23 Mar, 2018 2 commits
- Merge branch 'fix-warning-misleading-indent' into 'master' · 8d6cbb0e
  Jan Möbius authored Mar 23, 2018
```
Avoid compiler warning by fixing indentation.

See merge request !71
```
  8d6cbb0e
- Avoid compiler warning by fixing indentation. · 5e7f1f8c
  Martin Heistermann authored Mar 23, 2018
  
  5e7f1f8c
22 Mar, 2018 7 commits
- Merge branch 'fixMSAA' into 'master' · 6ebba29f
  Jan Möbius authored Mar 22, 2018
```
fixes #13 by using a non multisampled FBO for picking

Closes #13

See merge request !70
```
  6ebba29f
- applied changes from code review for MSAA fix · 362324d6
  schultz authored Mar 22, 2018
  
  362324d6
- only create the FBO once, or recreate if the size has changed · 93d9766a
  schultz authored Mar 22, 2018
  
  93d9766a
- fixes #13 by using a non multisampled FBO for picking · 77c3438b
  Martin Schultz authored Mar 22, 2018
  
  77c3438b
- Updated OpenMesh · 3674f2d6
  Jan Möbius authored Mar 22, 2018
  
  3674f2d6
- Merge branch 'tex2d-fix-variable-mixup' into 'master' · c2a1ca55
  Jan Möbius authored Mar 22, 2018
```
Fix variable mixup from e8f64be6

See merge request !69
```
  c2a1ca55
- Fix variable mixup from e8f64be6 · b6c8c307
  Martin Heistermann authored Mar 22, 2018
  
  b6c8c307
21 Mar, 2018 10 commits
- Merge branch 'fix-debug-build' into 'master' · 575f9c4f
  Jan Möbius authored Mar 21, 2018
```
Fix debug build error introduced in 6f98d666.

See merge request !68
```
  575f9c4f
- Fix debug build error introduced in 6f98d666 . · 65aff612
  Martin Heistermann authored Mar 21, 2018
  
  65aff612
- Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper · edd83696
  Jan Möbius authored Mar 21, 2018
  
  edd83696
- Show profile in title bar · 6f98d666
  Jan Möbius authored Mar 21, 2018
  
  6f98d666
- Merge branch 'featureMSAAOption' into 'master' · bd9ebb15
  Jan Möbius authored Mar 21, 2018
```
added option to set the MSAA sample count

See merge request !67
```
  bd9ebb15
- added option to set the MSAA sample count · 68dc3b14
  Martin Schultz authored Mar 21, 2018
  
  68dc3b14
- Merge branch 'cleanCodeCorpse' into 'master' · d93baa6e
  Jan Möbius authored Mar 21, 2018
```
removed code block for Qt version < 5

See merge request !66
```
  d93baa6e
- removed code block for Qt version < 5 · e01826ce
  Martin Schultz authored Mar 21, 2018
  
  e01826ce
- Updated OM · 965f7c08
  Jan Möbius authored Mar 21, 2018
  
  965f7c08
- Merge branch 'featureCoreProfile' into 'master' · 341c6436
  Jan Möbius authored Mar 21, 2018
```
Feature core profile

See merge request !65
```
  341c6436
20 Mar, 2018 3 commits
- added profile option to set OpenGL profile explicitly · 386eb643
  Martin Schultz authored Mar 20, 2018
  
  386eb643
- added missing definitions for OpenGL Enums on OSX · 0f8c9c75
  Martin Schultz authored Mar 20, 2018
  
  0f8c9c75
- Merge branch 'master' into featureCoreProfile · d015ccaa
  Martin Schultz authored Mar 20, 2018
  
  d015ccaa
19 Mar, 2018 3 commits
- Merge branch 'unstable' into 'master' · b3b8d339
  Jan Möbius authored Mar 19, 2018
```
sync with Unstable

See merge request !64
```
  b3b8d339
- hotfixed some compile issues with bad glew include · de30cd77
  schultz authored Mar 19, 2018
  
  de30cd77
- temporarily disabled Define QT no OPNEGL ... i have done this before i · c02d3169
  Martin Schultz authored Mar 19, 2018
```
know it...
```
  c02d3169
13 Mar, 2018 1 commit
- fixed bad names for includes and converted generated missingEnums header · 7461e453
  Martin Schultz authored Mar 13, 2018
```
to utf8
```
  7461e453
12 Mar, 2018 5 commits
- use textureCoordination shader implementation in CoreProfiles · 176b165c
  schultz authored Mar 12, 2018
  
  176b165c
- added texturecoordinate generation to GLState · fee8d29a
  schultz authored Mar 12, 2018
  
  fee8d29a
- fixed includes for windows core profile · eb8e4020
  schultz authored Mar 12, 2018
  
  eb8e4020
- temporary disabled QT_NO_OPENGL define · 35c87790
  schultz authored Mar 12, 2018
  
  35c87790
- Merge branch 'unstable' into featureCoreProfile · 2d09b3c7
  schultz authored Mar 12, 2018
  
  2d09b3c7
08 Mar, 2018 4 commits
- Merge branch 'featureGlewSeparation' into unstable · 3ab6db71
  Martin Schultz authored Mar 08, 2018
  
  3ab6db71
- Revert "Merge branch 'fixIncludeOrder' into 'master'" · 71a9d8f9
  Martin Schultz authored Mar 08, 2018
```
changeset was broken for other OSes. use featureGlewSeparation instead

This reverts commit 9b30bc3b, reversing
changes made to 29aa322e.
```
  71a9d8f9
- added ACG utility function to query the current opengl profile · f3920676
  Martin Schultz authored Mar 08, 2018
  
  f3920676
- fixed snapshot functions, as wrong samples were checked and changed · 5c1e885d
  Martin Schultz authored Mar 08, 2018
```
wrapper function signature
```
  5c1e885d
07 Mar, 2018 4 commits
- removed debug output from wrapper function in QtBaseViewer · 9974fb11
  Martin Schultz authored Mar 07, 2018
  
  9974fb11
- defined QT_NO_OPENGL to prevent mixing of plain opengl and QtOpenGL · be24d543
  Martin Schultz authored Mar 07, 2018
  
  be24d543
- use forward declaration for QOpenGLWidget and format · 5b69d768
  Martin Schultz authored Mar 07, 2018
  
  5b69d768
- moved QtOpengl functionality to QtBaseViewer_qt · b9e6d2cb
  Martin Schultz authored Mar 07, 2018
  
  b9e6d2cb