Commits · 4b06724c452ab4d4e8147cf42a8d5e652063e986 · CGoGN / CGoGN

25 Oct, 2012 2 commits
- Merge cgogn.unistra.fr:~cazier/CGoGN · 4b06724c
  Jund Thomas authored Oct 25, 2012
  
  4b06724c
- isFinite() sur les vector · 58dd1c2f
  David Cazier authored Oct 25, 2012
  
  58dd1c2f
19 Oct, 2012 1 commit

David Cazier authored Oct 19, 2012

Conflicts:
	include/Algo/MovingObjects/particle_cell_2D_memo.h
	include/Algo/MovingObjects/particle_cell_2D_memo.hpp

2f40b778

18 Oct, 2012 1 commit
- Merge SA2 · d57bdab0
  David Cazier authored Oct 18, 2012
  
  d57bdab0
10 Oct, 2012 2 commits
- Merge cgogn.unistra.fr:~pitiot/CGoGN · 5ec930f2
  Jund Thomas authored Oct 10, 2012
  
  5ec930f2
- Merge cgogn.unistra.fr:~cgogn/CGoGN · 189a9044
  Jund Thomas authored Oct 10, 2012
  
  189a9044
09 Oct, 2012 2 commits
- particles 2dAndHalf update · ac66f55e
  pitiot authored Oct 09, 2012
  
  ac66f55e
- Merge cgogn:~cgogn/CGoGN · 18f74232
  David Cazier authored Oct 09, 2012
  
  18f74232
05 Oct, 2012 19 commits
- remove CGoGN thread & current_thread parameter everywhere · 333cfee2
  Sylvain Thery authored Oct 05, 2012
  
  333cfee2
- restore vertexRaySelector name & change parameter order (consistency: good param at the end) · e1d6adb5
  Sylvain Thery authored Oct 05, 2012
  
  e1d6adb5
- and GLdefs for VRJ · 03558439
  Sylvain Thery authored Oct 05, 2012
  
  03558439
- add fbo rendering class · 157b8818
  Sylvain Thery authored Oct 05, 2012
  
  157b8818
- Merge branch 'master' of cgogn:~sauvage/CGoGN · 3b07d12b
  Sylvain Thery authored Oct 05, 2012
  
  3b07d12b
- Merge branch 'master' of cgogn:~kraemer/CGoGN · 6a89ea6c
  Sylvain Thery authored Oct 05, 2012
  
  6a89ea6c
- Merge branch 'master' of cgogn:~vanhoey/CGoGN · 327c437b
  Sylvain Thery authored Oct 05, 2012
  
  327c437b
- Merge branch 'master' of cgogn:~untereiner/CGoGN · a14c6c9e
  Sylvain Thery authored Oct 05, 2012
  
  a14c6c9e
- add enum typdef for VRJ problems · 1a767014
  Sylvain Thery authored Oct 05, 2012
  
  1a767014
- No more need for GSL in CGoGN (replaced by Eigen) · 686246fe
  Kenneth Vanhoey authored Oct 05, 2012
  
  686246fe
- file management 3 · e73d3657
  untereiner authored Oct 05, 2012
  
  e73d3657
- feature lines.. · 8c56bdce
  Pierre Kraemer authored Oct 05, 2012
  
  8c56bdce
- file management 2 · 72a083a4
  untereiner authored Oct 05, 2012
  
  72a083a4
- file management · 72e37263
  untereiner authored Oct 05, 2012
  
  72e37263
- Merge branch 'master' of cgogn:~untereiner/CGoGN · b8c45cf8
  Sylvain Thery authored Oct 05, 2012
  
  b8c45cf8
- remove TP_Master · 6cf78ec7
  Sylvain Thery authored Oct 05, 2012
  
  6cf78ec7
- Merge branch 'VRJ' · 0470ea57
  Sylvain Thery authored Oct 05, 2012
  
  0470ea57
- bug selector · bb4982ae
  Sylvain Thery authored Oct 05, 2012
  
  bb4982ae
- frame mapniplator minor change · ca166e89
  Sylvain Thery authored Oct 05, 2012
  
  ca166e89
04 Oct, 2012 6 commits
- - · 9b375901
  David Cazier authored Oct 04, 2012
  
  9b375901
- - · acac17ce
  David Cazier authored Oct 04, 2012
  
  acac17ce
- Merge cgogn:~cgogn/CGoGN · ff67c3a1
  David Cazier authored Oct 04, 2012
```
Conflicts:
	Apps/deprecated/tutoriel.cpp
	include/Algo/MovingObjects/particle_cell_2D.h
	include/Algo/MovingObjects/particle_cell_2D.hpp
	include/Algo/MovingObjects/particle_cell_2DandHalf.hpp
	include/Geometry/vector_gen.hpp
```
  ff67c3a1
- - · da95e06c
  David Cazier authored Oct 04, 2012
  
  da95e06c
- MR Progressive Mesh for 2maps are working ! · 6cfb0639
  untereiner authored Oct 04, 2012
  
  6cfb0639
- booléen sur les particules memo · 47db3dde
  pitiot authored Oct 04, 2012
  
  47db3dde
03 Oct, 2012 3 commits
- bug in pickable & updatemtrices form GL · 84dbb3d7
  Sylvain Thery authored Oct 03, 2012
  
  84dbb3d7
- REmise à jour particules mémo · 3a243906
  pitiot authored Oct 03, 2012
  
  3a243906
- ADD REQUIRE libgsl in readme.txt · 47bab8b9
  Kenneth Vanhoey authored Oct 03, 2012
  
  47bab8b9
02 Oct, 2012 4 commits
- bug fix · b5e420f2
  untereiner authored Oct 02, 2012
  
  b5e420f2
- Merge cgogn:~vanhoey/CGoGN · b636d120
  untereiner authored Oct 02, 2012
```
Conflicts:
	CMakeLists.txt
```
  b636d120
- some changes on edge selectors · 4d0c2298
  untereiner authored Oct 02, 2012
  
  4d0c2298
- big commit sur selectors/approximator (non fini pour la partie champ de lumière) · 62aec045
  Kenneth Vanhoey authored Oct 02, 2012
  
  62aec045