Commits · 5fcb3fc305a986a00d698db00a5de6c86ed970b9 · KennethVanhoey / CGoGN

30 Jan, 2015 2 commits
- Merge branch 'develop' into 'develop' · 5fcb3fc3
  Pierre Kraemer authored Jan 30, 2015
```
Develop

See merge request !35
```
  5fcb3fc3
- Set spherical harmonics resolution at ShaderRadiancePerVertex construction · bc2e1c32
  Pierre Kraemer authored Jan 30, 2015
  
  bc2e1c32
29 Jan, 2015 2 commits
- Merge branch 'develop' into 'develop' · e66c4530
  Pierre Kraemer authored Jan 29, 2015
```
Develop

add spherical harmonics + surface radiance shader & SCHNApps plugin

See merge request !34
```
  e66c4530
- SCHNApps: new surface_radiance plugin · c32aa9d5
  Pierre Kraemer authored Jan 29, 2015
```
+ add shader RadiancePerVertex in CGoGN
+ add spherical harmonics in CGoGN
```
  c32aa9d5
26 Jan, 2015 11 commits
- Merge branch 'master' into 'develop' · 562b8f4d
  Sylvain Thery authored Jan 26, 2015
```
Master

See merge request !33
```
  562b8f4d
- bug missing pfp:: · 7576a3e9
  Sylvain Thery authored Jan 26, 2015
  
  7576a3e9
- Merge icube-forge.unistra.fr:cgogn/cgogn · 8d771e17
  Sylvain Thery authored Jan 26, 2015
  
  8d771e17
- Merge branch 'develop' into 'develop' · 9f2c7763
  Pierre Kraemer authored Jan 26, 2015
```
Develop

See merge request !32
```
  9f2c7763
- Merge branch 'develop' into 'master' · e50b4eb7
  Pierre Kraemer authored Jan 26, 2015
```
Develop

new SCHNApps plugin : surface_distance

See merge request !31
```
  e50b4eb7
- SCHNApps: create surface_distance plugin · a0619054
  Pierre Kraemer authored Jan 26, 2015
  
  a0619054
- Merge branch 'develop' into 'master' · 95e60c11
  Pierre Kraemer authored Jan 26, 2015
```
Develop

corrections dans les collector : parametres template inutiles et types Vertex/Edge/Face au lieu de Dart

See merge request !30
```
  95e60c11
- Merge remote-tracking branch 'CGoGNcentral/develop' into develop · eff3eec9
  Sauvage authored Jan 26, 2015
```
Conflicts:
	include/Algo/Selection/collector.hpp
```
  eff3eec9
- Merge remote-tracking branch 'cgogn/develop' into develop · 74ca83b1
  Pierre Kraemer authored Jan 26, 2015
  
  74ca83b1
- Merge branch 'develop' into 'develop' · 679b508c
  Sylvain Thery authored Jan 26, 2015
```
Develop

See merge request !29
```
  679b508c
- remove cmake policy error with 2.8 · 9e1bec20
  Sylvain Thery authored Jan 26, 2015
  
  9e1bec20
23 Jan, 2015 3 commits
- Merge remote-tracking branch 'cgogn/develop' into develop · 82c83351
  Pierre Kraemer authored Jan 23, 2015
  
  82c83351
- Merge branch 'develop' into 'develop' · 760088df
  Sylvain Thery authored Jan 23, 2015
```
Develop

See merge request !28
```
  760088df
- OpenNL dylib compiling bug · a6a88919
  Sylvain Thery authored Jan 23, 2015
  
  a6a88919
19 Jan, 2015 1 commit
- tinyxml2 copy in third_party · 39827e0e
  Sylvain Thery authored Jan 19, 2015
  
  39827e0e
14 Jan, 2015 1 commit
- bug install tinyXml2, I hope the last · 69b46a46
  Sylvain Thery authored Jan 14, 2015
  
  69b46a46
13 Jan, 2015 2 commits
- Merge branch 'develop' of icube-forge.unistra.fr:kraemer/cgogn into develop · 8c8c80df
  Pierre Kraemer authored Jan 13, 2015
  
  8c8c80df
- tinyxml2 install bug · 637f841d
  Sylvain Thery authored Jan 13, 2015
  
  637f841d
12 Jan, 2015 6 commits
- Merge remote-tracking branch 'cgogn/develop' into develop · beca7656
  Pierre Kraemer authored Jan 12, 2015
  
  beca7656
- Merge branch 'develop' into 'develop' · 6471d0c6
  Sylvain Thery authored Jan 12, 2015
```
Develop

See merge request !27
```
  6471d0c6
- bug install tinyXml2 · 57766e9f
  Sylvain Thery authored Jan 12, 2015
  
  57766e9f
- Merge remote-tracking branch 'cgogn/develop' into develop · 45b4acdc
  Pierre Kraemer authored Jan 12, 2015
  
  45b4acdc
- Merge branch 'develop' into 'develop' · aac63fd5
  Sylvain Thery authored Jan 12, 2015
```
Develop

See merge request !26
```
  aac63fd5
- TinyXml2 with superbuild git add CMakeLists.txt SCHNApps/CMakeLists.txt ThirdParty/CMakeLists.txt · f0d34ac4
  Sylvain Thery authored Jan 12, 2015
  
  f0d34ac4
06 Jan, 2015 1 commit
- Merge remote-tracking branch 'cgogn/develop' into develop · d6c0e496
  Pierre Kraemer authored Jan 06, 2015
  
  d6c0e496
22 Dec, 2014 3 commits
- Merge icube-forge.unistra.fr:cgogn/cgogn · b9808b7c
  Sylvain Thery authored Dec 22, 2014
  
  b9808b7c
- Merge branch 'develop' into 'master' · 5fc601bd
  Sylvain Thery authored Dec 22, 2014
```
Christmas merge ..

See merge request !25
```
  5fc601bd
- Merge branch 'develop' into 'develop' · ffaa09d7
  Sylvain Thery authored Dec 22, 2014
```
Christmas merge

See merge request !24
```
  ffaa09d7
16 Dec, 2014 2 commits
- cmake find module for tinyXml2 · 8767ff30
  Sylvain Thery authored Dec 16, 2014
  
  8767ff30
- resolve bug of deleted marked darts · 549f0bff
  Sylvain Thery authored Dec 16, 2014
  
  549f0bff
11 Dec, 2014 2 commits
- Merge pull request #1 from circlingthesun/master · 64e00d11
  cgogn authored Dec 11, 2014
```
Added missing dependency to README.md
```
  64e00d11
- Added missing dependency to README.md · 072e32da
  Rickert Mulder authored Dec 11, 2014
  
  072e32da
03 Dec, 2014 1 commit
- resolve bug of leaving markers after removing darts · 09aaaf4e
  Sylvain Thery authored Dec 03, 2014
  
  09aaaf4e
28 Nov, 2014 1 commit
- replace libXml2 by tinyxml2 · 51206dcd
  Sylvain Thery authored Nov 28, 2014
  
  51206dcd
20 Nov, 2014 1 commit
- Merge branch 'master' of icube-forge.unistra.fr:cgogn/cgogn into develop · 7a3e52d4
  Pierre Kraemer authored Nov 20, 2014
  
  7a3e52d4
18 Nov, 2014 1 commit
- add picking in qtQGLV · f2a4af2f
  Sylvain Thery authored Nov 18, 2014
  
  f2a4af2f