Commits · 228989770d082c57cb6acc0f243608221101a98e · CGoGN / CGoGN

01 Apr, 2015 1 commit
- Checking in cmake with try_run if std::regex are supported. · 22898977
  Etienne Schmitt authored Mar 23, 2015 and Pierre Kraemer committed Apr 01, 2015
```
Signed-off-by: Étienne Schmitt <etienne.schmitt@inria.fr>
```
  22898977
20 Mar, 2015 7 commits
- Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop · f54ee8ca
  Pierre Kraemer authored Mar 20, 2015
```
Conflicts:
	CGoGN/src/Utils/GLSLShader.cpp
```
  f54ee8ca
- Merge branch 'develop' into 'develop' · 80265842
  Sylvain Thery authored Mar 20, 2015
```
Develop

See merge request !55
```
  80265842
- restore removed build directories · 4f4e657d
  Sylvain Thery authored Mar 20, 2015
  
  4f4e657d
- restore removed build directories · c7c7a63b
  Sylvain Thery authored Mar 20, 2015
  
  c7c7a63b
- restore removed build directories · b24f4f7e
  Sylvain Thery authored Mar 20, 2015
  
  b24f4f7e
- update readme · da1aaab8
  Sylvain Thery authored Mar 20, 2015
  
  da1aaab8
- Merge branch 'develop' of icube-forge.unistra.fr:thery/cgogn into develop · 71d18d7b
  Sylvain Thery authored Mar 20, 2015
  
  71d18d7b
19 Mar, 2015 2 commits
- resolve bug of menu on mac/Qt5 · c8efe8e3
  Sylvain Thery authored Mar 19, 2015
  
  c8efe8e3
- bug CGoGN_ONELIB · abd7d455
  Sylvain Thery authored Mar 19, 2015
  
  abd7d455
18 Mar, 2015 3 commits
- Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop · c32ed9f5
  Sylvain Thery authored Mar 18, 2015
```
Conflicts:
	CGoGN/src/Utils/Shaders/shaderPhong.cpp
	CGoGN/src/Utils/Shaders/shaderSimpleFlat.cpp
```
  c32ed9f5
- clipping on vectorPerVertexShader · 35f2eb18
  Sylvain Thery authored Mar 18, 2015
  
  35f2eb18
- pb compilation Qt4/5 · 3ae34e1a
  Sylvain Thery authored Mar 18, 2015
  
  3ae34e1a
17 Mar, 2015 3 commits
- remove cout · f64d7887
  Sylvain Thery authored Mar 17, 2015
  
  f64d7887
- less static in GLSLShader & support mac retina · a244ca3e
  Sylvain Thery authored Mar 17, 2015
  
  a244ca3e
- add clipping plane to pointSprite · 72f0a449
  Sylvain Thery authored Mar 17, 2015
  
  72f0a449
16 Mar, 2015 1 commit
- phong and simpleFlat clipped · 77aaa844
  Sylvain Thery authored Mar 16, 2015
  
  77aaa844
13 Mar, 2015 5 commits
- Merge branch 'develop' into 'develop' · 57c9da21
  Sylvain Thery authored Mar 13, 2015
```
Develop

See merge request !53
```
  57c9da21
- Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop · 6a6268ee
  Sylvain Thery authored Mar 13, 2015
  
  6a6268ee
- remove clipping using std::regex for gcc 4.8 (see volumeExplorer for clippig topo) · d02167ed
  Sylvain Thery authored Mar 13, 2015
  
  d02167ed
- colorPerFace compilation pb · 001acd3b
  Sylvain Thery authored Mar 13, 2015
  
  001acd3b
- apps_cmake correction · fb74fda3
  Sylvain Thery authored Mar 13, 2015
  
  fb74fda3
12 Mar, 2015 1 commit
- test · 6e507c7c
  Sylvain Thery authored Mar 12, 2015
  
  6e507c7c
11 Mar, 2015 2 commits
- update shader version declaration for GL3 · 8c427fb1
  Pierre Kraemer authored Mar 11, 2015
  
  8c427fb1
- Merge branch 'develop' of icube-forge.unistra.fr:kraemer/cgogn into develop · 8d464248
  Pierre Kraemer authored Mar 11, 2015
  
  8d464248
10 Mar, 2015 2 commits
- SCHNApps: view bounding box computation bug fix · 3c7ea6da
  Pierre Kraemer authored Mar 10, 2015
  
  3c7ea6da
- Merge branch 'develop' into 'develop' · f0299e5a
  Pierre Kraemer authored Mar 10, 2015
```
Develop

See merge request !52
```
  f0299e5a
09 Mar, 2015 8 commits
- Merge branch 'develop' into 'develop' · 58ed59d5
  Pierre Kraemer authored Mar 09, 2015
```
Develop

See merge request !51
```
  58ed59d5
- Merge branch 'develop' of icube-forge.unistra.fr:kraemer/cgogn into develop · d025fef4
  Pierre Kraemer authored Mar 09, 2015
  
  d025fef4
- SCHNApps: remove unused View constructor · 717b0a34
  Pierre Kraemer authored Mar 09, 2015
  
  717b0a34
- Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop · 595e42c5
  Pierre Kraemer authored Mar 09, 2015
  
  595e42c5
- Merge remote-tracking branch 'cgogn/develop' into develop · 788c7b14
  Pierre Kraemer authored Mar 09, 2015
  
  788c7b14
- Merge branch 'develop' into 'develop' · 880aec67
  Sylvain Thery authored Mar 09, 2015
```
Develop

See merge request !50
```
  880aec67
- Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop · f5129f4e
  Sylvain Thery authored Mar 09, 2015
  
  f5129f4e
- mac+qt5+GLcore 3.3 · 25725eba
  Sylvain Thery authored Mar 09, 2015
  
  25725eba
06 Mar, 2015 5 commits
- SCHNApps: update control dock width · 6d6accaa
  Pierre Kraemer authored Mar 06, 2015
  
  6d6accaa
- SCHNApps: update control dock minimum size · 8fdc9e4c
  Pierre Kraemer authored Mar 06, 2015
  
  8fdc9e4c
- SCHNApps: remove Designer Qt Module dependency · 178a31ca
  Pierre Kraemer authored Mar 06, 2015
  
  178a31ca
- Merge branch 'develop' into 'develop' · 4676994c
  Sylvain Thery authored Mar 06, 2015
```
Develop

See merge request !49
```
  4676994c
- Merge branch 'qt5' into develop · e8571f58
  Sylvain Thery authored Mar 06, 2015
```
Conflicts:
	SCHNApps/Plugins/surface_modelisation/src/surface_modelisation.cpp
	SCHNApps/include/types.h
	SCHNApps/include/view.h
	SCHNApps/src/schnapps.cpp
	SCHNApps/src/view.cpp
	ThirdParty/OpenNL/CMakeLists.txt
```
  e8571f58